2.0 for Android.

rocketshipapps · May 9, 2017 · 6502fd6 · 6502fd6
1 parent a706a26
commit 6502fd6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -18,14 +18,14 @@ android.buildTypes.each { type ->
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId "com.rocketshipapps.adblockfast"
         minSdkVersion 21
-        targetSdkVersion 23
-        versionCode 6
-        versionName "1.4.0"
+        targetSdkVersion 25
+        versionCode 7
+        versionName "2.0.0"
     }
     buildTypes {
         release {
@@ -40,10 +40,10 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.dtx12:actions:0.1.4'
-    compile 'uk.co.chrisjenx:calligraphy:2.1.0'
-    compile 'com.google.android.gms:play-services-analytics:8.4.0'
-    compile 'com.google.android.gms:play-services-gcm:8.4.0'
-    compile 'com.github.kittinunf.fuel:fuel-android:0.7'
+    compile 'uk.co.chrisjenx:calligraphy:2.2.0'
+    compile 'com.google.android.gms:play-services-analytics:10.2.4'
+    compile 'com.google.android.gms:play-services-gcm:10.2.4'
+    compile 'com.github.kittinunf.fuel:fuel-android:1.6.0'
 }
diff --git a/android/app/src/main/java/com/rocketshipapps/adblockfast/MainActivity.java b/android/app/src/main/java/com/rocketshipapps/adblockfast/MainActivity.java
@@ -156,10 +156,13 @@ public void onAboutPressed(View v) {
         dialog.setContentView(R.layout.alert_dialog_about);
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
+        ((TextView)dialog.findViewById(R.id.tagline)).setText(Html.fromHtml(getString(R.string.tagline)));
+
         TextView copyright = (TextView) dialog.findViewById(R.id.copyright);
         copyright.setText(Html.fromHtml(getString(R.string.copyright)));
         copyright.setMovementMethod(LinkMovementMethod.getInstance());
 
+        dialog.setCancelable(false);
         dialog.show();
 
         ((TextView) dialog.findViewById(R.id.txt_version)).setText(version);
@@ -184,7 +187,7 @@ void showHelpDialog(boolean cancelable) {
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(R.layout.alert_dialog_help);
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        dialog.setCancelable(cancelable);
+        dialog.setCancelable(false);
         dialog.show();
 
         TextView summary = (TextView) dialog.findViewById(R.id.summary);

diff --git a/android/app/src/main/res/layout/alert_dialog_about.xml b/android/app/src/main/res/layout/alert_dialog_about.xml
@@ -48,6 +48,7 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/tagline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/tagline"
@@ -75,6 +76,7 @@
                 android:background="@drawable/background_button"
                 android:text="@string/dismiss"
                 android:layout_centerInParent="true"
+                android:textAllCaps="false"
                 android:textColor="@android:color/white" />
         </RelativeLayout>
     </LinearLayout>

diff --git a/android/app/src/main/res/layout/alert_dialog_help.xml b/android/app/src/main/res/layout/alert_dialog_help.xml
@@ -53,6 +53,7 @@
                 android:background="@drawable/background_button"
                 android:text="@string/dismiss"
                 android:layout_centerInParent="true"
+                android:textAllCaps="false"
                 android:textColor="@android:color/white" />
         </RelativeLayout>
     </LinearLayout>

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -10,10 +10,10 @@
     <string name="about">About</string>
     <string name="settings_summary">To block ads in Samsung Internet:</string>
     <string name="install_summary">Adblock Fast requires Samsung Internet 4.0+.</string>
-    <string name="settings_details"><![CDATA[Go to <font color="#de0421"><u>your Home screen > Internet > <small>MORE</small> > Settings > Advanced > Block content</u></font> then toggle the switch on and make sure <b>Adblock Fast</b> is selected.<br><br>To unblock ads, come back to this app then press the Adblock Fast button.]]></string>
+    <string name="settings_details"><![CDATA[Go to <font color="#de0421"><u>your home screen > Internet > <small>MORE</small> > Extensions > Block content</u></font> then turn the switch on and make sure <b>Adblock Fast</b> is selected.<br><br>To unblock ads, come back to this app then tap the Adblock Fast button.]]></string>
     <string name="install_details"><![CDATA[Install or update to the latest version of the <a href="https://play.google.com/store/apps/details?id=com.sec.android.app.sbrowser">Samsung Internet browser from Google Play</a> then come back to this app for instructions on how to block ads.]]></string>
     <string name="contact"><![CDATA[If you have any questions or comments, follow and message <a href="https://www.facebook.com/adblockfast">us on Facebook</a> or <a href="https://twitter.com/adblockfast">on Twitter</a>.]]></string>
-    <string name="tagline">The World’s Fastest Ad Blocker</string>
-    <string name="copyright"><![CDATA[© <a href="http://rocketshipapps.com/">Rocketship</a>.]]></string>
-    <string name="dismiss">Okay</string>
+    <string name="tagline"><![CDATA[The world’s fastest ad blocker<i>!</i>]]></string>
+    <string name="copyright"><![CDATA[© <a href="https://rocketshipapps.com/">Rocketship</a>.]]></string>
+    <string name="dismiss">Close</string>
 </resources>
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Sat May 06 11:52:44 MDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip