diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 66a49b8f..f116c9f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:supportsRtl="true" android:theme="@style/Theme.MaterialComponents"> diff --git a/app/src/main/java/dev/msfjarvis/lobsters/di/ApiModule.kt b/app/src/main/java/dev/msfjarvis/lobsters/injection/ApiModule.kt similarity index 91% rename from app/src/main/java/dev/msfjarvis/lobsters/di/ApiModule.kt rename to app/src/main/java/dev/msfjarvis/lobsters/injection/ApiModule.kt index f7f970f4..6f26ebff 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/di/ApiModule.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/injection/ApiModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.di +package dev.msfjarvis.lobsters.injection import dagger.Module import dagger.Provides diff --git a/app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt b/app/src/main/java/dev/msfjarvis/lobsters/injection/PersistenceModule.kt similarity index 93% rename from app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt rename to app/src/main/java/dev/msfjarvis/lobsters/injection/PersistenceModule.kt index d75303de..622ebdff 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/di/PersistenceModule.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/injection/PersistenceModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.di +package dev.msfjarvis.lobsters.injection import android.content.Context import androidx.room.Room diff --git a/app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt b/app/src/main/java/dev/msfjarvis/lobsters/injection/UrlLauncherModule.kt similarity index 72% rename from app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt rename to app/src/main/java/dev/msfjarvis/lobsters/injection/UrlLauncherModule.kt index 135a2091..49f28c6d 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/di/UrlLauncherModule.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/injection/UrlLauncherModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.di +package dev.msfjarvis.lobsters.injection import android.content.Context import dagger.Module @@ -6,8 +6,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent import dagger.hilt.android.qualifiers.ActivityContext -import dev.msfjarvis.lobsters.urllauncher.UrlLauncher -import dev.msfjarvis.lobsters.urllauncher.UrlLauncherImpl +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncher +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherImpl @InstallIn(ActivityComponent::class) @Module diff --git a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt similarity index 87% rename from app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt index a2dee873..99c4371c 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters +package dev.msfjarvis.lobsters.ui.main import android.os.Bundle import androidx.appcompat.app.AppCompatActivity @@ -21,14 +21,14 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.navigate import androidx.navigation.compose.rememberNavController import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.lobsters.compose.utils.IconResource -import dev.msfjarvis.lobsters.data.LobstersViewModel -import dev.msfjarvis.lobsters.ui.Destination -import dev.msfjarvis.lobsters.ui.HottestPosts -import dev.msfjarvis.lobsters.ui.LobstersTheme -import dev.msfjarvis.lobsters.ui.SavedPosts -import dev.msfjarvis.lobsters.urllauncher.UrlLauncher -import dev.msfjarvis.lobsters.urllauncher.UrlLauncherAmbient +import dev.msfjarvis.lobsters.util.IconResource +import dev.msfjarvis.lobsters.ui.viewmodel.LobstersViewModel +import dev.msfjarvis.lobsters.ui.navigation.Destination +import dev.msfjarvis.lobsters.ui.posts.HottestPosts +import dev.msfjarvis.lobsters.ui.theme.LobstersTheme +import dev.msfjarvis.lobsters.ui.posts.SavedPosts +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncher +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/navigation/Destination.kt similarity index 91% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/navigation/Destination.kt index 6f55ef51..71c39009 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/navigation/Destination.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.navigation import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/EmptyList.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt similarity index 88% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/EmptyList.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt index 1c0bd1ae..a88d86af 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/EmptyList.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/EmptyList.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.posts import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Arrangement @@ -11,7 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import dev.msfjarvis.lobsters.R -import dev.msfjarvis.lobsters.compose.utils.IconResource +import dev.msfjarvis.lobsters.util.IconResource +import dev.msfjarvis.lobsters.ui.theme.savedTitleColor @Composable fun EmptyList(saved: Boolean) { diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt similarity index 91% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt index e5e4fc27..6b040842 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.posts import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumnForIndexed @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import dev.msfjarvis.lobsters.model.LobstersPost -import dev.msfjarvis.lobsters.urllauncher.UrlLauncherAmbient +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient @Composable fun HottestPosts( diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt similarity index 94% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 7d831829..ec994581 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.posts import androidx.compose.foundation.Text import androidx.compose.foundation.background @@ -23,9 +23,12 @@ import androidx.compose.ui.unit.dp import androidx.ui.tooling.preview.Preview import coil.transform.CircleCropTransformation import dev.chrisbanes.accompanist.coil.CoilImage -import dev.msfjarvis.lobsters.di.ApiModule +import dev.msfjarvis.lobsters.injection.ApiModule import dev.msfjarvis.lobsters.model.LobstersPost import dev.msfjarvis.lobsters.model.Submitter +import dev.msfjarvis.lobsters.ui.theme.LobstersTheme +import dev.msfjarvis.lobsters.ui.theme.savedTitleColor +import dev.msfjarvis.lobsters.ui.theme.titleColor @Composable fun LazyItemScope.LobstersItem( diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt similarity index 90% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt index cceef9d8..4765aed5 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.posts import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumnFor @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import dev.msfjarvis.lobsters.model.LobstersPost -import dev.msfjarvis.lobsters.urllauncher.UrlLauncherAmbient +import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient @Composable fun SavedPosts( diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/Theme.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt similarity index 94% rename from app/src/main/java/dev/msfjarvis/lobsters/ui/Theme.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt index a2b3da07..1bc934d9 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/Theme.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.ui +package dev.msfjarvis.lobsters.ui.theme import androidx.compose.material.MaterialTheme import androidx.compose.material.darkColors diff --git a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncher.kt similarity index 55% rename from app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncher.kt index 474f0d08..f4ec0bc8 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncher.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncher.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.urllauncher +package dev.msfjarvis.lobsters.ui.urllauncher fun interface UrlLauncher { fun launch(url: String) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherAmbient.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherAmbient.kt similarity index 73% rename from app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherAmbient.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherAmbient.kt index e17df796..d545961c 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherAmbient.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherAmbient.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.urllauncher +package dev.msfjarvis.lobsters.ui.urllauncher import androidx.compose.runtime.ambientOf diff --git a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherImpl.kt similarity index 91% rename from app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherImpl.kt index abaffcb6..9eb167aa 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/urllauncher/UrlLauncherImpl.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.urllauncher +package dev.msfjarvis.lobsters.ui.urllauncher import android.content.Context import android.net.Uri diff --git a/app/src/main/java/dev/msfjarvis/lobsters/data/LobstersViewModel.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt similarity index 98% rename from app/src/main/java/dev/msfjarvis/lobsters/data/LobstersViewModel.kt rename to app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt index a01781f3..cb29bd7b 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/data/LobstersViewModel.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.data +package dev.msfjarvis.lobsters.ui.viewmodel import androidx.hilt.lifecycle.ViewModelInject import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt b/app/src/main/java/dev/msfjarvis/lobsters/util/DeferredIcon.kt similarity index 96% rename from app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt rename to app/src/main/java/dev/msfjarvis/lobsters/util/DeferredIcon.kt index b7d35f13..cc252906 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/util/DeferredIcon.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.msfjarvis.lobsters.compose.utils +package dev.msfjarvis.lobsters.util import androidx.annotation.DrawableRes import androidx.compose.foundation.AmbientContentColor