isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-14 04:58:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Implement show sub habits

Browse Source
This commit is contained in:
Dharanish
2024-07-05 15:31:41 +02:00
parent 35c9a1a0ab
commit 6ff9c2da61
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
View File

@@ -18,7 +18,6 @@
*/
package org.isoron.uhabits.activities.habits.show
import android.content.ContentUris
import android.os.Bundle
import android.view.HapticFeedbackConstants
import android.view.Menu
@@ -74,8 +73,15 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
super.onCreate(savedInstanceState)
val appComponent = (applicationContext as HabitsApplication).component
val habitList = appComponent.habitList
habit = habitList.getById(ContentUris.parseId(intent.data!!))!!
val habitGroupList = appComponent.habitGroupList
val parentUUID = intent.getStringExtra("parentUUID")
val habitList = if (parentUUID == null) {
appComponent.habitList
} else {
habitGroupList.getByUUID(parentUUID)!!.habitList
}
val uuid = intent.getStringExtra("habitUUID")!!
habit = habitList.getByUUID(uuid)!!
preferences = appComponent.preferences
commandRunner = appComponent.commandRunner
widgetUpdater = appComponent.widgetUpdater

10
uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt
View File

@@ -63,10 +63,12 @@ class IntentFactory
fun startSettingsActivity(context: Context) =
Intent(context, SettingsActivity::class.java)
fun startShowHabitActivity(context: Context, habit: Habit) =
Intent(context, ShowHabitActivity::class.java).apply {
data = Uri.parse(habit.uriString)
}
fun startShowHabitActivity(context: Context, habit: Habit): Intent {
val intent = Intent(context, ShowHabitActivity::class.java)
intent.putExtra("habitUUID", habit.uuid)
intent.putExtra("parentUUID", habit.parentUUID)
return intent
}
fun startShowHabitGroupActivity(context: Context, habitGroup: HabitGroup) =
Intent(context, ShowHabitGroupActivity::class.java).apply {