Skip to content

Commit 3fd5fec

Browse files
bmc08gtbmc08gt
committed
chore: reorganize utils into ui/non-ui
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 724c347 commit 3fd5fec

100 files changed

Lines changed: 241 additions & 316 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/java/com/getcode/CodeApp.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@ import com.getcode.navigation.core.LocalCodeNavigator
3030
import com.getcode.navigation.screens.LoginScreen
3131
import com.getcode.navigation.screens.MainRoot
3232
import com.getcode.navigation.transitions.SheetSlideTransition
33-
import com.getcode.theme.Brand
3433
import com.getcode.theme.CodeTheme
3534
import com.getcode.theme.LocalCodeColors
36-
import com.getcode.util.getActivity
37-
import com.getcode.util.getActivityScopedViewModel
38-
import com.getcode.util.measured
39-
import com.getcode.view.components.AuthCheck
40-
import com.getcode.view.components.BottomBarContainer
41-
import com.getcode.view.components.CodeScaffold
42-
import com.getcode.view.components.TitleBar
43-
import com.getcode.view.components.TopBarContainer
35+
import com.getcode.ui.utils.getActivity
36+
import com.getcode.ui.utils.getActivityScopedViewModel
37+
import com.getcode.ui.utils.measured
38+
import com.getcode.ui.components.AuthCheck
39+
import com.getcode.ui.components.BottomBarContainer
40+
import com.getcode.ui.components.CodeScaffold
41+
import com.getcode.ui.components.TitleBar
42+
import com.getcode.ui.components.TopBarContainer
4443

4544
@Composable
4645
fun CodeApp() {

‎app/src/main/java/com/getcode/analytics/AnalyticsWatcher.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.compose.ui.platform.LocalContext
88
import androidx.lifecycle.Lifecycle
99
import androidx.lifecycle.LifecycleOwner
1010
import com.getcode.LocalAnalytics
11-
import com.getcode.util.RepeatOnLifecycle
11+
import com.getcode.ui.utils.RepeatOnLifecycle
1212

1313
@Composable
1414
fun AnalyticsWatcher(

‎app/src/main/java/com/getcode/navigation/screens/ChatScreens.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.getcode.analytics.AnalyticsManager
1717
import com.getcode.analytics.AnalyticsScreenWatcher
1818
import com.getcode.model.ID
1919
import com.getcode.navigation.core.LocalCodeNavigator
20-
import com.getcode.util.getActivityScopedViewModel
21-
import com.getcode.view.components.chat.localized
20+
import com.getcode.ui.utils.getActivityScopedViewModel
21+
import com.getcode.ui.components.chat.localized
2222
import com.getcode.view.main.balance.BalanceSheet
2323
import com.getcode.view.main.balance.BalanceSheetViewModel
2424
import com.getcode.view.main.chat.ChatScreen

‎app/src/main/java/com/getcode/navigation/screens/Graphs.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package com.getcode.navigation.screens
22

33
import android.os.Parcelable
4-
import androidx.compose.runtime.Composable
54
import cafe.adriel.voyager.core.screen.Screen
6-
import com.getcode.util.getActivityScopedViewModel
7-
import com.getcode.view.main.currency.CurrencyViewModel
8-
import com.getcode.view.main.home.HomeViewModel
95
import kotlinx.parcelize.Parcelize
106

117
/**

‎app/src/main/java/com/getcode/navigation/screens/LoginScreens.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import cafe.adriel.voyager.core.screen.uniqueScreenKey
99
import cafe.adriel.voyager.hilt.getViewModel
1010
import com.getcode.R
1111
import com.getcode.navigation.core.LocalCodeNavigator
12-
import com.getcode.util.getStackScopedViewModel
12+
import com.getcode.ui.utils.getStackScopedViewModel
1313
import com.getcode.view.login.AccessKey
1414
import com.getcode.view.login.AccessKeyViewModel
1515
import com.getcode.view.login.CameraPermission

‎app/src/main/java/com/getcode/navigation/screens/MainScreens.kt‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
package com.getcode.navigation.screens
22

33
import androidx.compose.runtime.Composable
4-
import androidx.compose.runtime.collectAsState
5-
import androidx.compose.runtime.derivedStateOf
6-
import androidx.compose.runtime.getValue
7-
import androidx.compose.runtime.remember
84
import androidx.compose.ui.platform.LocalLifecycleOwner
95
import androidx.compose.ui.res.stringResource
106
import androidx.lifecycle.Lifecycle
117
import cafe.adriel.voyager.core.screen.ScreenKey
128
import cafe.adriel.voyager.core.screen.uniqueScreenKey
139
import cafe.adriel.voyager.hilt.getViewModel
1410
import com.getcode.R
15-
import com.getcode.analytics.AnalyticsScreenWatcher
1611
import com.getcode.analytics.AnalyticsManager
12+
import com.getcode.analytics.AnalyticsScreenWatcher
1713
import com.getcode.model.KinAmount
1814
import com.getcode.navigation.core.LocalCodeNavigator
19-
import com.getcode.util.RepeatOnLifecycle
20-
import com.getcode.util.getActivityScopedViewModel
21-
import com.getcode.view.components.startupLog
15+
import com.getcode.ui.components.startupLog
16+
import com.getcode.ui.utils.RepeatOnLifecycle
17+
import com.getcode.ui.utils.getActivityScopedViewModel
2218
import com.getcode.view.main.account.AccountHome
2319
import com.getcode.view.main.account.AccountSheetViewModel
24-
import com.getcode.view.main.balance.BalanceSheet
25-
import com.getcode.view.main.balance.BalanceSheetViewModel
2620
import com.getcode.view.main.getKin.GetKinSheet
2721
import com.getcode.view.main.giveKin.GiveKinSheet
2822
import com.getcode.view.main.home.HomeScreen

‎app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.getcode.R
1010
import com.getcode.analytics.AnalyticsManager
1111
import com.getcode.analytics.AnalyticsScreenWatcher
1212
import com.getcode.navigation.core.LocalCodeNavigator
13-
import com.getcode.util.getActivityScopedViewModel
14-
import com.getcode.util.getStackScopedViewModel
13+
import com.getcode.ui.utils.getActivityScopedViewModel
14+
import com.getcode.ui.utils.getStackScopedViewModel
1515
import com.getcode.view.login.PhoneConfirm
1616
import com.getcode.view.login.PhoneVerify
1717
import com.getcode.view.login.PhoneVerifyViewModel

‎app/src/main/java/com/getcode/navigation/screens/Modals.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import cafe.adriel.voyager.core.screen.uniqueScreenKey
2525
import com.getcode.navigation.core.CodeNavigator
2626
import com.getcode.navigation.core.LocalCodeNavigator
2727
import com.getcode.theme.CodeTheme
28-
import com.getcode.view.components.SheetTitle
29-
import com.getcode.view.components.keyboardAsState
28+
import com.getcode.ui.components.SheetTitle
29+
import com.getcode.ui.components.keyboardAsState
3030
import kotlinx.coroutines.delay
3131
import kotlinx.coroutines.launch
3232

‎app/src/main/java/com/getcode/navigation/screens/PhoneCountrySelection.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.getcode.theme.BrandLight
2424
import com.getcode.theme.CodeTheme
2525
import com.getcode.theme.White05
2626
import com.getcode.util.PhoneUtils
27-
import com.getcode.util.rememberedClickable
27+
import com.getcode.ui.utils.rememberedClickable
2828
import com.getcode.view.login.PhoneVerifyUiModel
2929
import com.getcode.view.login.PhoneVerifyViewModel
3030

app/src/main/java/com/getcode/view/components/AccessKeySelectionContainer.kt renamed to app/src/main/java/com/getcode/ui/components/AccessKeySelectionContainer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.getcode.view.components
1+
package com.getcode.ui.components
22

33
import android.widget.Toast
44
import androidx.compose.animation.core.animateFloatAsState
@@ -21,8 +21,8 @@ import androidx.compose.ui.platform.LocalTextToolbar
2121
import androidx.compose.ui.platform.TextToolbar
2222
import androidx.compose.ui.text.AnnotatedString
2323
import androidx.lifecycle.Lifecycle
24-
import com.getcode.util.rememberedLongClickable
25-
import com.getcode.util.swallowClicks
24+
import com.getcode.ui.utils.rememberedLongClickable
25+
import com.getcode.ui.utils.swallowClicks
2626
import com.getcode.util.vibration.LocalVibrator
2727

2828
class AccessKeySelectionContainerState(val words: String = "") {

0 commit comments

Comments
 (0)