From 082dc9cc8224cf94b3bef7ae30e6a6411b7167a7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 4 Nov 2023 20:52:37 +0530 Subject: [PATCH] refactor(android): `LobstersApp` -> `LobstersPostsScreen` --- .../main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt | 4 ++-- .../ui/{LobstersApp.kt => screens/LobstersPostsScreen.kt} | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename android/src/main/kotlin/dev/msfjarvis/claw/android/ui/{LobstersApp.kt => screens/LobstersPostsScreen.kt} (98%) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt index 2e1d1d34..3536964c 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.deliveryhero.whetstone.Whetstone import com.deliveryhero.whetstone.activity.ContributesActivityInjector -import dev.msfjarvis.claw.android.ui.LobstersApp +import dev.msfjarvis.claw.android.ui.screens.LobstersPostsScreen import dev.msfjarvis.claw.common.comments.HTMLConverter import dev.msfjarvis.claw.common.theme.LobstersTheme import dev.msfjarvis.claw.common.urllauncher.UrlLauncher @@ -56,7 +56,7 @@ class MainActivity : ComponentActivity() { dynamicColor = true, providedValues = arrayOf(LocalUriHandler provides urlLauncher), ) { - LobstersApp( + LobstersPostsScreen( urlLauncher = urlLauncher, htmlConverter = htmlConverter, windowSizeClass = windowSizeClass, diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt similarity index 98% rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt index 1b1a7613..16035152 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt @@ -4,7 +4,7 @@ * license that can be found in the LICENSE file or at * https://opensource.org/licenses/MIT. */ -package dev.msfjarvis.claw.android.ui +package dev.msfjarvis.claw.android.ui.screens import android.content.Intent import androidx.compose.animation.AnimatedVisibility @@ -66,10 +66,12 @@ import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail import dev.msfjarvis.claw.android.ui.decorations.NavigationItem +import dev.msfjarvis.claw.android.ui.getActivity import dev.msfjarvis.claw.android.ui.lists.DatabasePosts import dev.msfjarvis.claw.android.ui.lists.NetworkPosts import dev.msfjarvis.claw.android.ui.navigation.ClawNavigationType import dev.msfjarvis.claw.android.ui.navigation.Destinations +import dev.msfjarvis.claw.android.ui.rememberPostActions import dev.msfjarvis.claw.android.viewmodel.ClawViewModel import dev.msfjarvis.claw.api.LobstersApi import dev.msfjarvis.claw.common.comments.CommentsPage @@ -82,7 +84,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalComposeUiApi::class) @Composable -fun LobstersApp( +fun LobstersPostsScreen( urlLauncher: UrlLauncher, htmlConverter: HTMLConverter, windowSizeClass: WindowSizeClass,