Minor Fixes

AshuTyagi16 · Jan 17, 2024 · 1f6e72a · 1f6e72a
1 parent 2386b5f
commit 1f6e72a
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 41 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/IosApp/Ios.xcworkspace/xcuserdata/ashutyagi.xcuserdatad/UserInterfaceState.xcuserstate b/IosApp/Ios.xcworkspace/xcuserdata/ashutyagi.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -9,6 +9,15 @@ android {
  namespace = "com.spotify.app.kmp"
  compileSdk = libs.versions.compileSdkVersion.get().toInt()
 
+ signingConfigs {
+ register("release") {
+ storeFile = file("../cert")
+ storePassword = "SpotifyKMP"
+ keyAlias = "SpotifyKMP"
+ keyPassword = "SpotifyKMP"
+ }
+ }
+
  defaultConfig {
  applicationId = "com.spotify.app.kmp"
  minSdk = libs.versions.minSdkVersion.get().toInt()
@@ -24,11 +33,12 @@ android {
 
  buildTypes {
  release {
- isMinifyEnabled = false
+ isMinifyEnabled = libs.versions.isMinifyEnabled.get().toBooleanStrict()
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
  "proguard-rules.pro"
  )
+ signingConfig = signingConfigs.getByName("release")
  }
  }
  compileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/cert b/cert
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
@@ -17,7 +17,7 @@ android {
 
  buildTypes {
  release {
- isMinifyEnabled = false
+ isMinifyEnabled = libs.versions.isMinifyEnabled.get().toBooleanStrict()
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
  "proguard-rules.pro"

diff --git a/feature-album-detail/build.gradle.kts b/feature-album-detail/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 
  buildTypes {
  release {
- isMinifyEnabled = false
+ isMinifyEnabled = libs.versions.isMinifyEnabled.get().toBooleanStrict()
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
  "proguard-rules.pro"

diff --git a/...bum-detail/src/main/java/com/spotify/app/feature_album_detail/ui/AlbumDetailComposable.kt b/...bum-detail/src/main/java/com/spotify/app/feature_album_detail/ui/AlbumDetailComposable.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
@@ -36,6 +37,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -58,7 +60,6 @@ fun AlbumDetailComposable(
  viewModel: AlbumDetailViewModel,
  onBackPressed: () -> Unit
 ) {
- val scope = rememberCoroutineScope()
  val snackbarHostState = remember { SnackbarHostState() }
 
  LaunchedEffect(viewModel) {
@@ -184,18 +185,23 @@ fun AlbumDetailComposable(
 
  when (val state = data.loadState.refresh) {
  is LoadState.Error -> {
- scope.launch {
- snackbarHostState.showSnackbar(
- message = state.error.message.orEmpty()
- )
- }
  item {
- Box(
+ Column(
  modifier = Modifier
  .fillParentMaxWidth()
- .padding(top = 100.dp),
- contentAlignment = Alignment.Center
+ .wrapContentHeight(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
  ) {
+ Text(
+ text = state.error.message.orEmpty(),
+ fontSize = 12.sp,
+ textAlign = TextAlign.Center,
+ color = Color.White,
+ modifier = Modifier
+ .fillParentMaxWidth()
+ .padding(vertical = 12.dp)
+ )
  Button(
  modifier = Modifier,
  colors = ButtonDefaults.buttonColors(containerColor = Color.White),
@@ -230,18 +236,23 @@ fun AlbumDetailComposable(
 
  when (val state = data.loadState.append) {
  is LoadState.Error -> {
- scope.launch {
- snackbarHostState.showSnackbar(
- message = state.error.message.orEmpty()
- )
- }
  item {
- Box(
+ Column(
  modifier = Modifier
  .fillMaxWidth()
- .height(50.dp),
- contentAlignment = Alignment.Center
+ .wrapContentHeight(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
  ) {
+ Text(
+ text = state.error.message.orEmpty(),
+ fontSize = 12.sp,
+ textAlign = TextAlign.Center,
+ color = Color.White,
+ modifier = Modifier
+ .fillParentMaxWidth()
+ .padding(vertical = 12.dp)
+ )
  Button(
  modifier = Modifier,
  colors = ButtonDefaults.buttonColors(containerColor = Color.White),

diff --git a/feature-homepage/build.gradle.kts b/feature-homepage/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 
  buildTypes {
  release {
- isMinifyEnabled = false
+ isMinifyEnabled = libs.versions.isMinifyEnabled.get().toBooleanStrict()
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
  "proguard-rules.pro"

diff --git a/feature-playlist-detail/build.gradle.kts b/feature-playlist-detail/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 
  buildTypes {
  release {
- isMinifyEnabled = false
+ isMinifyEnabled = libs.versions.isMinifyEnabled.get().toBooleanStrict()
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
  "proguard-rules.pro"

diff --git a/...tail/src/main/java/com/spotify/app/feature_playlist_detail/ui/PlaylistDetailComposable.kt b/...tail/src/main/java/com/spotify/app/feature_playlist_detail/ui/PlaylistDetailComposable.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
@@ -36,6 +37,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -59,7 +61,6 @@ fun PlaylistDetailComposable(
  viewModel: PlaylistDetailViewModel,
  onBackPressed: () -> Unit
 ) {
- val scope = rememberCoroutineScope()
  val snackbarHostState = remember { SnackbarHostState() }
 
  LaunchedEffect(viewModel) {
@@ -187,18 +188,23 @@ fun PlaylistDetailComposable(
 
  when (val state = data.loadState.refresh) {
  is LoadState.Error -> {
- scope.launch {
- snackbarHostState.showSnackbar(
- message = state.error.message.orEmpty()
- )
- }
  item {
- Box(
+ Column(
  modifier = Modifier
  .fillParentMaxWidth()
- .padding(top = 100.dp),
- contentAlignment = Alignment.Center
+ .wrapContentHeight(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
  ) {
+ Text(
+ text = state.error.message.orEmpty(),
+ fontSize = 12.sp,
+ textAlign = TextAlign.Center,
+ color = Color.White,
+ modifier = Modifier
+ .fillParentMaxWidth()
+ .padding(vertical = 12.dp)
+ )
  Button(
  modifier = Modifier,
  colors = ButtonDefaults.buttonColors(containerColor = Color.White),
@@ -233,18 +239,23 @@ fun PlaylistDetailComposable(
 
  when (val state = data.loadState.append) {
  is LoadState.Error -> {
- scope.launch {
- snackbarHostState.showSnackbar(
- message = state.error.message.orEmpty()
- )
- }
  item {
- Box(
+ Column(
  modifier = Modifier
  .fillMaxWidth()
- .height(50.dp),
- contentAlignment = Alignment.Center
+ .wrapContentHeight(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
  ) {
+ Text(
+ text = state.error.message.orEmpty(),
+ fontSize = 12.sp,
+ textAlign = TextAlign.Center,
+ color = Color.White,
+ modifier = Modifier
+ .fillParentMaxWidth()
+ .padding(vertical = 12.dp)
+ )
  Button(
  modifier = Modifier,
  colors = ButtonDefaults.buttonColors(containerColor = Color.White),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-
+isMinifyEnabled = "true"
 appVersionCode = "1"
 appVersionName = "1.0"