New feature: Allow users to create groups of habits

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     val kotlinVersion = "1.9.22"
-    id("com.android.application") version "8.1.4" apply (false)
+    id("com.android.application") version "8.4.0" apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)

gradle.properties

@@ -6,3 +6,4 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+org.gradle.java.installations.auto-download=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

uhabits-android/build.gradle.kts

@@ -19,7 +19,7 @@
 
 plugins {
     id("com.github.triplet.play") version "3.8.6"
-    id("com.android.application") version "8.1.4"
+    id("com.android.application") version "8.4.0"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
     id("org.jlleitschuh.gradle.ktlint")

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt

@@ -53,7 +53,7 @@ class HabitCardViewTest : BaseViewTest() {
             .getByInterval(today.minus(300), today)
             .map { it.value }.toIntArray()
 
-        view = component.getHabitCardViewFactory().create().apply {
+        view = component.getHabitCardViewFactory().createHabitCard().apply {
             habit = habit1
             values = entries
             score = habit1.scores[today].value

uhabits-android/src/main/AndroidManifest.xml

@@ -42,6 +42,22 @@
                 android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
 
+        <activity
+            android:name=".activities.habits.list.HabitGroupPickerDialog"
+            android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.habits.list.ListHabitsActivity" />
+        </activity>
+
+        <activity
+            android:name=".activities.habits.edit.EditHabitGroupActivity"
+            android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.habits.list.ListHabitsActivity" />
+        </activity>
+
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw" />
@@ -72,6 +88,14 @@
                 android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
 
+        <activity
+            android:name=".activities.habits.show.ShowHabitGroupActivity"
+            android:label="@string/title_activity_show_habit">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.habits.list.ListHabitsActivity" />
+        </activity>
+
         <activity
             android:name=".activities.settings.SettingsActivity"
             android:label="@string/settings">
@@ -112,6 +136,15 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".widgets.activities.HabitAndGroupPickerDialog"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.Dialog">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".activities.about.AboutActivity"
             android:label="@string/about">

uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt

@@ -79,6 +79,10 @@ class HabitsApplication : Application() {
         val habitList = component.habitList
         for (h in habitList) h.recompute()
 
+        val habitGroupList = component.habitGroupList
+        for (hgr in habitGroupList) hgr.recompute()
+        habitGroupList.attachHabitsToGroups()
+
         widgetUpdater = component.widgetUpdater.apply {
             startListening()
             scheduleStartDayWidgetUpdate()

uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt

@@ -20,6 +20,7 @@ package org.isoron.uhabits.activities
 
 import org.isoron.uhabits.AndroidDirFinder
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
+import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitGroupMenuPresenter
 import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 import java.io.File
 import javax.inject.Inject
@@ -33,3 +34,13 @@ constructor(
         return androidDirFinder.getFilesDir("CSV")!!
     }
 }
+
+class HabitGroupsDirFinder @Inject
+constructor(
+    private val androidDirFinder: AndroidDirFinder
+) : ShowHabitGroupMenuPresenter.System, ListHabitsBehavior.DirFinder {
+
+    override fun getCSVOutputDir(): File {
+        return androidDirFinder.getFilesDir("CSV")!!
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt

@@ -45,8 +45,9 @@ import org.isoron.uhabits.activities.common.dialogs.WeekdayPickerDialog
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateHabitCommand
 import org.isoron.uhabits.core.commands.EditHabitCommand
+import org.isoron.uhabits.core.commands.RefreshParentGroupCommand
 import org.isoron.uhabits.core.models.Frequency
-import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.models.HabitGroup
 import org.isoron.uhabits.core.models.HabitType
 import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.PaletteColor
@@ -76,6 +77,7 @@ class EditHabitActivity : AppCompatActivity() {
 
     var habitId = -1L
     lateinit var habitType: HabitType
+    var parentGroup: HabitGroup? = null
     var unit = ""
     var color = PaletteColor(11)
     var androidColor = 0
@@ -96,10 +98,21 @@ class EditHabitActivity : AppCompatActivity() {
         binding = ActivityEditHabitBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        if (intent.hasExtra("groupId")) {
+            val groupId = intent.getLongExtra("groupId", -1L)
+            parentGroup = component.habitGroupList.getById(groupId)
+            color = parentGroup!!.color
+        }
+
         if (intent.hasExtra("habitId")) {
             binding.toolbar.title = getString(R.string.edit_habit)
-            habitId = intent.getLongExtra("habitId", -1)
-            val habit = component.habitList.getById(habitId)!!
+            habitId = intent.getLongExtra("habitId", -1L)
+            val habitList = if (parentGroup != null) {
+                parentGroup!!.habitList
+            } else {
+                component.habitList
+            }
+            val habit = habitList.getById(habitId)!!
             habitType = habit.type
             color = habit.color
             freqNum = habit.frequency.numerator
@@ -260,9 +273,14 @@ class EditHabitActivity : AppCompatActivity() {
         val component = (application as HabitsApplication).component
         val habit = component.modelFactory.buildHabit()
 
-        var original: Habit? = null
-        if (habitId >= 0) {
-            original = component.habitList.getById(habitId)!!
+        val habitList = if (parentGroup != null) {
+            parentGroup!!.habitList
+        } else {
+            component.habitList
+        }
+
+        if (habitId > 0) {
+            val original = habitList.getById(habitId)!!
             habit.copyFrom(original)
         }
 
@@ -283,21 +301,31 @@ class EditHabitActivity : AppCompatActivity() {
             habit.unit = binding.unitInput.text.trim().toString()
         }
         habit.type = habitType
+        habit.group = parentGroup
+        habit.groupId = parentGroup?.id
+        habit.groupUUID = parentGroup?.uuid
 
-        val command = if (habitId >= 0) {
+        val command = if (habitId > 0) {
             EditHabitCommand(
-                component.habitList,
+                habitList,
                 habitId,
                 habit
             )
         } else {
             CreateHabitCommand(
                 component.modelFactory,
-                component.habitList,
+                habitList,
                 habit
             )
         }
         component.commandRunner.run(command)
+
+        if (habit.groupId != null) {
+            val habitGroupList = component.habitGroupList
+            val refreshCommand = RefreshParentGroupCommand(habit, habitGroupList)
+            component.commandRunner.run(refreshCommand)
+        }
+
         finish()
     }