From 1b350eb22ab0b4a63049eeba708b56ffb82fea2b Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 20 Aug 2024 11:22:04 +0800 Subject: [PATCH] Refactor(Code structure): Optimize code structure --- .../fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt | 2 +- .../fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt | 2 +- .../top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt | 2 +- .../oxygen/toolbox/ui/{tool => store}/ToolStoreScreen.kt | 2 +- .../oxygen/toolbox/ui/{tool => store}/ToolStoreViewModel.kt | 2 +- .../fatweb/oxygen/toolbox/ui/{tool => tools}/ToolsScreen.kt | 2 +- .../toolbox/ui/{tool => tools}/ToolsScreenViewModel.kt | 2 +- .../oxygen/toolbox/ui/{tool => view}/ToolViewScreen.kt | 2 +- .../toolbox/ui/{tool => view}/ToolViewScreenViewModel.kt | 5 +++-- 9 files changed, 11 insertions(+), 10 deletions(-) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => store}/ToolStoreScreen.kt (99%) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => store}/ToolStoreViewModel.kt (98%) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => tools}/ToolsScreen.kt (99%) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => tools}/ToolsScreenViewModel.kt (98%) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => view}/ToolViewScreen.kt (99%) rename app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/{tool => view}/ToolViewScreenViewModel.kt (97%) diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt index 58cfd1c..029034a 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt @@ -8,7 +8,7 @@ import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import top.fatweb.oxygen.toolbox.ui.tool.ToolStoreRoute +import top.fatweb.oxygen.toolbox.ui.store.ToolStoreRoute const val TOOL_STORE_ROUTE = "tool_store_route" diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt index 18893bf..686420e 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavOptionsBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import top.fatweb.oxygen.toolbox.ui.tool.ToolViewRoute +import top.fatweb.oxygen.toolbox.ui.view.ToolViewRoute import java.net.URLDecoder import java.net.URLEncoder import kotlin.text.Charsets.UTF_8 diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt index 1e83de6..db822ff 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt @@ -8,7 +8,7 @@ import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import top.fatweb.oxygen.toolbox.ui.tool.ToolsRoute +import top.fatweb.oxygen.toolbox.ui.tools.ToolsRoute const val TOOLS_ROUTE = "tools_route" diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreScreen.kt similarity index 99% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreScreen.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreScreen.kt index 62e79bf..8288675 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreScreen.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreScreen.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.store import androidx.activity.compose.ReportDrawnWhen import androidx.compose.animation.core.Ease diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreViewModel.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreViewModel.kt similarity index 98% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreViewModel.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreViewModel.kt index 9d49669..6eb5092 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreViewModel.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreViewModel.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.store import android.os.Parcelable import androidx.lifecycle.SavedStateHandle diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreen.kt similarity index 99% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreen.kt index 7530731..f207e70 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreen.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.tools import androidx.activity.compose.ReportDrawnWhen import androidx.compose.animation.core.Ease diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreenViewModel.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreenViewModel.kt similarity index 98% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreenViewModel.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreenViewModel.kt index 869fd27..6daf289 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreenViewModel.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreenViewModel.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.tools import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreen.kt similarity index 99% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreen.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreen.kt index 22253a0..cac9feb 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreen.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreen.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.view import android.annotation.SuppressLint import androidx.compose.animation.core.Ease diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreenViewModel.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreenViewModel.kt similarity index 97% rename from app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreenViewModel.kt rename to app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreenViewModel.kt index 11b11ff..879248b 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreenViewModel.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreenViewModel.kt @@ -1,4 +1,4 @@ -package top.fatweb.oxygen.toolbox.ui.tool +package top.fatweb.oxygen.toolbox.ui.view import android.util.Log import androidx.lifecycle.SavedStateHandle @@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.stateIn +import timber.log.Timber import top.fatweb.oxygen.toolbox.model.Result import top.fatweb.oxygen.toolbox.navigation.ToolViewArgs import top.fatweb.oxygen.toolbox.repository.tool.StoreRepository @@ -85,7 +86,7 @@ private fun toolViewUiState( is Result.Loading -> ToolViewUiState.Loading is Result.Error -> { - Log.e("TAG", "toolViewUiState: can not load tool", it.exception) + Timber.e("Can not load tool", it.exception) ToolViewUiState.Error }