FatttSnake/oxygen-android
1
0
Fork 0
Code Pull Requests Activity

Refactor(Code structure): Optimize code structure

Browse Source
This commit is contained in:
Fat Snake
2024-08-20 11:22:04 +08:00
parent 167df010a9
commit 1b350eb22a
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolStoreNavigation.kt
View File

@@ -8,7 +8,7 @@ import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
import androidx.navigation.compose.composable 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" const val TOOL_STORE_ROUTE = "tool_store_route"

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolViewNavigation.kt
View File

@@ -7,7 +7,7 @@ import androidx.navigation.NavOptionsBuilder
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.navArgument 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.URLDecoder
import java.net.URLEncoder import java.net.URLEncoder
import kotlin.text.Charsets.UTF_8 import kotlin.text.Charsets.UTF_8

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/ToolsNavigation.kt
View File

@@ -8,7 +8,7 @@ import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
import androidx.navigation.compose.composable 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" const val TOOLS_ROUTE = "tools_route"

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreScreen.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreScreen.kt
View File

@@ -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.activity.compose.ReportDrawnWhen
import androidx.compose.animation.core.Ease import androidx.compose.animation.core.Ease

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolStoreViewModel.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/store/ToolStoreViewModel.kt
View File

@@ -1,4 +1,4 @@
package top.fatweb.oxygen.toolbox.ui.tool package top.fatweb.oxygen.toolbox.ui.store
import android.os.Parcelable import android.os.Parcelable
import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.SavedStateHandle

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreen.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreen.kt
View File

@@ -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.activity.compose.ReportDrawnWhen
import androidx.compose.animation.core.Ease import androidx.compose.animation.core.Ease

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolsScreenViewModel.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tools/ToolsScreenViewModel.kt
View File

@@ -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.SavedStateHandle
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel

2
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreen.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreen.kt
View File

@@ -1,4 +1,4 @@
package top.fatweb.oxygen.toolbox.ui.tool package top.fatweb.oxygen.toolbox.ui.view
import android.annotation.SuppressLint import android.annotation.SuppressLint
import androidx.compose.animation.core.Ease import androidx.compose.animation.core.Ease

5
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/tool/ToolViewScreenViewModel.kt → app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/view/ToolViewScreenViewModel.kt
View File

@@ -1,4 +1,4 @@
package top.fatweb.oxygen.toolbox.ui.tool package top.fatweb.oxygen.toolbox.ui.view
import android.util.Log import android.util.Log
import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.SavedStateHandle
@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
import timber.log.Timber
import top.fatweb.oxygen.toolbox.model.Result import top.fatweb.oxygen.toolbox.model.Result
import top.fatweb.oxygen.toolbox.navigation.ToolViewArgs import top.fatweb.oxygen.toolbox.navigation.ToolViewArgs
import top.fatweb.oxygen.toolbox.repository.tool.StoreRepository import top.fatweb.oxygen.toolbox.repository.tool.StoreRepository
@@ -85,7 +86,7 @@ private fun toolViewUiState(
is Result.Loading -> ToolViewUiState.Loading is Result.Loading -> ToolViewUiState.Loading
is Result.Error -> { is Result.Error -> {
Log.e("TAG", "toolViewUiState: can not load tool", it.exception) Timber.e("Can not load tool", it.exception)
ToolViewUiState.Error ToolViewUiState.Error
} }