فهرست منبع

chore: gradle upgrade and plural on slots that are left

beautusg 7 سال پیش
والد
کامیت
eee6a10a0d

BIN
app/release/app.aab


+ 2 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomiseAppsFragment.kt

@@ -51,7 +51,8 @@ class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
                         customise_apps_fragment_add.visibility = View.GONE
                     }
                 }
-                customise_apps_fragment_counter.text = getString(R.string.customise_apps_fragment_counter, (7 - apps.size))
+                val count = 7 - apps.size
+                customise_apps_fragment_counter.text = resources.getQuantityString(R.plurals.slots_plurals, count, count)
             } ?: adapter.setItems(listOf())
         })
 

+ 8 - 0
app/src/main/res/values/strings.xml

@@ -17,6 +17,14 @@
         <item>12 Hour</item>
     </string-array>
 
+    <plurals name="slots_plurals">
+        <item quantity="zero">%d slots left</item>
+        <item quantity="one">%d slot left</item>
+        <item quantity="few">%d slots left</item>
+        <item quantity="two">%d slots left</item>
+        <item quantity="other">%d slots left</item>
+    </plurals>
+
     <string name="prefs_settings">settings</string>
     <string name="prefs_settings_key_theme">key_theme</string>
     <string name="prefs_settings_key_time_format">clock_type</string>

+ 1 - 1
build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Oct 13 17:11:51 SAST 2018
+#Thu Apr 18 16:23:43 CAT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip