Changed Webviews to Custom Tabs in Nearby Places Dialog, AboutUsActivity (#1185)

* Changed Webviews to Custom Tabs in Nearby Places Dialog, AboutUsActivity

* Created method handleWebUrl in Utils.java

app/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
 
     implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
 

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

@@ -3,6 +3,8 @@ package fr.free.nrw.commons;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.customtabs.CustomTabsIntent;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.TextView;
 
@@ -47,22 +49,29 @@ public class AboutActivity extends NavigationBaseActivity {
             intent.setPackage("com.facebook.katana");
             startActivity(intent);
         } catch (Exception e) {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.facebook.com/" + "1921335171459985")));
+            Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985"));
         }
-
     }
 
     @OnClick(R.id.github_launch_icon)
     public void launchGithub(View view) {
-
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
-        startActivity(browserIntent);
+        Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
     }
 
     @OnClick(R.id.website_launch_icon)
     public void launchWebsite(View view) {
-
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\"));
-        startActivity(browserIntent);
+        Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
     }
+
+    @OnClick(R.id.about_credits)
+    public void launchCredits(View view) {
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
+    }
+
+    @OnClick(R.id.about_privacy_policy)
+    public void launchPrivacyPolicy(View view) {
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
+    }
+
+
 }

app/src/main/java/fr/free/nrw/commons/Utils.java

@@ -1,8 +1,12 @@
 package fr.free.nrw.commons;
 
 import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.customtabs.CustomTabsIntent;
+import android.support.v4.content.ContextCompat;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -11,6 +15,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -159,4 +164,15 @@ public class Utils {
 
         return stringBuilder.toString();
     }
+
+    public static void handleWebUrl(Context context,Uri url){
+        CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
+        builder.setToolbarColor(ContextCompat.getColor(context, R.color.primaryColor));
+        builder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.primaryDarkColor));
+        builder.setExitAnimations(context, android.R.anim.slide_in_left, android.R.anim.slide_out_right);
+        CustomTabsIntent customTabsIntent = builder.build();
+        customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        customTabsIntent.launchUrl(context, url);
+    }
+
 }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java

@@ -3,7 +3,9 @@ package fr.free.nrw.commons.nearby;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -17,6 +19,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.ui.widget.OverlayDialog;
 import fr.free.nrw.commons.utils.DialogUtil;
@@ -141,8 +144,7 @@ public class NearbyInfoDialog extends OverlayDialog {
     }
 
     private void openWebView(Uri link) {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, link);
-        startActivity(browserIntent);
+        Utils.handleWebUrl(getContext(),link);
     }
 
     @OnClick(R.id.emptyLayout)

app/src/main/res/layout/activity_about.xml

@@ -104,23 +104,26 @@
 
             </LinearLayout>
 
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
+            <TextView
                 android:id="@+id/about_privacy_policy"
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
+                android:textColor="@color/primaryColor"
                 android:text="@string/about_privacy_policy" />
 
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
+            <TextView
                 android:id="@+id/about_credits"
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
-                android:text="@string/about_credits" />
+                android:textColor="@color/primaryColor"
+                android:text="@string/about_credits"
+                />
 
             <TextView
                 android:id="@+id/about_uploads_to"

app/src/main/res/values/strings.xml

@@ -78,8 +78,8 @@
   <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
   <string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privacy policy&lt;/a&gt;</string>
-  <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Credits&lt;/a&gt;</string>
+  <string name="about_privacy_policy"><u>Privacy policy</u></string>
+  <string name="about_credits"><u>Credits</u></string>
   <string name="title_activity_about">About</string>
   <string name="menu_feedback">Send Feedback (via Email)</string>
   <string name="no_email_client">No email client installed</string>