pull/1960/head
rivago 2 years ago
parent 8b9fc9ebc8
commit 133c98da37

@ -117,7 +117,6 @@ class EditHabitActivity : AppCompatActivity() {
binding.notesInput.setText(habit.description)
binding.unitInput.setText(habit.unit)
binding.targetInput.setText(habit.targetValue.toString())
} else {
habitType = HabitType.fromInt(intent.getIntExtra("habitType", HabitType.YES_NO.value))
}
@ -366,15 +365,16 @@ class EditHabitActivity : AppCompatActivity() {
@SuppressLint("StringFormatMatches")
private fun populateWidgetAction() {
binding.widgetActionPicker.text = when (increment){
binding.widgetActionPicker.text = when (increment) {
0.0 -> getString(R.string.widget_action_dialog)
else -> getString(R.string.widget_action_increment)
}
binding.incrementInput.setText(increment.toString())
if (increment != 0.0)
if (increment != 0.0) {
binding.incrementRightBox.visibility = View.VISIBLE
else
} else {
binding.incrementRightBox.visibility = View.GONE
}
}
private fun populateTargetType() {
@ -411,7 +411,7 @@ class EditHabitActivity : AppCompatActivity() {
putInt("reminderHour", reminderHour)
putInt("reminderMin", reminderMin)
putInt("reminderDays", reminderDays.toInteger())
putDouble("increment",increment)
putDouble("increment", increment)
}
}
}

@ -108,7 +108,7 @@ class WidgetReceiver : BroadcastReceiver() {
data.timestamp.unixTime
)
)
controller.onIncrement(data.habit,data.timestamp,(data.habit.increment * 1000).toInt())
controller.onIncrement(data.habit, data.timestamp, (data.habit.increment * 1000).toInt())
}
}
} catch (e: RuntimeException) {

@ -41,10 +41,11 @@ open class CheckmarkWidget(
override fun getOnClickPendingIntent(context: Context): PendingIntent? {
return if (habit.isNumerical) {
if (habit.increment == 0.0)
if (habit.increment == 0.0) {
pendingIntentFactory.showNumberPicker(habit, DateUtils.getTodayWithOffset())
else
} else {
pendingIntentFactory.incrementNumerical(habit, null)
}
} else {
pendingIntentFactory.toggleCheckmark(habit, null)
}

Loading…
Cancel
Save