Improved component organisation

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt

@@ -8,8 +8,8 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.viewmodel.compose.viewModel
-import org.schabi.newpipe.compose.comment.CommentSection
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.comment.CommentSection
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.KEY_SERVICE_ID
 import org.schabi.newpipe.util.KEY_URL
 import org.schabi.newpipe.viewmodels.CommentsViewModel

…va/org/schabi/newpipe/compose/Toolbar.kt …in/java/org/schabi/newpipe/ui/Toolbar.ktapp/src/main/java/org/schabi/newpipe/compose/Toolbar.kt renamed to app/src/main/java/org/schabi/newpipe/ui/Toolbar.kt app/src/main/java/org/schabi/newpipe/compose/Toolbar.kt renamed to app/src/main/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) {

…chabi/newpipe/compose/comment/Comment.kt …newpipe/ui/components/comment/Comment.ktapp/src/main/java/org/schabi/newpipe/compose/comment/Comment.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt app/src/main/java/org/schabi/newpipe/compose/comment/Comment.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.animation.animateContentSize
@@ -42,12 +42,12 @@ import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import coil.compose.AsyncImage
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.DescriptionText
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.Page
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
 import org.schabi.newpipe.paging.CommentsSource
+import org.schabi.newpipe.ui.components.common.DescriptionText
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.image.ImageStrategy

…/compose/comment/CommentRepliesHeader.kt …mponents/comment/CommentRepliesHeader.ktapp/src/main/java/org/schabi/newpipe/compose/comment/CommentRepliesHeader.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentRepliesHeader.kt app/src/main/java/org/schabi/newpipe/compose/comment/CommentRepliesHeader.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentRepliesHeader.kt

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
@@ -25,10 +25,10 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import coil.compose.AsyncImage
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.DescriptionText
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
+import org.schabi.newpipe.ui.components.common.DescriptionText
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.image.ImageStrategy

…ewpipe/compose/comment/CommentSection.kt …/ui/components/comment/CommentSection.ktapp/src/main/java/org/schabi/newpipe/compose/comment/CommentSection.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentSection.kt app/src/main/java/org/schabi/newpipe/compose/comment/CommentSection.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentSection.kt

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Column
@@ -31,11 +31,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import my.nanihadesuka.compose.LazyColumnScrollbar
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.LoadingIndicator
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
 import org.schabi.newpipe.paging.CommentsDisabledException
+import org.schabi.newpipe.ui.components.common.LoadingIndicator
+import org.schabi.newpipe.ui.theme.AppTheme
 
 @Composable
 fun CommentSection(

…ewpipe/compose/common/DescriptionText.kt …/ui/components/common/DescriptionText.ktapp/src/main/java/org/schabi/newpipe/compose/common/DescriptionText.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt app/src/main/java/org/schabi/newpipe/compose/common/DescriptionText.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.common
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text

…wpipe/compose/common/LoadingIndicator.kt …ui/components/common/LoadingIndicator.ktapp/src/main/java/org/schabi/newpipe/compose/common/LoadingIndicator.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt app/src/main/java/org/schabi/newpipe/compose/common/LoadingIndicator.kt renamed to app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.common
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize

…rg/schabi/newpipe/compose/theme/Color.kt …ava/org/schabi/newpipe/ui/theme/Color.ktapp/src/main/java/org/schabi/newpipe/compose/theme/Color.kt renamed to app/src/main/java/org/schabi/newpipe/ui/theme/Color.kt app/src/main/java/org/schabi/newpipe/compose/theme/Color.kt renamed to app/src/main/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
 

…habi/newpipe/compose/theme/SizeTokens.kt …rg/schabi/newpipe/ui/theme/SizeTokens.ktapp/src/main/java/org/schabi/newpipe/compose/theme/SizeTokens.kt renamed to app/src/main/java/org/schabi/newpipe/ui/theme/SizeTokens.kt app/src/main/java/org/schabi/newpipe/compose/theme/SizeTokens.kt renamed to app/src/main/java/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
 

…rg/schabi/newpipe/compose/theme/Theme.kt …ava/org/schabi/newpipe/ui/theme/Theme.ktapp/src/main/java/org/schabi/newpipe/compose/theme/Theme.kt renamed to app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt app/src/main/java/org/schabi/newpipe/compose/theme/Theme.kt renamed to app/src/main/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