From 929816c342b9fb7c430d29d2b9cfd011450a5064 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 28 Jan 2021 13:26:56 +0530 Subject: [PATCH 1/5] Revert "gradle: disable problematic flag" Fixed in AGP 7.0.0-alpha05 This reverts commit 6b85bc51dec6dec4dd1bd775ad5ded900dadcf2b. --- gradle.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e61ed60a..6ee6230d 100644 --- a/gradle.properties +++ b/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 From 07930d416d490307777a1e2f69ef35e08c16dacd Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 28 Jan 2021 13:38:30 +0530 Subject: [PATCH 2/5] build(app): remove kotlinCompilerVersion It is deprecated now 'ComposeOptions.kotlinCompilerVersion is deprecated. Compose now uses the kotlin compiler defined in your buildscript.' Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0642b225..28137a78 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,7 +21,6 @@ android { buildFeatures.compose = true composeOptions { - kotlinCompilerVersion = "1.4.21" kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION } } From 5ab5d1ece71f35939100c660b6ff3ea56b61cb1f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 28 Jan 2021 13:41:49 +0530 Subject: [PATCH 3/5] LobstersItem: fix submitter name alignment with avatar Signed-off-by: Harsh Shandilya --- .../java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 5ae278ad..3a6eb81c 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -110,9 +110,10 @@ fun LobstersItem( Text( text = "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) }, ) From a7bd050013e54d131c8d1d32fec40b13d8c84304 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 28 Jan 2021 13:42:54 +0530 Subject: [PATCH 4/5] LobstersItem: use existing BASE_URL field Signed-off-by: Harsh Shandilya --- .../main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 3a6eb81c..9f639779 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -22,6 +22,7 @@ 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 +95,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()) From 33b238c64625f7e83db058cb0dd62e369db48167 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 28 Jan 2021 13:45:13 +0530 Subject: [PATCH 5/5] LobstersItem: extract hard-coded submitter text Signed-off-by: Harsh Shandilya --- .../main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt | 3 ++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 9f639779..99a2d665 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -16,6 +16,7 @@ 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 @@ -109,7 +110,7 @@ fun LobstersItem( }, ) Text( - text = "submitted by ${post.submitterUser.username}", + text = stringResource(id = R.string.submitted_by, post.submitterUser.username), modifier = Modifier .padding(4.dp) .constrainAs(submitter) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 47196da5..1d52480b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,4 +4,5 @@ You don\'t have any saved posts Hottest Saved + submitted by %1$s