Rate Us method added to Utils.java and called on AboutActivity.java

Author: ujjwalagrawal17

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

@@ -65,4 +65,10 @@ public void launchWebsite(View view) {
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://commons-app.github.io/\\"));
         startActivity(browserIntent);
     }
+
+    @OnClick(R.id.about_rate_us)
+    public void rateApp(View view) {
+
+        Utils.rateApp(this);
+    }
 }

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

@@ -1,6 +1,8 @@
 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;
 
@@ -159,4 +161,15 @@ public static String getAppLogs() {
 
         return stringBuilder.toString();
     }
-}
+
+    public static void rateApp(Context context) {
+        final String appPackageName = context.getPackageName();
+        try {
+            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
+        }
+        catch (android.content.ActivityNotFoundException anfe) {
+            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
+        }
+        return ;
+    }
+}

app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

@@ -23,6 +23,7 @@
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.LoginActivity;
@@ -133,17 +134,6 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
                     Toast.makeText(this, R.string.no_email_client, Toast.LENGTH_SHORT).show();
                 }
                 return true;
-            case R.id.action_rate:
-                drawerLayout.closeDrawer(navigationView);
-                final String appPackageName = getPackageName();
-                Toast.makeText(this, appPackageName, Toast.LENGTH_SHORT).show();
-                try {
-                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
-                }
-                catch (android.content.ActivityNotFoundException anfe) {
-                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
-                }
-                return true;
             case R.id.action_logout:
                 new AlertDialog.Builder(this)
                         .setMessage(R.string.logout_verification)

app/src/main/res/drawable-hdpi/ic_star_black_24dp.png

@@ -104,6 +104,14 @@
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/about_rate_us"
+                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_rate_us" />
             <fr.free.nrw.commons.ui.widget.HtmlTextView
                 android:id="@+id/about_privacy_policy"
                 style="?android:textAppearanceSmall"

app/src/main/res/drawable-mdpi/ic_star_black_24dp.png

@@ -30,11 +30,6 @@
         android:icon="@drawable/ic_feedback_black_24dp"
         android:title="@string/navigation_item_feedback"/>
 
-    <item
-        android:id="@+id/action_rate"
-        android:icon="@drawable/ic_star_black_24dp"
-        android:title="@string/navigation_item_rate"/>
-
     <item
         android:id="@+id/action_logout"
         android:icon="@drawable/ic_exit_to_app_black_24dp"