From 25dd79af68247f7cd0a05f63ca0163a1923da926 Mon Sep 17 00:00:00 2001 From: rhunk <101876869+rhunk@users.noreply.github.com> Date: Mon, 3 Jun 2024 01:30:12 +0200 Subject: [PATCH] refactor: root sections Signed-off-by: rhunk <101876869+rhunk@users.noreply.github.com> --- .../me/rhunk/snapenhance/ui/manager/Routes.kt | 26 ++++++++----------- .../{TasksRoot.kt => TasksRootSection.kt} | 2 +- ...FeaturesRoot.kt => FeaturesRootSection.kt} | 2 +- .../home/{HomeRoot.kt => HomeRootSection.kt} | 2 +- ...riptingRoot.kt => ScriptingRootSection.kt} | 2 +- .../{SocialRoot.kt => SocialRootSection.kt} | 2 +- 6 files changed, 16 insertions(+), 20 deletions(-) rename app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/{TasksRoot.kt => TasksRootSection.kt} (99%) rename app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/{FeaturesRoot.kt => FeaturesRootSection.kt} (99%) rename app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/{HomeRoot.kt => HomeRootSection.kt} (99%) rename app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/{ScriptingRoot.kt => ScriptingRootSection.kt} (99%) rename app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/{SocialRoot.kt => SocialRootSection.kt} (99%) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt index 8feb949c..d4eafbda 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/Routes.kt @@ -2,11 +2,7 @@ package me.rhunk.snapenhance.ui.manager import androidx.compose.foundation.layout.RowScope import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.DataObject -import androidx.compose.material.icons.filled.Group -import androidx.compose.material.icons.filled.Home -import androidx.compose.material.icons.filled.Stars -import androidx.compose.material.icons.filled.TaskAlt +import androidx.compose.material.icons.filled.* import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector import androidx.navigation.NavBackStackEntry @@ -18,16 +14,16 @@ import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.ui.manager.pages.BetterLocationRoot import me.rhunk.snapenhance.ui.manager.pages.FileImportsRoot import me.rhunk.snapenhance.ui.manager.pages.LoggerHistoryRoot -import me.rhunk.snapenhance.ui.manager.pages.TasksRoot -import me.rhunk.snapenhance.ui.manager.pages.features.FeaturesRoot +import me.rhunk.snapenhance.ui.manager.pages.TasksRootSection +import me.rhunk.snapenhance.ui.manager.pages.features.FeaturesRootSection import me.rhunk.snapenhance.ui.manager.pages.home.HomeLogs -import me.rhunk.snapenhance.ui.manager.pages.home.HomeRoot +import me.rhunk.snapenhance.ui.manager.pages.home.HomeRootSection import me.rhunk.snapenhance.ui.manager.pages.home.HomeSettings -import me.rhunk.snapenhance.ui.manager.pages.scripting.ScriptingRoot +import me.rhunk.snapenhance.ui.manager.pages.scripting.ScriptingRootSection import me.rhunk.snapenhance.ui.manager.pages.social.LoggedStories import me.rhunk.snapenhance.ui.manager.pages.social.ManageScope import me.rhunk.snapenhance.ui.manager.pages.social.MessagingPreview -import me.rhunk.snapenhance.ui.manager.pages.social.SocialRoot +import me.rhunk.snapenhance.ui.manager.pages.social.SocialRootSection import me.rhunk.snapenhance.ui.manager.pages.tracker.EditRule import me.rhunk.snapenhance.ui.manager.pages.tracker.FriendTrackerManagerRoot @@ -50,11 +46,11 @@ class Routes( lateinit var navController: NavController private val routes = mutableListOf() - val tasks = route(RouteInfo("tasks", icon = Icons.Default.TaskAlt, primary = true), TasksRoot()) + val tasks = route(RouteInfo("tasks", icon = Icons.Default.TaskAlt, primary = true), TasksRootSection()) - val features = route(RouteInfo("features", icon = Icons.Default.Stars, primary = true), FeaturesRoot()) + val features = route(RouteInfo("features", icon = Icons.Default.Stars, primary = true), FeaturesRootSection()) - val home = route(RouteInfo("home", icon = Icons.Default.Home, primary = true), HomeRoot()) + val home = route(RouteInfo("home", icon = Icons.Default.Home, primary = true), HomeRootSection()) val settings = route(RouteInfo("home_settings"), HomeSettings()).parent(home) val homeLogs = route(RouteInfo("home_logs"), HomeLogs()).parent(home) val loggerHistory = route(RouteInfo("logger_history"), LoggerHistoryRoot()).parent(home) @@ -62,12 +58,12 @@ class Routes( val editRule = route(RouteInfo("edit_rule/?rule_id={rule_id}"), EditRule()) val fileImports = route(RouteInfo("file_imports"), FileImportsRoot()).parent(home) - val social = route(RouteInfo("social", icon = Icons.Default.Group, primary = true), SocialRoot()) + val social = route(RouteInfo("social", icon = Icons.Default.Group, primary = true), SocialRootSection()) val manageScope = route(RouteInfo("manage_scope/?scope={scope}&id={id}"), ManageScope()).parent(social) val messagingPreview = route(RouteInfo("messaging_preview/?scope={scope}&id={id}"), MessagingPreview()).parent(social) val loggedStories = route(RouteInfo("logged_stories/?id={id}"), LoggedStories()).parent(social) - val scripting = route(RouteInfo("scripts", icon = Icons.Filled.DataObject, primary = true), ScriptingRoot()) + val scripting = route(RouteInfo("scripts", icon = Icons.Filled.DataObject, primary = true), ScriptingRootSection()) val betterLocation = route(RouteInfo("better_location", showInNavBar = false, primary = true), BetterLocationRoot()) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRootSection.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRoot.kt rename to app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRootSection.kt index f7026d1e..f4fc02f1 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRoot.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/TasksRootSection.kt @@ -43,7 +43,7 @@ import java.io.File import java.util.UUID import kotlin.math.absoluteValue -class TasksRoot : Routes.Route() { +class TasksRootSection : Routes.Route() { private var activeTasks by mutableStateOf(listOf()) private lateinit var recentTasks: MutableList private val taskSelection = mutableStateListOf>() diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRootSection.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRoot.kt rename to app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRootSection.kt index ccd0c321..c641c528 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRoot.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/features/FeaturesRootSection.kt @@ -44,7 +44,7 @@ import me.rhunk.snapenhance.ui.manager.MainActivity import me.rhunk.snapenhance.ui.manager.Routes import me.rhunk.snapenhance.ui.util.* -class FeaturesRoot : Routes.Route() { +class FeaturesRootSection : Routes.Route() { private val alertDialogs by lazy { AlertDialogs(context.translation) } companion object { diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRootSection.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRoot.kt rename to app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRootSection.kt index f4941dbf..c4a7cc2e 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRoot.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/home/HomeRootSection.kt @@ -47,7 +47,7 @@ import me.rhunk.snapenhance.ui.manager.data.Updater import me.rhunk.snapenhance.ui.util.ActivityLauncherHelper import java.text.DateFormat -class HomeRoot : Routes.Route() { +class HomeRootSection : Routes.Route() { companion object { val cardMargin = 10.dp } diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRootSection.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRoot.kt rename to app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRootSection.kt index 16859a0f..2af2ff13 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRoot.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/scripting/ScriptingRootSection.kt @@ -44,7 +44,7 @@ import me.rhunk.snapenhance.ui.util.pullrefresh.PullRefreshIndicator import me.rhunk.snapenhance.ui.util.pullrefresh.pullRefresh import me.rhunk.snapenhance.ui.util.pullrefresh.rememberPullRefreshState -class ScriptingRoot : Routes.Route() { +class ScriptingRootSection : Routes.Route() { private lateinit var activityLauncherHelper: ActivityLauncherHelper private val reloadDispatcher = AsyncUpdateDispatcher(updateOnFirstComposition = false) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRoot.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRootSection.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRoot.kt rename to app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRootSection.kt index 0bb6fb2b..2caf39df 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRoot.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/pages/social/SocialRootSection.kt @@ -34,7 +34,7 @@ import me.rhunk.snapenhance.ui.manager.Routes import me.rhunk.snapenhance.ui.util.coil.BitmojiImage import me.rhunk.snapenhance.ui.util.pagerTabIndicatorOffset -class SocialRoot : Routes.Route() { +class SocialRootSection : Routes.Route() { private var friendList: List by mutableStateOf(emptyList()) private var groupList: List by mutableStateOf(emptyList())