From 03e2d9d124b7ec1555580b78fc298dca465335a3 Mon Sep 17 00:00:00 2001 From: iliyangermanov Date: Sun, 27 Aug 2023 02:37:16 +0300 Subject: [PATCH] GitHub backups + Material3 migration (#2507) [fix R8] - GitHub backups MVP - Note: Auto-backups are NOT implemented, yet! - Migrate Material2 components to Material3. (verify that the UI still works and looks okay) --- app/proguard-rules.pro | 2 ++ .../java/com/ivy/wallet/backup/github/ui/GitHubBackupScreen.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7e2d6590c0..2f22e8a5de 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -6,6 +6,8 @@ -dontwarn org.bouncycastle.jsse.** -dontwarn org.conscrypt.** -dontwarn org.openjsse.** +-dontwarn com.google.errorprone.** +-dontwarn org.slf4j.impl.** # Json serialization (GSON fixes) -keepattributes Signature diff --git a/app/src/main/java/com/ivy/wallet/backup/github/ui/GitHubBackupScreen.kt b/app/src/main/java/com/ivy/wallet/backup/github/ui/GitHubBackupScreen.kt index 412c4bc205..a23e688af9 100644 --- a/app/src/main/java/com/ivy/wallet/backup/github/ui/GitHubBackupScreen.kt +++ b/app/src/main/java/com/ivy/wallet/backup/github/ui/GitHubBackupScreen.kt @@ -93,6 +93,7 @@ private fun Content( verticalAlignment = Alignment.CenterVertically, ) { OutlinedTextField( + modifier = Modifier.weight(1f), value = repoUrl, onValueChange = { repoUrl = it }, label = { Text("GitHub repo url") }, @@ -107,6 +108,7 @@ private fun Content( verticalAlignment = Alignment.CenterVertically, ) { OutlinedTextField( + modifier = Modifier.weight(1f), value = accessToken, onValueChange = { accessToken = it }, label = { Text("GitHub PAT") }