move Common.kt into its own package under ui

Arian04 · Jun 25, 2024 · e89b208 · e89b208
1 parent 5e5492a
commit e89b208
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 23 deletions.
diff --git a/app/src/main/java/me/arianb/usb_hid_client/HelpScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/HelpScreen.kt
@@ -23,14 +23,14 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.widget.TextViewCompat
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
 import me.arianb.usb_hid_client.ui.theme.PaddingExtraLarge
 import me.arianb.usb_hid_client.ui.theme.PaddingNone
 import me.arianb.usb_hid_client.ui.theme.PaddingNormal
 import me.arianb.usb_hid_client.ui.theme.PaddingSmall
-import me.arianb.usb_hid_client.ui.theme.SimpleNavTopBar
-import me.arianb.usb_hid_client.ui.theme.getColorByTheme
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
+import me.arianb.usb_hid_client.ui.utils.SimpleNavTopBar
+import me.arianb.usb_hid_client.ui.utils.getColorByTheme
 
 
 class HelpScreen : Screen {

diff --git a/app/src/main/java/me/arianb/usb_hid_client/InfoScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/InfoScreen.kt
@@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
 import me.arianb.usb_hid_client.ui.theme.PaddingNormal
-import me.arianb.usb_hid_client.ui.theme.SimpleNavTopBar
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
+import me.arianb.usb_hid_client.ui.utils.SimpleNavTopBar
 
 class InfoScreen : Screen {
     @Composable

diff --git a/app/src/main/java/me/arianb/usb_hid_client/MainScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/MainScreen.kt
@@ -34,9 +34,9 @@ import me.arianb.usb_hid_client.input_views.ManualInput
 import me.arianb.usb_hid_client.input_views.Touchpad
 import me.arianb.usb_hid_client.settings.SettingsScreen
 import me.arianb.usb_hid_client.shell_utils.RootStateHolder
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.BasicTopBar
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.BasicTopBar
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
 import timber.log.Timber
 
 class MainScreen : Screen {

diff --git a/app/src/main/java/me/arianb/usb_hid_client/OnboardingScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/OnboardingScreen.kt
@@ -16,10 +16,10 @@ import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import me.arianb.usb_hid_client.settings.ONBOARDING_DONE_KEY
 import me.arianb.usb_hid_client.settings.SettingsViewModel
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.BasicTopBar
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
 import me.arianb.usb_hid_client.ui.theme.PaddingExtraExtraLarge
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.BasicTopBar
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
 
 class OnboardingScreen : Screen {
     @Composable

diff --git a/app/src/main/java/me/arianb/usb_hid_client/TroubleshootingScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/TroubleshootingScreen.kt
@@ -39,12 +39,12 @@ import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
 import me.arianb.usb_hid_client.settings.ExportLogsPreferenceButton
 import me.arianb.usb_hid_client.shell_utils.RootMethod
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
-import me.arianb.usb_hid_client.ui.theme.LabeledCategory
-import me.arianb.usb_hid_client.ui.theme.SimpleNavTopBar
 import me.arianb.usb_hid_client.ui.theme.codeLineHeightScaleFactor
 import me.arianb.usb_hid_client.ui.theme.codeStyle
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
+import me.arianb.usb_hid_client.ui.utils.LabeledCategory
+import me.arianb.usb_hid_client.ui.utils.SimpleNavTopBar
 import timber.log.Timber
 
 class TroubleshootingScreen : Screen {

diff --git a/app/src/main/java/me/arianb/usb_hid_client/input_views/TouchpadView.kt b/app/src/main/java/me/arianb/usb_hid_client/input_views/TouchpadView.kt
@@ -21,7 +21,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import me.arianb.usb_hid_client.MainViewModel
 import me.arianb.usb_hid_client.R
 import me.arianb.usb_hid_client.report_senders.MouseSender
-import me.arianb.usb_hid_client.ui.theme.getColorByTheme
+import me.arianb.usb_hid_client.ui.utils.getColorByTheme
 import timber.log.Timber
 import kotlin.math.abs
 import kotlin.math.ceil

diff --git a/app/src/main/java/me/arianb/usb_hid_client/settings/SettingsHelper.kt b/app/src/main/java/me/arianb/usb_hid_client/settings/SettingsHelper.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.topjohnwu.superuser.Shell
 import me.arianb.usb_hid_client.BuildConfig
-import me.arianb.usb_hid_client.ui.theme.LabeledCategory
+import me.arianb.usb_hid_client.ui.utils.LabeledCategory
 import timber.log.Timber
 import java.io.IOException
 

diff --git a/app/src/main/java/me/arianb/usb_hid_client/settings/SettingsScreen.kt b/app/src/main/java/me/arianb/usb_hid_client/settings/SettingsScreen.kt
@@ -15,11 +15,11 @@ import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.Navigator
 import me.arianb.usb_hid_client.BuildConfig
 import me.arianb.usb_hid_client.R
-import me.arianb.usb_hid_client.ui.theme.BasicPage
-import me.arianb.usb_hid_client.ui.theme.DarkLightModePreviews
 import me.arianb.usb_hid_client.ui.theme.PaddingNormal
-import me.arianb.usb_hid_client.ui.theme.SimpleNavTopBar
 import me.arianb.usb_hid_client.ui.theme.isDynamicColorAvailable
+import me.arianb.usb_hid_client.ui.utils.BasicPage
+import me.arianb.usb_hid_client.ui.utils.DarkLightModePreviews
+import me.arianb.usb_hid_client.ui.utils.SimpleNavTopBar
 import timber.log.Timber
 
 class SettingsScreen : Screen {

diff --git a/.../arianb/usb_hid_client/ui/theme/Common.kt → .../arianb/usb_hid_client/ui/utils/Common.kt b/.../arianb/usb_hid_client/ui/theme/Common.kt → .../arianb/usb_hid_client/ui/utils/Common.kt
@@ -1,4 +1,4 @@
-package me.arianb.usb_hid_client.ui.theme
+package me.arianb.usb_hid_client.ui.utils
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Arrangement
@@ -37,6 +37,9 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import me.arianb.usb_hid_client.settings.AppTheme
 import me.arianb.usb_hid_client.settings.SettingsViewModel
+import me.arianb.usb_hid_client.ui.theme.PaddingLarge
+import me.arianb.usb_hid_client.ui.theme.PaddingNormal
+import me.arianb.usb_hid_client.ui.theme.USBHIDClientTheme
 
 @Composable
 fun BasicPage(