Fix FAB button position and Repo popup, update translation and gradle

DerTyp7214 · Dec 15, 2021 · 97e44f8 · 97e44f8
1 parent c4798b7
commit 97e44f8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -70,7 +70,7 @@ dependencies {
     implementation("dev.chrisbanes.insetter:insetter:0.6.1")
     implementation("androidx.core:core-ktx:1.7.0")
     //noinspection DifferentStdlibGradleVersion
-    implementation(kotlin("stdlib-jdk7", kotlinVersion))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10")
     implementation("androidx.appcompat:appcompat:1.3.1")
     implementation("com.google.android.material:material:1.6.0-alpha01")
     implementation("androidx.constraintlayout:constraintlayout:2.1.2")
@@ -95,5 +95,5 @@ dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
     debugImplementation("androidx.compose.ui:ui-tooling:1.1.0-beta04")
-    implementation(kotlin("reflect", kotlinVersion))
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/String.kt
@@ -10,20 +10,23 @@ import de.dertyp7214.rboardthememanager.data.RboardRepo
 import de.dertyp7214.rboardthememanager.data.RboardRepoMeta
 import de.dertyp7214.rboardthememanager.utils.MagiskUtils
 import org.xml.sax.InputSource
+import java.io.IOException
 import java.io.StringReader
 import java.net.URL
 import java.util.*
 import javax.xml.parsers.DocumentBuilderFactory
 
 typealias RepoUrl = String
 
-fun RepoUrl.parseRepo(): RboardRepo {
+fun RepoUrl.parseRepo(): RboardRepo? {
     val url = removePrefix("true:").removePrefix("false:")
     val meta = try {
         Gson().fromJson(
             URL(url.replace("list.json", "meta.json")).readText(),
             RboardRepoMeta::class.java
         )
+    } catch (e: IOException) {
+        return null
     } catch (e: Exception) {
         null
     }

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt
@@ -45,7 +45,7 @@ class Repos(
             doAsync({
                 it.toList().map { url -> url.parseRepo() }
             }, { data ->
-                repositories.addAll(data)
+                repositories.addAll(data.filterNotNull())
                 onRequestReload()
             })
         }

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
@@ -48,6 +48,12 @@ class PreferencesActivity : AppCompatActivity() {
 
         preferences.handleFab(binding.floatingActionButton)
 
+            binding.floatingActionButton.applyInsetter {
+                type( navigationBars = true) {
+                    margin()
+                }
+            }
+
         setSupportActionBar(preferencesToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         title = preferences.title

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -214,4 +214,6 @@
     <string name="deep_link">Прямая ссылка</string>
     <string name="download">Загрузить</string>
     <string name="include_theme_names">Включить названия тем</string>
+    <string name="update_available">Доступно обновление (%s)</string>
+    <string name="help">Помощь</string>
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Dec 07 07:49:33 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.4-20211214052202+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.4-20211214231059+0000-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME