Update about dialog

billthefarmer · Jan 7, 2019 · acd5b04 · acd5b04
1 parent ff4f92c
commit acd5b04
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ android {
 
     lintOptions {
         disable 'IconDensities', 'ClickableViewAccessibility',
-            'CustomViewStyleable', 'ExpiringTargetSdkVersion'
+            'CustomViewStyleable', 'ExpiredTargetSdkVersion'
         // abortOnError false
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/billthefarmer/tuner/AboutPreference.java b/src/main/java/org/billthefarmer/tuner/AboutPreference.java
@@ -25,6 +25,7 @@
 
 import android.content.Context;
 import android.preference.DialogPreference;
+import android.text.SpannableStringBuilder;
 import android.text.method.LinkMovementMethod;
 import android.util.AttributeSet;
 import android.view.View;
@@ -52,9 +53,13 @@ protected void onBindDialogView(View view)
         // Set version in text view
         if (version != null)
         {
-            String v = (String) version.getText();
-            String s = String.format(v, BuildConfig.VERSION_NAME);
-            version.setText(s);
+            SpannableStringBuilder builder =
+                new SpannableStringBuilder(version.getText());
+            int st = builder.toString().indexOf("%s");
+            int en = builder.length();
+            builder.replace(st, en, BuildConfig.VERSION_NAME);
+            version.setText(builder);
+            version.setMovementMethod(LinkMovementMethod.getInstance());
         }
 
         // Get built text view

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
@@ -119,6 +119,6 @@
   <string name="pref_dark_summ">Usa el tema oscuro</string>
 
   <string name="pref_about">Sobre</string>
-  <string name="pref_about_summ">Versión de Tuner %s</string>
+  <string name="pref_about_summ">Versión de <a href="https://github.com/billthefarmer/tuner/releases/latest">Tuner %s</a></string>
 
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
@@ -110,6 +110,6 @@
   <string name="pref_dark_summ">Utiliser le thème foncé</string>
 
   <string name="pref_about">À propos</string>
-  <string name="pref_about_summ">Tuner version %s</string>
+  <string name="pref_about_summ">Tuner <a href="https://github.com/billthefarmer/tuner/releases/latest">version %s</a></string>
 
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
@@ -120,6 +120,6 @@
   <string name="pref_dark_summ">Használjon sötét témát</string>
 
   <string name="pref_about">Információk</string>
-  <string name="pref_about_summ">Tuner változat %s</string>
+  <string name="pref_about_summ">Tuner <a href="https://github.com/billthefarmer/tuner/releases/latest">változat %s</a></string>
 
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
@@ -119,6 +119,6 @@
   <string name="pref_dark_summ">暗いテーマを使う</string>
 
   <string name="pref_about">アプリについて</string>
-  <string name="pref_about_summ">Tuner version %s</string>
+  <string name="pref_about_summ">Tuner <a href="https://github.com/billthefarmer/tuner/releases/latest">version %s</a></string>
 
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
@@ -119,6 +119,6 @@
   <string name="pref_dark_summ">Use o tema escuro</string>
 
   <string name="pref_about">Sobre</string>
-  <string name="pref_about_summ">Tuner versão %s</string>
+  <string name="pref_about_summ">Tuner <a href="https://github.com/billthefarmer/tuner/releases/latest">versão %s</a></string>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -129,6 +129,6 @@
   <string name="pref_dark_summ">Use dark theme</string>
 
   <string name="pref_about">About</string>
-  <string name="pref_about_summ">Tuner version %s</string>
+  <string name="pref_about_summ">Tuner <a href="https://github.com/billthefarmer/tuner/releases/latest">version %s</a></string>
 
 </resources>