isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Numerical habits: allow Tasker to increment/decrement value

Browse Source
pull/630/head
Alinson S. Xavier 5 years ago
parent 07f8583c3d
commit 61f32449dd
8 changed files with 145 additions and 67 deletions
Show Stats Download Patch File Download Diff File

15
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt
Unescape View File

@ -22,8 +22,7 @@ package org.isoron.uhabits.automation
import android.app.*
import android.content.*
import android.os.*
import org.isoron.uhabits.*
import org.isoron.uhabits.automation.FireSettingReceiver.*
import org.isoron.uhabits.R
import org.isoron.uhabits.core.models.*
class EditSettingController(private val activity: Activity) {
@ -45,11 +44,13 @@ class EditSettingController(private val activity: Activity) {
}
private fun getActionName(action: Int): String {
when (action) {
ACTION_CHECK -> return activity.getString(R.string.check)
ACTION_UNCHECK -> return activity.getString(R.string.uncheck)
ACTION_TOGGLE -> return activity.getString(R.string.toggle)
else -> return "???"
return when (action) {
ACTION_CHECK -> activity.getString(R.string.check)
ACTION_UNCHECK -> activity.getString(R.string.uncheck)
ACTION_TOGGLE -> activity.getString(R.string.toggle)
ACTION_INCREMENT -> activity.getString(R.string.increment)
ACTION_DECREMENT -> activity.getString(R.string.decrement)
else -> "???"
}
}
}

53
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
Unescape View File

@ -21,6 +21,7 @@ package org.isoron.uhabits.automation
import android.R.layout.*
import android.content.*
import android.view.*
import androidx.appcompat.widget.*
import androidx.appcompat.widget.Toolbar
import android.widget.*
@ -51,10 +52,17 @@ class EditSettingRootView(
addView(inflate(getContext(), R.layout.automation, null))
ButterKnife.bind(this)
populateHabitSpinner()
habitSpinner.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
override fun onNothingSelected(parent: AdapterView<*>?) {
}
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
populateActionSpinner(habitList.getByPosition(position).isNumerical)
}
}
args?.let {
habitSpinner.setSelection(habitList.indexOf(it.habit))
actionSpinner.setSelection(it.action)
populateActionSpinner(it.habit.isNumerical)
actionSpinner.setSelection(mapActionToSpinnerPosition(it.action))
}
}
@ -72,16 +80,49 @@ class EditSettingRootView(
@OnClick(R.id.buttonSave)
fun onClickSave() {
val action = actionSpinner.selectedItemPosition
val habitPosition = habitSpinner.selectedItemPosition
val habit = habitList.getByPosition(habitPosition)
val habit = habitList.getByPosition(habitSpinner.selectedItemPosition)
val action = mapSpinnerPositionToAction(habit.isNumerical,
actionSpinner.selectedItemPosition)
controller.onSave(habit, action)
}
private fun mapSpinnerPositionToAction(isNumerical: Boolean, itemPosition: Int): Int {
return if (isNumerical) {
when (itemPosition) {
0 -> ACTION_INCREMENT
else -> ACTION_DECREMENT
}
} else {
when (itemPosition) {
0 -> ACTION_CHECK
1 -> ACTION_UNCHECK
else -> ACTION_TOGGLE
}
}
}
private fun mapActionToSpinnerPosition(action: Int): Int {
return when(action) {
ACTION_CHECK -> 0
ACTION_UNCHECK -> 1
ACTION_TOGGLE -> 2
ACTION_INCREMENT -> 0
ACTION_DECREMENT -> 1
else -> 0
}
}
private fun populateHabitSpinner() {
val names = habitList.mapTo(LinkedList<String>()) { it.name }
val names = habitList.mapTo(LinkedList()) { it.name }
val adapter = ArrayAdapter(context, simple_spinner_item, names)
adapter.setDropDownViewResource(simple_spinner_dropdown_item)
habitSpinner.adapter = adapter
}
private fun populateActionSpinner(isNumerical: Boolean) {
val entries = (if (isNumerical) R.array.actions_numerical else R.array.actions_yes_no)
val adapter = ArrayAdapter.createFromResource(context, entries, simple_spinner_item)
adapter.setDropDownViewResource(simple_spinner_dropdown_item)
actionSpinner.adapter = adapter
}
}

7
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt
Unescape View File

@ -30,6 +30,9 @@ import org.isoron.uhabits.receivers.*
const val ACTION_CHECK = 0
const val ACTION_UNCHECK = 1
const val ACTION_TOGGLE = 2
const val ACTION_INCREMENT = 3
const val ACTION_DECREMENT = 4
const val EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"
const val EXTRA_STRING_BLURB = "com.twofortyfouram.locale.intent.extra.BLURB"
@ -52,11 +55,13 @@ class FireSettingReceiver : BroadcastReceiver() {
ACTION_CHECK -> controller.onAddRepetition(args.habit, timestamp)
ACTION_UNCHECK -> controller.onRemoveRepetition(args.habit, timestamp)
ACTION_TOGGLE -> controller.onToggleRepetition(args.habit, timestamp)
ACTION_INCREMENT -> controller.onIncrement(args.habit, timestamp, 1000)
ACTION_DECREMENT -> controller.onDecrement(args.habit, timestamp, 1000)
}
}
@ReceiverScope
@Component(dependencies = arrayOf(HabitsApplicationComponent::class))
@Component(dependencies = [HabitsApplicationComponent::class])
internal interface ReceiverComponent {
val widgetController: WidgetBehavior
}

2
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt
Unescape View File

@ -9,7 +9,7 @@ object SettingUtils {
fun parseIntent(intent: Intent, allHabits: HabitList): Arguments? {
val bundle = intent.getBundleExtra(EXTRA_BUNDLE) ?: return null
val action = bundle.getInt("action")
if (action < 0 || action > 2) return null
if (action < 0 || action > 4) return null
val habit = allHabits.getById(bundle.getLong("habit")) ?: return null
return Arguments(action, habit)
}

100
android/uhabits-android/src/main/res/layout/automation.xml
Unescape View File

@ -22,67 +22,81 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="@color/white">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:title="@string/app_name"
app:popupTheme="?toolbarPopupTheme"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:elevation="2dp"
android:gravity="end"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:title="@string/app_name"
app:titleTextColor="@color/white">
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonSave"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
android:text="@string/save"
android:textColor="@color/white"
app:rippleColor="@color/white"
app:strokeColor="@color/white" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/formPanel"
style="@style/dialogFormPanel">
<LinearLayout
style="@style/dialogFormRow">
<FrameLayout style="@style/FormOuterBox">
<LinearLayout style="@style/FormInnerBox">
<TextView
style="@style/dialogFormLabel"
android:text="@string/action"/>
style="@style/FormLabel"
android:text="@string/habit" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/actionSpinner"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:entries="@array/actions"
android:minWidth="400dp"
android:theme="@style/dialogFormText"/>
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:id="@+id/habitSpinner"
android:text="@string/check" />
</LinearLayout>
</FrameLayout>
<LinearLayout
style="@style/dialogFormRow">
<FrameLayout style="@style/FormOuterBox">
<LinearLayout style="@style/FormInnerBox">
<TextView
style="@style/dialogFormLabel"
android:text="@string/habit"/>
style="@style/FormLabel"
android:text="@string/action" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/habitSpinner"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:entries="@array/actions"
android:minWidth="400dp"
android:theme="@style/dialogFormText"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingEnd="16dp"
android:paddingLeft="0dp"
android:paddingRight="16dp"
android:paddingStart="0dp">
android:layout_width="match_parent"
android:id="@+id/actionSpinner"
android:entries="@array/actions_yes_no"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="@string/check" />
</LinearLayout>
</FrameLayout>
<Button
android:id="@+id/buttonSave"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/save"/>
</LinearLayout>
</LinearLayout>

7
android/uhabits-android/src/main/res/values/constants.xml
Unescape View File

@ -72,12 +72,17 @@
<item>-1</item>
</integer-array>
<string-array name="actions" translatable="false">
<string-array name="actions_yes_no" translatable="false">
<item>@string/check</item>
<item>@string/uncheck</item>
<item>@string/toggle</item>
</string-array>
<string-array name="actions_numerical" translatable="false">
<item>@string/increment</item>
<item>@string/decrement</item>
</string-array>
<string-array name="strengthIntervalNames" translatable="false">
<item>@string/day</item>
<item>@string/week</item>

2
android/uhabits-android/src/main/res/values/strings.xml
Unescape View File

@ -198,4 +198,6 @@
<string name="no_habits">No habits found</string>
<string name="no_numerical_habits">No measurable habits found</string>
<string name="no_boolean_habits">No yes-or-no habits found</string>
<string name="increment">Increment</string>
<string name="decrement">Decrement</string>
</resources>

10
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
Unescape View File

@ -24,6 +24,7 @@ import androidx.annotation.*;
import org.isoron.uhabits.core.commands.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.ui.*;
import org.jetbrains.annotations.*;
import javax.inject.*;
@ -82,4 +83,13 @@ public class WidgetBehavior
habit.getId());
}
public void onIncrement(@NotNull Habit habit, @NotNull Timestamp timestamp, int amount) {
int currentValue = habit.getCheckmarks().getValues(timestamp, timestamp)[0];
setNumericValue(habit, timestamp, currentValue + amount);
}
public void onDecrement(@NotNull Habit habit, @NotNull Timestamp timestamp, int amount) {
int currentValue = habit.getCheckmarks().getValues(timestamp, timestamp)[0];
setNumericValue(habit, timestamp, currentValue - amount);
}
}

Write Preview
Loading…
Cancel
Save