Skip to content

Commit 4537403

Browse files
Cristhian Escobarclaude
authored and
Cristhian Escobar
committed
Move core-resources and core-ui to top-level modules
- Moved sharedfeatures/core-resources to :core-resources - Moved sharedfeatures/ui-utils to :core-ui - Updated all imports to use new package names: - io.newm.core.resources.* for resources - io.newm.core.ui.* for UI components - io.newm.core.ui.theme.* for theme - Updated snapshot baselines for CreateAccountUi and ResetPasswordUi Co-Authored-By: Claude Opus 4.5 <[email protected]>
1 parent 44d9e58 commit 4537403

File tree

210 files changed

+345
-343
lines changed

Some content is hidden

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

210 files changed

+345
-343
lines changed

‎android/app-newm/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ dependencies {
122122
implementation(project(Modules.BARCODE_SCANNER))
123123
implementation(project(Modules.CORE_ANDROID_IMPLEMENTATIONS))
124124

125-
implementation(project(Modules.CORE_UI_UTILS))
125+
implementation(project(Modules.CORE_UI))
126126
implementation(project(Modules.CORE_RESOURCES))
127127
implementation(project(Modules.MUSIC_PLAYER))
128128
implementation(project(Modules.SHARED))

‎android/app-newm/src/main/java/io/newm/HomeActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.slack.circuit.retained.LocalRetainedStateRegistry
1414
import com.slack.circuit.retained.lifecycleRetainedStateRegistry
1515
import com.slack.circuit.runtime.presenter.Presenter
1616
import com.slack.circuit.runtime.ui.Ui
17+
import io.newm.core.ui.theme.NewmTheme
1718
import io.newm.screens.Screen
1819
import io.newm.screens.Screen.NFTLibrary
1920
import io.newm.screens.forceupdate.ForceAppUpdatePresenter
@@ -67,7 +68,6 @@ import io.newm.sharedfeatures.screens.devmenu.DevMenuPresenter
6768
import io.newm.sharedfeatures.screens.devmenu.DevMenuUi
6869
import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListPresenter
6970
import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListUi
70-
import io.newm.sharedfeatures.theme.NewmTheme
7171
import io.newm.utils.DynamicStatusBarSideEffect
7272
import io.newm.utils.ForceAppUpdateViewModel
7373
import io.newm.utils.ui

‎android/app-newm/src/main/java/io/newm/LoginActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import com.slack.circuit.retained.LocalRetainedStateRegistry
2626
import com.slack.circuit.retained.lifecycleRetainedStateRegistry
2727
import com.slack.circuit.runtime.presenter.Presenter
2828
import com.slack.circuit.runtime.ui.Ui
29+
import io.newm.core.ui.LocalSnackBarHostState
30+
import io.newm.core.ui.theme.NewmTheme
2931
import io.newm.screens.forceupdate.ForceAppUpdateState
3032
import io.newm.screens.forceupdate.ForceAppUpdateUi
3133
import io.newm.screens.forceupdate.openAppPlayStore
@@ -52,8 +54,6 @@ import io.newm.sharedfeatures.screens.devmenu.DevMenuPresenter
5254
import io.newm.sharedfeatures.screens.devmenu.DevMenuUi
5355
import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListPresenter
5456
import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListUi
55-
import io.newm.sharedfeatures.theme.NewmTheme
56-
import io.newm.sharedfeatures.ui.LocalSnackBarHostState
5757
import io.newm.utils.DynamicStatusBarSideEffect
5858
import io.newm.utils.ForceAppUpdateViewModel
5959
import io.newm.utils.ui

‎android/app-newm/src/main/java/io/newm/NewmAppComposable.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ import androidx.core.net.toUri
5050
import com.slack.circuit.backstack.rememberSaveableBackStack
5151
import com.slack.circuit.foundation.NavigableCircuitContent
5252
import com.slack.circuit.foundation.rememberCircuitNavigator
53+
import io.newm.core.resources.R
54+
import io.newm.core.ui.LocalSnackBarHostState
55+
import io.newm.core.ui.theme.Black
56+
import io.newm.core.ui.theme.BrightOrange
57+
import io.newm.core.ui.theme.DarkPink
58+
import io.newm.core.ui.theme.DarkViolet
59+
import io.newm.core.ui.theme.Gray100
60+
import io.newm.core.ui.theme.LightSkyBlue
61+
import io.newm.core.ui.theme.OceanGreen
62+
import io.newm.core.ui.theme.YellowJacket
5363
import io.newm.core.ui.utils.drawWithBrush
64+
import io.newm.core.ui.utils.iconGradient
5465
import io.newm.feature.musicplayer.MiniPlayer
5566
import io.newm.feature.musicplayer.MusicPlayerScreen
5667
import io.newm.screens.Screen
5768
import io.newm.shared.NewmAppLogger
5869
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
5970
import io.newm.shared.commonPublic.analytics.events.AppScreens
6071
import io.newm.shared.config.NewmSharedBuildConfig
61-
import io.newm.sharedfeatures.core.resources.R
6272
import io.newm.sharedfeatures.screens.DevMenuMainScreen
6373
import io.newm.sharedfeatures.screens.devmenu.DebugOverlay
64-
import io.newm.sharedfeatures.theme.Black
65-
import io.newm.sharedfeatures.theme.BrightOrange
66-
import io.newm.sharedfeatures.theme.DarkPink
67-
import io.newm.sharedfeatures.theme.DarkViolet
68-
import io.newm.sharedfeatures.theme.Gray100
69-
import io.newm.sharedfeatures.theme.LightSkyBlue
70-
import io.newm.sharedfeatures.theme.OceanGreen
71-
import io.newm.sharedfeatures.theme.YellowJacket
72-
import io.newm.sharedfeatures.ui.LocalSnackBarHostState
73-
import io.newm.sharedfeatures.ui.utils.iconGradient
7474
import kotlinx.coroutines.launch
7575
import com.slack.circuit.runtime.screen.Screen as CircuitScreen
7676

‎android/app-newm/src/main/java/io/newm/screens/forceupdate/ForceAppUpdateUi.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import androidx.compose.ui.text.style.TextAlign
2020
import androidx.compose.ui.tooling.preview.Preview
2121
import androidx.compose.ui.unit.dp
2222
import androidx.compose.ui.unit.sp
23+
import io.newm.core.resources.R
24+
import io.newm.core.ui.OnboardingMainImage
25+
import io.newm.core.ui.buttons.PrimaryButton
26+
import io.newm.core.ui.theme.NewmTheme
2327
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
24-
import io.newm.sharedfeatures.core.resources.R
25-
import io.newm.sharedfeatures.theme.NewmTheme
26-
import io.newm.sharedfeatures.ui.OnboardingMainImage
27-
import io.newm.sharedfeatures.ui.buttons.PrimaryButton
2828

2929
@Composable
3030
fun ForceAppUpdateUi(

‎android/app-newm/src/main/java/io/newm/screens/investment/portfolio/InvestmentPortfolioUi.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ import coil3.compose.AsyncImage
3232
import coil3.request.ImageRequest
3333
import coil3.request.error
3434
import coil3.request.placeholder
35+
import io.newm.core.resources.R
3536
import io.newm.core.ui.LoadingScreen
37+
import io.newm.core.ui.buttons.SecondaryButton
38+
import io.newm.core.ui.theme.CerisePink
39+
import io.newm.core.ui.theme.Gray16
40+
import io.newm.core.ui.theme.GraySuit
41+
import io.newm.core.ui.theme.SteelPink
42+
import io.newm.core.ui.theme.White
3643
import io.newm.core.ui.utils.ErrorScreen
44+
import io.newm.core.ui.utils.textGradient
3745
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
3846
import io.newm.shared.commonPublic.models.NFTTrack
39-
import io.newm.sharedfeatures.core.resources.R
40-
import io.newm.sharedfeatures.theme.CerisePink
41-
import io.newm.sharedfeatures.theme.Gray16
42-
import io.newm.sharedfeatures.theme.GraySuit
43-
import io.newm.sharedfeatures.theme.SteelPink
44-
import io.newm.sharedfeatures.theme.White
45-
import io.newm.sharedfeatures.ui.buttons.SecondaryButton
46-
import io.newm.sharedfeatures.ui.utils.textGradient
4747

4848
internal const val TAG_INVESTMENT_PORTFOLIO_SCREEN = "TAG_INVESTMENT_PORTFOLIO_SCREEN"
4949

‎android/app-newm/src/main/java/io/newm/screens/library/NFTLibraryScreenUi.kt‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,33 @@ import coil3.compose.AsyncImage
5959
import coil3.request.ImageRequest
6060
import coil3.request.error
6161
import coil3.request.placeholder
62+
import io.newm.core.resources.Res
63+
import io.newm.core.resources.downloaded_description
64+
import io.newm.core.resources.filter_description
65+
import io.newm.core.resources.ic_download
66+
import io.newm.core.resources.ic_downloaded
67+
import io.newm.core.resources.ic_library_filter
68+
import io.newm.core.resources.library_download
69+
import io.newm.core.resources.library_download_description
70+
import io.newm.core.resources.library_remove_description
71+
import io.newm.core.resources.library_search
72+
import io.newm.core.resources.nft_library_error_message
73+
import io.newm.core.resources.title_nft_library
6274
import io.newm.core.ui.LoadingScreen
75+
import io.newm.core.ui.text.SearchBar
76+
import io.newm.core.ui.theme.CerisePink
77+
import io.newm.core.ui.theme.DarkPink
78+
import io.newm.core.ui.theme.DarkViolet
79+
import io.newm.core.ui.theme.Gray16
80+
import io.newm.core.ui.theme.GraySuit
81+
import io.newm.core.ui.theme.NewmTheme
82+
import io.newm.core.ui.theme.Purple
83+
import io.newm.core.ui.theme.StatusGreen
84+
import io.newm.core.ui.theme.SteelPink
85+
import io.newm.core.ui.theme.White
6386
import io.newm.core.ui.utils.ErrorScreen
6487
import io.newm.core.ui.utils.drawWithBrush
88+
import io.newm.core.ui.utils.textGradient
6589
import io.newm.feature.musicplayer.service.DownloadState
6690
import io.newm.screens.library.NFTLibraryEvent.OnApplyFilters
6791
import io.newm.screens.library.NFTLibraryEvent.OnDownloadTrack
@@ -73,30 +97,6 @@ import io.newm.screens.library.screens.ZeroSearchResults
7397
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
7498
import io.newm.shared.commonPublic.analytics.events.AppScreens
7599
import io.newm.shared.commonPublic.models.NFTTrack
76-
import io.newm.sharedfeatures.core.resources.Res
77-
import io.newm.sharedfeatures.core.resources.downloaded_description
78-
import io.newm.sharedfeatures.core.resources.filter_description
79-
import io.newm.sharedfeatures.core.resources.ic_download
80-
import io.newm.sharedfeatures.core.resources.ic_downloaded
81-
import io.newm.sharedfeatures.core.resources.ic_library_filter
82-
import io.newm.sharedfeatures.core.resources.library_download
83-
import io.newm.sharedfeatures.core.resources.library_download_description
84-
import io.newm.sharedfeatures.core.resources.library_remove_description
85-
import io.newm.sharedfeatures.core.resources.library_search
86-
import io.newm.sharedfeatures.core.resources.nft_library_error_message
87-
import io.newm.sharedfeatures.core.resources.title_nft_library
88-
import io.newm.sharedfeatures.theme.CerisePink
89-
import io.newm.sharedfeatures.theme.DarkPink
90-
import io.newm.sharedfeatures.theme.DarkViolet
91-
import io.newm.sharedfeatures.theme.Gray16
92-
import io.newm.sharedfeatures.theme.GraySuit
93-
import io.newm.sharedfeatures.theme.NewmTheme
94-
import io.newm.sharedfeatures.theme.Purple
95-
import io.newm.sharedfeatures.theme.StatusGreen
96-
import io.newm.sharedfeatures.theme.SteelPink
97-
import io.newm.sharedfeatures.theme.White
98-
import io.newm.sharedfeatures.ui.text.SearchBar
99-
import io.newm.sharedfeatures.ui.utils.textGradient
100100
import kotlinx.coroutines.launch
101101
import org.jetbrains.compose.resources.painterResource
102102
import org.jetbrains.compose.resources.stringResource
@@ -374,11 +374,9 @@ private fun TrackRowItem(
374374
ImageRequest
375375
.Builder(LocalContext.current)
376376
.data(track.imageUrl)
377-
.error(
378-
io.newm.sharedfeatures.core.resources.R.drawable.ic_default_track_cover_art,
379-
).placeholder(
380-
io.newm.sharedfeatures.core.resources.R.drawable.ic_default_track_cover_art,
381-
).build(),
377+
.error(io.newm.core.resources.R.drawable.ic_default_track_cover_art)
378+
.placeholder(io.newm.core.resources.R.drawable.ic_default_track_cover_art)
379+
.build(),
382380
modifier = Modifier.size(48.dp).clip(RoundedCornerShape(4.dp)),
383381
contentScale = ContentScale.Crop,
384382
contentDescription = null,

‎android/app-newm/src/main/java/io/newm/screens/library/SongFilterBottomSheet.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ import androidx.compose.ui.text.font.FontWeight
2828
import androidx.compose.ui.unit.dp
2929
import androidx.compose.ui.unit.sp
3030
import io.newm.LocalIsBottomBarVisible
31+
import io.newm.core.resources.R
32+
import io.newm.core.ui.buttons.NewmButton
33+
import io.newm.core.ui.theme.Black
34+
import io.newm.core.ui.theme.Black90
35+
import io.newm.core.ui.theme.DarkViolet
36+
import io.newm.core.ui.theme.Pinkish
37+
import io.newm.core.ui.theme.Purple
38+
import io.newm.core.ui.theme.White
39+
import io.newm.core.ui.utils.iconGradient
3140
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
3241
import io.newm.shared.commonPublic.analytics.events.AppScreens
33-
import io.newm.sharedfeatures.core.resources.R
34-
import io.newm.sharedfeatures.theme.Black
35-
import io.newm.sharedfeatures.theme.Black90
36-
import io.newm.sharedfeatures.theme.DarkViolet
37-
import io.newm.sharedfeatures.theme.Pinkish
38-
import io.newm.sharedfeatures.theme.Purple
39-
import io.newm.sharedfeatures.theme.White
40-
import io.newm.sharedfeatures.ui.buttons.NewmButton
41-
import io.newm.sharedfeatures.ui.utils.iconGradient
4242

4343
private val buttonGradient =
4444
iconGradient(DarkViolet.copy(alpha = 0.08f), Pinkish.copy(alpha = 0.08f))

‎android/app-newm/src/main/java/io/newm/screens/library/screens/EmptyWalletScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import androidx.compose.ui.platform.LocalContext
1717
import androidx.compose.ui.res.stringResource
1818
import androidx.compose.ui.text.style.TextAlign
1919
import androidx.compose.ui.unit.dp
20+
import io.newm.core.resources.R
21+
import io.newm.core.ui.buttons.PrimaryButton
2022
import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
2123
import io.newm.shared.commonPublic.analytics.events.AppScreens
22-
import io.newm.sharedfeatures.core.resources.R
23-
import io.newm.sharedfeatures.ui.buttons.PrimaryButton
2424

2525
private const val RECORD_STORE_URL = "https://recordstore.newm.io/"
2626

‎android/app-newm/src/main/java/io/newm/screens/library/screens/LinkWalletScreen.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ import androidx.compose.ui.text.font.FontWeight
2727
import androidx.compose.ui.text.style.TextAlign
2828
import androidx.compose.ui.unit.dp
2929
import androidx.compose.ui.unit.sp
30+
import io.newm.core.resources.R
3031
import io.newm.core.ui.permissions.AppPermission
3132
import io.newm.core.ui.permissions.doWithPermission
3233
import io.newm.core.ui.permissions.rememberRequestPermissionIntent
34+
import io.newm.core.ui.theme.GraySuit
35+
import io.newm.core.ui.theme.White
3336
import io.newm.core.ui.utils.shortToast
37+
import io.newm.core.ui.wallet.ConnectWalletPanel
3438
import io.newm.feature.barcode.scanner.BarcodeScannerActivity
3539
import io.newm.screens.library.TAG_NFT_LIBRARY_SCREEN
36-
import io.newm.sharedfeatures.core.resources.R
37-
import io.newm.sharedfeatures.theme.GraySuit
38-
import io.newm.sharedfeatures.theme.White
39-
import io.newm.sharedfeatures.ui.wallet.ConnectWalletPanel
4040

4141
@Composable
4242
fun LinkWalletScreen(

0 commit comments

Comments
 (0)