Merge #99

99: Tweak alignment and fixup build nits r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

app/build.gradle.kts

@@ -21,7 +21,6 @@ android {
   buildFeatures.compose = true
 
   composeOptions {
-    kotlinCompilerVersion = "1.4.21"
     kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION
   }
 }

app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt

@@ -16,12 +16,14 @@ import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.transform.CircleCropTransformation
 import dev.chrisbanes.accompanist.coil.CoilImage
 import dev.msfjarvis.lobsters.R
+import dev.msfjarvis.lobsters.data.api.LobstersApi
 import dev.msfjarvis.lobsters.model.LobstersPost
 import dev.msfjarvis.lobsters.model.Submitter
 import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
@@ -94,7 +96,7 @@ fun LobstersItem(
           .padding(vertical = 8.dp),
       )
       CoilImage(
-        data = "https://lobste.rs/${post.submitterUser.avatarUrl}",
+        data = "${LobstersApi.BASE_URL}/${post.submitterUser.avatarUrl}",
         fadeIn = true,
         requestBuilder = {
           transformations(CircleCropTransformation())
@@ -108,11 +110,12 @@ fun LobstersItem(
           },
       )
       Text(
-        text = "submitted by ${post.submitterUser.username}",
+        text = stringResource(id = R.string.submitted_by, post.submitterUser.username),
         modifier = Modifier
-          .padding(bottom = 4.dp)
+          .padding(4.dp)
           .constrainAs(submitter) {
-            top.linkTo(tags.bottom)
+            top.linkTo(avatar.top)
+            bottom.linkTo(avatar.bottom)
             start.linkTo(avatar.end)
           },
       )

app/src/main/res/values/strings.xml

@@ -4,4 +4,5 @@
   <string name="no_saved_posts">You don\'t have any saved posts</string>
   <string name="hottest_posts">Hottest</string>
   <string name="saved_posts">Saved</string>
+  <string name="submitted_by">submitted by %1$s</string>
 </resources>

gradle.properties

@@ -38,8 +38,7 @@ android.enableRTxtResourceShrinking=true
 android.enablePartialRIncrementalBuilds=true
 android.experimental.enableNewResourceShrinker=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
-# Breaks build with AGP 7.0.0-alpha04
-# android.generateManifestClass=true
+android.generateManifestClass=true
 
 # Default Android build features
 android.defaults.buildfeatures.buildconfig=false