Improved component organisation

TeamNewPipe · Aug 11, 2024 · b05b98c · b05b98c
1 parent 7a7f81a
commit b05b98c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 15 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
@@ -5,8 +5,9 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.res.stringResource
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.screen.ScaffoldWithToolbar
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
+import org.schabi.newpipe.ui.screens.AboutScreen
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 
 class AboutActivity : AppCompatActivity() {

diff --git a/...ava/org/schabi/newpipe/compose/Toolbar.kt → ...ain/java/org/schabi/newpipe/ui/Toolbar.kt b/...ava/org/schabi/newpipe/compose/Toolbar.kt → ...ain/java/org/schabi/newpipe/ui/Toolbar.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose
+package org.schabi.newpipe.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -27,8 +27,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.theme.AppTheme
-import org.schabi.newpipe.compose.theme.SizeTokens
+import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.ui.theme.SizeTokens
 
 @Composable
 fun TextAction(text: String, modifier: Modifier = Modifier) {

diff --git a/.../org/schabi/newpipe/about/AboutClasses.kt → ...wpipe/ui/components/about/AboutClasses.kt b/.../org/schabi/newpipe/about/AboutClasses.kt → ...wpipe/ui/components/about/AboutClasses.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import android.content.Context
 import androidx.annotation.StringRes

diff --git a/...java/org/schabi/newpipe/about/AboutTab.kt → ...i/newpipe/ui/components/about/AboutTab.kt b/...java/org/schabi/newpipe/about/AboutTab.kt → ...i/newpipe/ui/components/about/AboutTab.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column

diff --git a/...va/org/schabi/newpipe/about/LicenseTab.kt → ...newpipe/ui/components/about/LicenseTab.kt b/...va/org/schabi/newpipe/about/LicenseTab.kt → ...newpipe/ui/components/about/LicenseTab.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column

diff --git a/.../schabi/newpipe/about/StandardLicenses.kt → ...e/ui/components/about/StandardLicenses.kt b/.../schabi/newpipe/about/StandardLicenses.kt → ...e/ui/components/about/StandardLicenses.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 /**
  * Class containing information about standard software licenses.

diff --git a/...ipe/compose/screen/ScaffoldWithToolbar.kt → .../components/common/ScaffoldWithToolbar.kt b/...ipe/compose/screen/ScaffoldWithToolbar.kt → .../components/common/ScaffoldWithToolbar.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.screen
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope

diff --git a/...a/org/schabi/newpipe/about/AboutScreen.kt → .../schabi/newpipe/ui/screens/AboutScreen.kt b/...a/org/schabi/newpipe/about/AboutScreen.kt → .../schabi/newpipe/ui/screens/AboutScreen.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.screens
 
 import android.content.res.Configuration
 import androidx.collection.intListOf
@@ -30,7 +30,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import my.nanihadesuka.compose.ColumnScrollbar
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.about.AboutTab
+import org.schabi.newpipe.ui.components.about.LicenseTab
+import org.schabi.newpipe.ui.theme.AppTheme
 
 private val TITLES = intListOf(R.string.tab_about, R.string.tab_licenses)
 

diff --git a/...org/schabi/newpipe/compose/theme/Color.kt → ...java/org/schabi/newpipe/ui/theme/Color.kt b/...org/schabi/newpipe/compose/theme/Color.kt → ...java/org/schabi/newpipe/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

diff --git a/...chabi/newpipe/compose/theme/SizeTokens.kt → ...org/schabi/newpipe/ui/theme/SizeTokens.kt b/...chabi/newpipe/compose/theme/SizeTokens.kt → ...org/schabi/newpipe/ui/theme/SizeTokens.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.ui.unit.dp
 

diff --git a/...org/schabi/newpipe/compose/theme/Theme.kt → ...java/org/schabi/newpipe/ui/theme/Theme.kt b/...org/schabi/newpipe/compose/theme/Theme.kt → ...java/org/schabi/newpipe/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme