Move main app files to the new mainapp package

yuetyam · Aug 30, 2024 · fb8543f · fb8543f
1 parent b18812c
commit fb8543f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/app/src/main/java/org/jyutping/jyutping/AppContent.kt b/app/src/main/java/org/jyutping/jyutping/AppContent.kt
@@ -4,16 +4,16 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import org.jyutping.jyutping.ui.about.AboutScreen
-import org.jyutping.jyutping.ui.cantonese.CantoneseScreen
-import org.jyutping.jyutping.ui.cantonese.ConfusionScreen
-import org.jyutping.jyutping.ui.cantonese.ExpressionsScreen
-import org.jyutping.jyutping.ui.home.HomeScreen
-import org.jyutping.jyutping.ui.home.IntroductionsScreen
-import org.jyutping.jyutping.ui.romanization.JyutpingFinalsScreen
-import org.jyutping.jyutping.ui.romanization.JyutpingInitialsScreen
-import org.jyutping.jyutping.ui.romanization.JyutpingScreen
-import org.jyutping.jyutping.ui.romanization.JyutpingTonesScreen
+import org.jyutping.jyutping.mainapp.about.AboutScreen
+import org.jyutping.jyutping.mainapp.cantonese.CantoneseScreen
+import org.jyutping.jyutping.mainapp.cantonese.ConfusionScreen
+import org.jyutping.jyutping.mainapp.cantonese.ExpressionsScreen
+import org.jyutping.jyutping.mainapp.home.HomeScreen
+import org.jyutping.jyutping.mainapp.home.IntroductionsScreen
+import org.jyutping.jyutping.mainapp.romanization.JyutpingFinalsScreen
+import org.jyutping.jyutping.mainapp.romanization.JyutpingInitialsScreen
+import org.jyutping.jyutping.mainapp.romanization.JyutpingScreen
+import org.jyutping.jyutping.mainapp.romanization.JyutpingTonesScreen
 
 @Composable
 fun AppContent(navController: NavHostController) {

diff --git a/...jyutping/jyutping/ui/about/AboutScreen.kt → ...ing/jyutping/mainapp/about/AboutScreen.kt b/...jyutping/jyutping/ui/about/AboutScreen.kt → ...ing/jyutping/mainapp/about/AboutScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.about
+package org.jyutping.jyutping.mainapp.about
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/.../jyutping/ui/cantonese/CantoneseScreen.kt → ...ping/mainapp/cantonese/CantoneseScreen.kt b/.../jyutping/ui/cantonese/CantoneseScreen.kt → ...ping/mainapp/cantonese/CantoneseScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.cantonese
+package org.jyutping.jyutping.mainapp.cantonese
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/.../jyutping/ui/cantonese/ConfusionScreen.kt → ...ping/mainapp/cantonese/ConfusionScreen.kt b/.../jyutping/ui/cantonese/ConfusionScreen.kt → ...ping/mainapp/cantonese/ConfusionScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.cantonese
+package org.jyutping.jyutping.mainapp.cantonese
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...yutping/ui/cantonese/ExpressionsScreen.kt → ...ng/mainapp/cantonese/ExpressionsScreen.kt b/...yutping/ui/cantonese/ExpressionsScreen.kt → ...ng/mainapp/cantonese/ExpressionsScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.cantonese
+package org.jyutping.jyutping.mainapp.cantonese
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...g/jyutping/jyutping/ui/home/HomeScreen.kt → ...tping/jyutping/mainapp/home/HomeScreen.kt b/...g/jyutping/jyutping/ui/home/HomeScreen.kt → ...tping/jyutping/mainapp/home/HomeScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.home
+package org.jyutping.jyutping.mainapp.home
 
 import android.content.Context
 import android.content.Intent

diff --git a/...g/jyutping/ui/home/IntroductionsScreen.kt → ...tping/mainapp/home/IntroductionsScreen.kt b/...g/jyutping/ui/home/IntroductionsScreen.kt → ...tping/mainapp/home/IntroductionsScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.home
+package org.jyutping.jyutping.mainapp.home
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn

diff --git a/...g/ui/romanization/JyutpingFinalsScreen.kt → ...napp/romanization/JyutpingFinalsScreen.kt b/...g/ui/romanization/JyutpingFinalsScreen.kt → ...napp/romanization/JyutpingFinalsScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.romanization
+package org.jyutping.jyutping.mainapp.romanization
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...ui/romanization/JyutpingInitialsScreen.kt → ...pp/romanization/JyutpingInitialsScreen.kt b/...ui/romanization/JyutpingInitialsScreen.kt → ...pp/romanization/JyutpingInitialsScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.romanization
+package org.jyutping.jyutping.mainapp.romanization
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...yutping/ui/romanization/JyutpingScreen.kt → ...ng/mainapp/romanization/JyutpingScreen.kt b/...yutping/ui/romanization/JyutpingScreen.kt → ...ng/mainapp/romanization/JyutpingScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.romanization
+package org.jyutping.jyutping.mainapp.romanization
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

diff --git a/...ng/ui/romanization/JyutpingTonesScreen.kt → ...inapp/romanization/JyutpingTonesScreen.kt b/...ng/ui/romanization/JyutpingTonesScreen.kt → ...inapp/romanization/JyutpingTonesScreen.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.romanization
+package org.jyutping.jyutping.mainapp.romanization
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column

diff --git a/.../jyutping/ui/romanization/SyllableCell.kt → ...ping/mainapp/romanization/SyllableCell.kt b/.../jyutping/ui/romanization/SyllableCell.kt → ...ping/mainapp/romanization/SyllableCell.kt
@@ -1,4 +1,4 @@
-package org.jyutping.jyutping.ui.romanization
+package org.jyutping.jyutping.mainapp.romanization
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.text.selection.SelectionContainer