Fix thumbnail links not working with deeplinks (LemmyNet#1023)

* Fix nav not working with deeplinks * Fix formatting --------- Co-authored-by: Kevin Phoenix <[email protected]>
MV-GH · Jul 12, 2023 · deffc88 · deffc88
1 parent 4d55ee0
commit deffc88
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 4 deletions.
diff --git a/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt b/app/src/main/java/com/jerboa/ui/components/community/CommunityActivity.kt
@@ -389,6 +389,7 @@ fun CommunityActivity(
                             usePrivateTabs = usePrivateTabs,
                             blurNSFW = blurNSFW,
                             openImageViewer = navController::toView,
+                            navController = navController,
                         )
                     }
                     else -> {}

diff --git a/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt b/app/src/main/java/com/jerboa/ui/components/home/HomeActivity.kt
@@ -346,6 +346,7 @@ fun MainPostListingsContent(
             useCustomTabs = useCustomTabs,
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
+            navController = navController,
             openImageViewer = navController::toView,
         )
     }

diff --git a/app/src/main/java/com/jerboa/ui/components/login/Login.kt b/app/src/main/java/com/jerboa/ui/components/login/Login.kt
@@ -256,7 +256,7 @@ fun LoginFormPreview() {
 
 @Composable
 fun LoginHeader(
-    navController: NavController = rememberNavController(),
+    navController: NavController,
     accounts: List<Account>? = null,
 ) {
     TopAppBar(
@@ -284,5 +284,5 @@ fun LoginHeader(
 @Preview
 @Composable
 fun LoginHeaderPreview() {
-    LoginHeader()
+    LoginHeader(navController = rememberNavController())
 }
diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt
@@ -561,6 +561,7 @@ fun UserTabs(
                                     useCustomTabs = useCustomTabs,
                                     usePrivateTabs = usePrivateTabs,
                                     blurNSFW = blurNSFW,
+                                    navController = navController,
                                     openImageViewer = openImageViewer,
                                 )
                             }

diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt b/app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt
@@ -439,6 +439,7 @@ fun PostActivity(
                                     usePrivateTabs = usePrivateTabs,
                                     blurNSFW = blurNSFW,
                                     openImageViewer = openImageViewer,
+                                    navController = navController,
                                 )
                             }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListing.kt
@@ -63,6 +63,7 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import com.jerboa.InstantScores
 import com.jerboa.PostViewMode
@@ -272,6 +273,7 @@ fun PostTitleBlock(
     useCustomTabs: Boolean,
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     val imagePost = postView.post.url?.let { isImage(it) } ?: run { false }
@@ -289,6 +291,7 @@ fun PostTitleBlock(
             useCustomTabs = useCustomTabs,
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
+            navController = navController,
             openImageViewer = openImageViewer,
         )
     }
@@ -356,6 +359,7 @@ fun PostTitleAndThumbnail(
     useCustomTabs: Boolean,
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     Column(
@@ -388,6 +392,7 @@ fun PostTitleAndThumbnail(
                 useCustomTabs = useCustomTabs,
                 usePrivateTabs = usePrivateTabs,
                 blurNSFW = blurNSFW,
+                navController = navController,
                 openImageViewer = openImageViewer,
             )
         }
@@ -405,6 +410,7 @@ fun PostBody(
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
     openImageViewer: (url: String) -> Unit,
+    navController: NavController,
     clickBody: () -> Unit = {},
 ) {
     val post = postView.post
@@ -419,6 +425,7 @@ fun PostBody(
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
             openImageViewer = openImageViewer,
+            navController = navController,
         )
 
         // The metadata card
@@ -486,6 +493,7 @@ fun PreviewStoryTitleAndMetadata() {
         usePrivateTabs = false,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -502,6 +510,7 @@ fun PreviewSourcePost() {
         usePrivateTabs = false,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -763,6 +772,7 @@ fun PreviewPostListingCard() {
         showAvatar = true,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -795,6 +805,7 @@ fun PreviewLinkPostListing() {
         showAvatar = true,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -827,6 +838,7 @@ fun PreviewImagePostListingCard() {
         showAvatar = true,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -859,6 +871,7 @@ fun PreviewImagePostListingSmallCard() {
         showAvatar = true,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -891,6 +904,7 @@ fun PreviewLinkNoThumbnailPostListing() {
         showAvatar = true,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -922,6 +936,7 @@ fun PostListing(
     enableDownVotes: Boolean,
     showAvatar: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     // This stores vote data
@@ -982,6 +997,7 @@ fun PostListing(
             useCustomTabs = useCustomTabs,
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
+            navController = navController,
             openImageViewer = openImageViewer,
         )
 
@@ -1028,6 +1044,7 @@ fun PostListing(
             useCustomTabs = useCustomTabs,
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
+            navController = navController,
             openImageViewer = openImageViewer,
         )
 
@@ -1058,6 +1075,7 @@ fun PostListing(
             usePrivateTabs = usePrivateTabs,
             blurNSFW = blurNSFW,
             openImageViewer = openImageViewer,
+            navController = navController,
         )
     }
 }
@@ -1124,6 +1142,7 @@ fun PostListingList(
     useCustomTabs: Boolean,
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     Column(
@@ -1229,6 +1248,7 @@ fun PostListingList(
                 useCustomTabs = useCustomTabs,
                 usePrivateTabs = usePrivateTabs,
                 blurNSFW = blurNSFW,
+                navController = navController,
                 openImageViewer = openImageViewer,
             )
         }
@@ -1241,11 +1261,10 @@ private fun ThumbnailTile(
     useCustomTabs: Boolean,
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     postView.post.url?.also { url ->
-        // TODO weird performance issues with using a previously rendered navcontroller
-        val navController = rememberNavController()
 
         val postLinkPicMod = Modifier
             .size(POST_LINK_PIC_SIZE)
@@ -1314,6 +1333,7 @@ fun PostListingListPreview() {
         usePrivateTabs = false,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -1342,6 +1362,7 @@ fun PostListingListWithThumbPreview() {
         usePrivateTabs = false,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }
 
@@ -1375,6 +1396,7 @@ fun PostListingCard(
     useCustomTabs: Boolean,
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
+    navController: NavController,
     openImageViewer: (url: String) -> Unit,
 ) {
     Column(
@@ -1410,6 +1432,7 @@ fun PostListingCard(
             blurNSFW = blurNSFW,
             openImageViewer = openImageViewer,
             clickBody = { onPostClick(postView) },
+            navController = navController,
         )
 
         // Footer bar

diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListings.kt
@@ -17,6 +17,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
 import com.jerboa.PostViewMode
 import com.jerboa.datatypes.sampleLinkPostView
 import com.jerboa.datatypes.samplePostView
@@ -59,6 +61,7 @@ fun PostListings(
     usePrivateTabs: Boolean,
     blurNSFW: Boolean,
     openImageViewer: (url: String) -> Unit,
+    navController: NavController,
 ) {
     LazyColumn(
         state = listState,
@@ -105,6 +108,7 @@ fun PostListings(
                 usePrivateTabs = usePrivateTabs,
                 blurNSFW = blurNSFW,
                 openImageViewer = openImageViewer,
+                navController = navController,
             )
             Divider(modifier = Modifier.padding(bottom = SMALL_PADDING))
         }
@@ -153,5 +157,6 @@ fun PreviewPostListings() {
         usePrivateTabs = false,
         blurNSFW = true,
         openImageViewer = {},
+        navController = rememberNavController(),
     )
 }