Skip to content

Commit ce2ce0d

Browse files
committed
Refactoring
1 parent f48f72e commit ce2ce0d

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

app/src/main/java/com/futsch1/medtimer/medicine/MedicineStockFragment.kt

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,14 @@ class MedicineStockFragment :
5050
}
5151

5252
override fun onEntityLoaded(entity: Medicine, fragmentView: View): Boolean {
53-
fragmentView.findViewById<TextInputEditText>(R.id.amountLeft)
54-
.setText(MedicineHelper.formatAmount(entity.amount, ""))
55-
fragmentView.findViewById<TextInputEditText>(R.id.amountLeft).addDoubleValidator()
53+
amountToView(fragmentView, R.id.amountLeft, entity.amount)
5654

5755
fragmentView.findViewById<TextInputEditText>(R.id.stockUnit).setText(entity.unit)
5856

59-
fragmentView.findViewById<TextInputEditText>(R.id.reminderThreshold)
60-
.setText(MedicineHelper.formatAmount(entity.outOfStockReminderThreshold, ""))
61-
fragmentView.findViewById<TextInputEditText>(R.id.reminderThreshold).addDoubleValidator()
57+
amountToView(fragmentView, R.id.reminderThreshold, entity.outOfStockReminderThreshold)
58+
amountToView(fragmentView, R.id.refillSize, if (entity.refillSizes.isNotEmpty()) entity.refillSizes[0] else 0.0)
6259

63-
if (entity.refillSizes.isNotEmpty()) {
64-
fragmentView.findViewById<TextInputEditText>(R.id.refillSize)
65-
.setText(MedicineHelper.formatAmount(entity.refillSizes[0], ""))
66-
}
67-
fragmentView.findViewById<TextInputEditText>(R.id.refillSize).addDoubleValidator()
68-
69-
val stockReminder: AutoCompleteTextView =
70-
fragmentView.findViewById(R.id.medicineStockReminder)
60+
val stockReminder: AutoCompleteTextView = fragmentView.findViewById(R.id.medicineStockReminder)
7161
val importanceTexts = this.resources.getStringArray(R.array.stock_reminder)
7262
val arrayAdapter = ArrayAdapter(requireContext(), R.layout.dropdown_item, importanceTexts)
7363
stockReminder.setAdapter<ArrayAdapter<String>>(arrayAdapter)
@@ -82,6 +72,11 @@ class MedicineStockFragment :
8272
return true
8373
}
8474

75+
private fun amountToView(fragmentView: View, i: Int, d: Double) {
76+
fragmentView.findViewById<TextInputEditText>(i).setText(MedicineHelper.formatAmount(d, ""))
77+
fragmentView.findViewById<TextInputEditText>(i).addDoubleValidator()
78+
}
79+
8580
@SuppressLint("SetTextI18n")
8681
private fun onRefillClick(fragmentView: View) {
8782
var amount: Double? =

0 commit comments

Comments
 (0)