Refactor to have a ui package at the same level of domain and data pa…

…ckages
Orange-OpenSource · Jan 2, 2024 · 24f4fb4 · 24f4fb4
1 parent 372fee9
commit 24f4fb4
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 47 deletions.
diff --git a/app/src/main/java/com/orange/ods/app/ui/AppNavGraph.kt b/app/src/main/java/com/orange/ods/app/ui/AppNavGraph.kt
@@ -18,7 +18,7 @@ import com.orange.ods.app.ui.components.addComponentsGraph
 import com.orange.ods.app.ui.guidelines.addGuidelinesGraph
 import com.orange.ods.app.ui.modules.addModulesGraph
 import com.orange.ods.app.ui.search.SearchScreen
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
 
 /**
  * Destinations used in the [MainScreen].

diff --git a/app/src/main/java/com/orange/ods/app/ui/BottomBar.kt b/app/src/main/java/com/orange/ods/app/ui/BottomBar.kt
@@ -24,8 +24,8 @@ import com.orange.ods.app.ui.components.ComponentsScreen
 import com.orange.ods.app.ui.guidelines.GuidelinesScreen
 import com.orange.ods.app.ui.modules.ModulesScreen
 import com.orange.ods.compose.component.bottomnavigation.OdsBottomNavigation
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
-import com.orange.ods.module.about.navigation.odsAboutGraph
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.navigation.odsAboutGraph
 
 @Composable
 fun BottomBar(items: Array<BottomBarItem>, currentRoute: String, navigateToRoute: (String) -> Unit) {

diff --git a/app/src/main/java/com/orange/ods/app/ui/MainScreen.kt b/app/src/main/java/com/orange/ods/app/ui/MainScreen.kt
@@ -11,13 +11,10 @@
 package com.orange.ods.app.ui
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -63,7 +60,7 @@ import com.orange.ods.compose.component.tab.OdsTabRow
 import com.orange.ods.compose.text.OdsTextH6
 import com.orange.ods.compose.theme.OdsTheme
 import com.orange.ods.extension.orElse
-import com.orange.ods.module.about.navigation.navigateToOdsAbout
+import com.orange.ods.module.about.ui.navigation.navigateToOdsAbout
 import com.orange.ods.theme.OdsThemeConfigurationContract
 import com.orange.ods.xml.theme.OdsXml
 import com.orange.ods.xml.utilities.extension.xml

diff --git a/app/src/main/java/com/orange/ods/app/ui/about/AppAboutConfiguration.kt b/app/src/main/java/com/orange/ods/app/ui/about/AppAboutConfiguration.kt
@@ -18,11 +18,11 @@ import com.orange.ods.app.R
 import com.orange.ods.app.ui.CustomAppBarConfiguration
 import com.orange.ods.app.ui.LocalAppBarManager
 import com.orange.ods.app.ui.utilities.extension.launchUrl
-import com.orange.ods.module.about.configuration.OdsAboutFileMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
-import com.orange.ods.module.about.configuration.OdsAboutShareData
-import com.orange.ods.module.about.configuration.OdsAboutUrlMenuItem
-import com.orange.ods.module.about.utilities.OdsAboutVersionHelper
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutFileMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutShareData
+import com.orange.ods.module.about.ui.configuration.OdsAboutUrlMenuItem
+import com.orange.ods.module.about.ui.utilities.OdsAboutVersionHelper
 
 const val RateTheAppUrl = "https://play.google.com/apps/testing/com.orange.ods.app"
 private const val ShareUrl = "http://oran.ge/dsapp"

diff --git a/app/src/main/java/com/orange/ods/app/ui/modules/about/AboutCustomizationViewModel.kt b/app/src/main/java/com/orange/ods/app/ui/modules/about/AboutCustomizationViewModel.kt
@@ -24,10 +24,10 @@ import com.orange.ods.app.ui.CustomAppBarConfiguration
 import com.orange.ods.app.ui.LocalAppBarManager
 import com.orange.ods.app.ui.about.RateTheAppUrl
 import com.orange.ods.app.ui.components.utilities.clickOnElement
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
-import com.orange.ods.module.about.configuration.OdsAboutFileMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutShareData
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutFileMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutShareData
 
 class AboutCustomizationViewModel : ViewModel() {
 

diff --git a/...ge/ods/module/about/OdsAboutFileScreen.kt → ...ods/module/about/ui/OdsAboutFileScreen.kt b/...ge/ods/module/about/OdsAboutFileScreen.kt → ...ods/module/about/ui/OdsAboutFileScreen.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about
+package com.orange.ods.module.about.ui
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -20,10 +20,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.viewinterop.AndroidView
 import com.orange.ods.compose.theme.OdsTheme
-import com.orange.ods.module.about.configuration.OdsAboutFileMenuItem
-import com.orange.ods.module.about.utilities.Markdown
-import com.orange.ods.module.about.utilities.extension.injectLightDarkModeCss
-import com.orange.ods.module.about.utilities.extension.launchUrl
+import com.orange.ods.module.about.ui.configuration.OdsAboutFileMenuItem
+import com.orange.ods.module.about.ui.utilities.Markdown
+import com.orange.ods.module.about.ui.utilities.extension.injectLightDarkModeCss
+import com.orange.ods.module.about.ui.utilities.extension.launchUrl
 import java.io.BufferedReader
 import java.nio.charset.StandardCharsets
 

diff --git a/...ge/ods/module/about/OdsAboutHomeScreen.kt → ...ods/module/about/ui/OdsAboutHomeScreen.kt b/...ge/ods/module/about/OdsAboutHomeScreen.kt → ...ods/module/about/ui/OdsAboutHomeScreen.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about
+package com.orange.ods.module.about.ui
 
 import android.content.Intent
 import androidx.compose.foundation.Image
@@ -39,9 +39,10 @@ import com.orange.ods.compose.component.utilities.UiModePreviews
 import com.orange.ods.compose.text.OdsTextBody1
 import com.orange.ods.compose.text.OdsTextBody2
 import com.orange.ods.compose.text.OdsTextH4
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
-import com.orange.ods.module.about.configuration.OdsAboutFileMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutShareData
+import com.orange.ods.module.about.R
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutFileMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutShareData
 
 private const val ImageHeight = 249
 

diff --git a/...nge/ods/module/about/OdsAboutViewModel.kt → .../ods/module/about/ui/OdsAboutViewModel.kt b/...nge/ods/module/about/OdsAboutViewModel.kt → .../ods/module/about/ui/OdsAboutViewModel.kt
@@ -8,13 +8,13 @@
  * /
  */
 
-package com.orange.ods.module.about
+package com.orange.ods.module.about.ui
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
 
 internal class OdsAboutViewModel : ViewModel() {
     var configuration: OdsAboutConfiguration? by mutableStateOf(null)

diff --git a/...le/about/appnews/OdsAboutAppNewsScreen.kt → ...about/ui/appnews/OdsAboutAppNewsScreen.kt b/...le/about/appnews/OdsAboutAppNewsScreen.kt → ...about/ui/appnews/OdsAboutAppNewsScreen.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.appnews
+package com.orange.ods.module.about.ui.appnews
 
 import androidx.annotation.RawRes
 import androidx.compose.foundation.layout.PaddingValues

diff --git a/...about/appnews/OdsAboutAppNewsViewModel.kt → ...ut/ui/appnews/OdsAboutAppNewsViewModel.kt b/...about/appnews/OdsAboutAppNewsViewModel.kt → ...ut/ui/appnews/OdsAboutAppNewsViewModel.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.appnews
+package com.orange.ods.module.about.ui.appnews
 
 import androidx.annotation.RawRes
 import androidx.compose.runtime.mutableStateListOf

diff --git a/...ut/configuration/OdsAboutConfiguration.kt → ...ui/configuration/OdsAboutConfiguration.kt b/...ut/configuration/OdsAboutConfiguration.kt → ...ui/configuration/OdsAboutConfiguration.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.configuration
+package com.orange.ods.module.about.ui.configuration
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.RawRes

diff --git a/...e/about/configuration/OdsAboutMenuItem.kt → ...bout/ui/configuration/OdsAboutMenuItem.kt b/...e/about/configuration/OdsAboutMenuItem.kt → ...bout/ui/configuration/OdsAboutMenuItem.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.configuration
+package com.orange.ods.module.about.ui.configuration
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.RawRes

diff --git a/...le/about/navigation/OdsAboutNavigation.kt → ...about/ui/navigation/OdsAboutNavigation.kt b/...le/about/navigation/OdsAboutNavigation.kt → ...about/ui/navigation/OdsAboutNavigation.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.navigation
+package com.orange.ods.module.about.ui.navigation
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
@@ -21,17 +21,17 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
-import com.orange.ods.module.about.OdsAboutFileScreen
-import com.orange.ods.module.about.OdsAboutHomeScreen
-import com.orange.ods.module.about.OdsAboutViewModel
-import com.orange.ods.module.about.appnews.OdsAboutAppNewsScreen
-import com.orange.ods.module.about.configuration.OdsAboutAppNewsMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutConfiguration
-import com.orange.ods.module.about.configuration.OdsAboutFileMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutMenuItem
-import com.orange.ods.module.about.configuration.OdsAboutUrlMenuItem
-import com.orange.ods.module.about.navigation.OdsAboutDestinations.AppNewsRoute
-import com.orange.ods.module.about.utilities.extension.launchUrl
+import com.orange.ods.module.about.ui.OdsAboutFileScreen
+import com.orange.ods.module.about.ui.OdsAboutHomeScreen
+import com.orange.ods.module.about.ui.OdsAboutViewModel
+import com.orange.ods.module.about.ui.appnews.OdsAboutAppNewsScreen
+import com.orange.ods.module.about.ui.configuration.OdsAboutAppNewsMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutConfiguration
+import com.orange.ods.module.about.ui.configuration.OdsAboutFileMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutMenuItem
+import com.orange.ods.module.about.ui.configuration.OdsAboutUrlMenuItem
+import com.orange.ods.module.about.ui.navigation.OdsAboutDestinations.AppNewsRoute
+import com.orange.ods.module.about.ui.utilities.extension.launchUrl
 
 
 private object OdsAboutDestinations {

diff --git a/...ge/ods/module/about/utilities/Markdown.kt → ...ods/module/about/ui/utilities/Markdown.kt b/...ge/ods/module/about/utilities/Markdown.kt → ...ods/module/about/ui/utilities/Markdown.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.utilities
+package com.orange.ods.module.about.ui.utilities
 
 internal object Markdown {
 

diff --git a/.../about/utilities/OdsAboutVersionHelper.kt → ...out/ui/utilities/OdsAboutVersionHelper.kt b/.../about/utilities/OdsAboutVersionHelper.kt → ...out/ui/utilities/OdsAboutVersionHelper.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.utilities
+package com.orange.ods.module.about.ui.utilities
 
 import android.content.Context
 import android.content.pm.PackageInfo

diff --git a/...e/about/utilities/extension/ContextExt.kt → ...bout/ui/utilities/extension/ContextExt.kt b/...e/about/utilities/extension/ContextExt.kt → ...bout/ui/utilities/extension/ContextExt.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.utilities.extension
+package com.orange.ods.module.about.ui.utilities.extension
 
 import android.content.ActivityNotFoundException
 import android.content.Context

diff --git a/...e/about/utilities/extension/WebViewExt.kt → ...bout/ui/utilities/extension/WebViewExt.kt b/...e/about/utilities/extension/WebViewExt.kt → ...bout/ui/utilities/extension/WebViewExt.kt
@@ -8,7 +8,7 @@
  * /
  */
 
-package com.orange.ods.module.about.utilities.extension
+package com.orange.ods.module.about.ui.utilities.extension
 
 import android.webkit.WebView
 import androidx.annotation.RawRes
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
      * /
      */
-    package com.orange.ods.module.about.utilities
+    package com.orange.ods.module.about.ui.utilities
     internal object Markdown {
@@ Expand Down @@