From 4432f2ca1a18dd57220c1c3cb6c35d7f75f6a433 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Sat, 24 Feb 2018 17:36:54 +0530
Subject: [PATCH 1/3] Rate Us feature added

---
 .../commons/theme/NavigationBaseActivity.java    |  12 ++++++++++++
 .../res/drawable-hdpi/ic_star_black_24dp.png     | Bin 0 -> 440 bytes
 .../res/drawable-mdpi/ic_star_black_24dp.png     | Bin 0 -> 296 bytes
 .../res/drawable-xhdpi/ic_star_black_24dp.png    | Bin 0 -> 577 bytes
 .../res/drawable-xxhdpi/ic_star_black_24dp.png   | Bin 0 -> 844 bytes
 .../res/drawable-xxxhdpi/ic_star_black_24dp.png  | Bin 0 -> 1148 bytes
 app/src/main/res/menu/drawer.xml                 |   5 +++++
 app/src/main/res/values/strings.xml              |   1 +
 8 files changed, 18 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 99c9f253b..5d577e73d 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -5,6 +5,7 @@ import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.widget.DrawerLayout;
@@ -132,6 +133,17 @@ public abstract class NavigationBaseActivity extends BaseActivity
                     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)
diff --git a/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ab80a62264238e19bfbeaddaa76efe9ec6b96eb
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004hNkl<Zc-muN
z7zHB~m_hNN0gHin(O_|mI1v8?;vYaPIv5;O3&j7SxN4vs!ve%lkR0?Fh?xh{L19Ra
zf#KkRbkJce4%$CZj?u^B7#P+W2nWr<<DePzc8mlNf5YRTFVrdmKtb&a#L+-p2*m9`
zJQs*J1Mx{9z7MtRKam)u_8t(Q0OCzhv)Z9%M?>wx8@;|HT1YAW0<{w_Fb3l1ba2cw
zAT}a4>g0j=Dh(ZT8HnXbO;7wlyoUyk*#*RW<R)@fAf8V}$IO9NH&m@a$-)0<QSrt=
zn;E1!2BasF7KI@r5WgqGL9c05I_pvpWg4__P$mTqN}+{=mQvuL1+;L`Lp&D#g<@Rt
zcc|?cSv;1VgjP2uKzs_1ItgkzC=!bWZ-F=sh?$Vof!OI#Idt_Q)O65Pv_ft+5DVi`
zF9L09{6o?=ftn7w2sQL95Sx>r&kBeyK=q!XmSgy#QIL%mJ;VY~w<r&41`jnHBnHLQ
iX!eSX4ugyWS_1%uyh^6WteQvw0000<MNUMnLSTXs|FQ`H

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8da3c8f5c33ce766bc70b2282243e4ffea716f7c
GIT binary patch
literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002*Nkl<Zc-muN
z7-_%^ifING1MwnS87>aQKY{oM5R1~nf?6Q{55-l~Hk<{BpCDQA2#A@fX+ap0;V>LT
ziGcz@tOmq3KpY6fXRugs5-Mj6RVzTq&<Y@a3XRDBWa6JtGb*rIzzD>h6c`S}?NGCD
zf(#)3Lx#b>fjE`eIPe7G&m<WB35eZEjc5aCcoH)FF%avKo0`@TVZm}rlIwFKeLxma
zAt4Ur$*~|F%@9z^nh3?{sVs^d3uYr3a0D$PK?&d(lKeDsEVvHDFM&7#N5%n(B?0kk
uAihLSSu};1@&yP4fp{tq^D>MAasU7g?2`KWwX|vg0000<MNUMnLSTZ$+-|f0

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..63490ed07a228f18b69f01d7dd57e7f5fb17bdd2
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006ANkl<Zc-rlm
zIY<LR6o%sw5p9APRJ645!a`KA(Gak(Nug*bX)J_*iYTH8lF~-7@IVVsFrr1kS_Q!-
zSO^gj0xAlE7Ag_(AjE(1Ei56&CYhP+!2a+xVduU7580Ww8;ix1DN{VvMo6n|uqCVc
z3h)iSfL+D_vmi>$$Y#C}JZb_wfC8BU^lQwk^vV?AEKYz^S<E-bF|X1jLxA-p0alG}
zz6^XO3Ge}IMh-BM#JtLwQO)OrTO9#HAkT;aTsq9F^yK2(RmOn^-~a=_1H51b9MWN>
zH^4ouS*98uIy)TH!%jUj(lGFW6A%Q?Ad-eTRz#?Gki7WFTT0nzLDXOzr?Z0<(HLwL
z^P9k$$<N7a0P}O%-oS3~lLO;Q&p}qZkQ2NKH2+FF5>qwO_Q%`&9jNDZ9#nw~j^+dO
zD9Tl(;E02HKPVA(GAoaVOAO5~W^?jpst$$$T5~bHO)?CSlM&m`Fu;Lm^U6H`!Z5&-
z=m2#bcA;940fsmPaElDEq0`hQq37B)kpV&}%)EmUIxiGP>9b^Ou0@%zOkre)u8B8>
z?50>-E+Rl*g67JjU#E`sUEnG~4VQ=j3o%W@V4U7a>y?$>A%$aV&5H;S&@|iw)mhZ4
z0sESI=OQN2U%KI(4C{7-8_WMcI>kH#w1X*n=w~gZ<}_%rm@;L`lr;JS9nnljg}Zh9
P00000NkvXXu0mjfGgke@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..abc65dfe8c247ab9a5f29137da513e4016c3b01d
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0009MNkl<Zc-rlo
zTZm0j7{|9;$dEJ>9w-mv7Dp&A#LFp44RURyc$pdxnv|4F6bX$o5A&eG!+0YKrQxJ8
zq4D5NLP!}#io_TUGX7uZ+d0^0pM5!JueJ92{`GsA&g`|;Z>GK0`qny*BauiX5{aZd
zS;R<+<Q!-h4c?gu2EaE^BRc-ielW=F6&-(PICxbcsE2<h;cO_7<FZb){K;((LAOLp
zKJz@}xXcwjj&s^a&?(#HOaNbe1oeaQHVfM2BgbW@t#XEf7Xbu4<Ih@`RRQF<th7;3
zE`*>C+vLm&A&2+{rrRW_HKZV-#TGf^KwktwA3>E3f_6lZ<FY;Na)y8>F$6tKvz*aj
zeGEA+YrrT|YB-ZX24q1!XaYxge{}`i1J5JAb4t<2&+Z17K^wQ-#C^$f->8qnDj{Gw
zXaom%*0}(>z$5UUr`|zBpuWE2zIX9hT6t`ZJl4=z0D29Q5S3mYYotsC4^k|L#x|uK
z>y}&!<=o)0l_ev<*%ZlXb1HNwu+MNY^s?Sl>FIs5lRw}yO%5GMZc1tmw3MfMQ{>PT
zza;5};tXD>=`QCfs8zL^uHlueu5#{zY901i7d4b~UZ*`971f(Hl5>nJ2ik?|H9r-K
z`2iYq-{sQ@#AgL^K7kdc)PClJHwnsl?c~q+jmn(_1$CMxXC$v&lM>X=`$c22Siw8U
zsN1o-6$mowlEYO6f-aeKw4-7p`_>devlT8BYfTW;pis~@69ly@6m-S}L2+tCUzw=C
z|5$f9lVc2yX1-}moLR71XF*ZU-szrVoyW84oM3kt|7Eq#f?7fr(GPLK&94}DIOHKg
zv(AF<2OLC4$SIjVdp+Q@yLFXQ6`)x560D8U27SS$r$ieACH^awCF|4a@8BpHQ>H(}
zaeij8_Lk`==wOk~-UKr%v|{fp(x#SQ$jf<D`I0!vtoNv1Ueiqu-QaR>kx}9N1Q?rO
z`*cg=WWhV|gQMBk7Z!5I==Rneh5g7BlzKBd3EBv@XjE?58gsUkNF)-8L?V$${PP=)
WT`Ll6gAF7A0000<MNUMnLSTZXE``Ma

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e853bc6835a4cf612989e9e62e213fe231802f01
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000C-Nkl<Zc-rlq
zSx6O87{`xGn;E68T1X2~V75uwO4y=A%Y#%%P+(?YVUig=<U@po4+RAlRAf+6L=Q#_
zNc3P*kkG!+iqS$)SZTJ{V)h;UCaz-BENAAPbLRWO??o<m&iudY+?ns3nadbK5ClOG
z1VIplT1-WWFmW6_MlpnkLEv|=1sq6m_)iJghHj%c{3RNE9a4Z-_&35QR)mCaxQt@)
zkJ>H@P(!i!!-OuvH%y^;yyvh<0S;0;-VzUfH7URsuph<b9a~JoH!Px<yde^-w@`p*
z_*z0ROD%+NxQOBs&qW&rsHV8YG8X)8qX7K1qbW9Vl-mg3a4*FshCbjY2L)&ZV<|rO
z6gUXqFrVUcM+ErDMFAdAgzm_25x(JEiqSde1Qei(Vsyp`uvI_-et}68r+sz{2;Z=b
z;<QH$_(5O+8o-_ut99}OhHscdv0CSj2L-r6v37l^8P3{Qw=Kp`X_*J%8}7nw@NVf8
z+;%UW0__eC11Eu*;3{x4hFSrh2kXG+tbO*XO%gxjnCkG<w*tppg!_<*`!p2y(O38i
zG(Ooq56lKPf~Bl|{*|9&Uj?6H@1-pu@_l`R`(A}vlwvm7m{kg9=bBvbXMn;LCC_Y)
zsQ-cmU=xLE*(S_PDEwdQC58K6Ux4Gh`aVbmZ&Jvnr@9GVe<{b}*$f5VQGWK++pjaD
zDDVJ<{?~HM#CM9By~%RjY-JKG1mnxXzXdRSzC<!hmMh@t;JW~Y{}xP>tqm~>d>nxA
zAL3+@l<?KdwHk+C1IEeTkm~`S&@lYUa5Una5`nE>UBcg?YI}OE;*Go?I?SYHDB8$t
z#I~{)jA!ll@~YHOOV(}rQI$sCb#RETbHKcjcR}Lt&-&R=3l~v1g(qA1ytx>dd&{yU
zEWi>LAofUDfIux@tdp<+SAr6L3|`>KR)7|4qi9dM#AiXXf>3}Gi3_kb2nDESa!;&l
zO{C;~q4(Iy)s~40v?7vqF2Du_3b0P+0-RK!09ro?R)v;yy{_RWF?Hqx5_K%VO2HxV
zbx1j==ru{pbu56WwWNGG;C|Ne;e2uU{;h(xu}{YW+!YYaHE^=YHc|yO`n0>Fvaice
zC%@4;&*DW=1irSx#rF8)4YYdJ&_Wl78$Np$?_it#!9&dX>h1YD6<{ZGHaRZh*D=!Y
zkYacH+jT0yWg9!rpAnJI#Lmz1_gW8rv@woLx`f}2nLlng^ht+DzyThPh5ypVQHzJA
zW)`NqUPLp^!p`0TXZSd#nc!^;<4V<`0L9FF`CmbpK52ZLh0MG?UZ_I>&X_d421_tL
zz6!4LA7ebNLjgLs3GRWjB^>7*@P4PUzEM5=F(Es{AHKSY$^BzH(Rj#g4jK1Il?#xI
zJHhXmNl<9q{IN8raO|s9{{l`|c>Mfon0^p~AP9mW2!bF8f*=Tj5W*jNP%vNGd;WI-
O0000<MNUMnLSTZ$ejgbC

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 83c1bf0ad..2b38ace3f 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -30,6 +30,11 @@
         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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92b6be921..989b182c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -225,4 +225,5 @@
   <string name="notifications_thank_you_edit">Thank you for making an edit</string>
   <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
   <string name="toggle_view_button">Toggle view</string>
+    <string name="navigation_item_rate">Rate Us</string>
 </resources>

From fc8b522ac406164b944b3de35a3c7bed61297a4a Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Tue, 27 Feb 2018 12:04:04 +0530
Subject: [PATCH 2/3] Rate Us method added to Utils.java and called on
 AboutActivity.java

---
 .../java/fr/free/nrw/commons/AboutActivity.java  |   6 ++++++
 app/src/main/java/fr/free/nrw/commons/Utils.java |  15 ++++++++++++++-
 .../commons/theme/NavigationBaseActivity.java    |  12 +-----------
 .../res/drawable-hdpi/ic_star_black_24dp.png     | Bin 440 -> 0 bytes
 .../res/drawable-mdpi/ic_star_black_24dp.png     | Bin 296 -> 0 bytes
 .../res/drawable-xhdpi/ic_star_black_24dp.png    | Bin 577 -> 0 bytes
 .../res/drawable-xxhdpi/ic_star_black_24dp.png   | Bin 844 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_star_black_24dp.png  | Bin 1148 -> 0 bytes
 app/src/main/res/layout/activity_about.xml       |   8 ++++++++
 app/src/main/res/menu/drawer.xml                 |   5 -----
 app/src/main/res/values/strings.xml              |   2 +-
 11 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index a2f67a3bf..54e12fcf2 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -65,4 +65,10 @@ public class AboutActivity extends NavigationBaseActivity {
         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);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 817c39f24..48a8ce739 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/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 class Utils {
 
         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 ;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 5d577e73d..a2c85d50b 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -23,6 +23,7 @@ import fr.free.nrw.commons.AboutActivity;
 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 abstract class NavigationBaseActivity extends BaseActivity
                     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)
diff --git a/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_star_black_24dp.png
deleted file mode 100644
index 8ab80a62264238e19bfbeaddaa76efe9ec6b96eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004hNkl<Zc-muN
z7zHB~m_hNN0gHin(O_|mI1v8?;vYaPIv5;O3&j7SxN4vs!ve%lkR0?Fh?xh{L19Ra
zf#KkRbkJce4%$CZj?u^B7#P+W2nWr<<DePzc8mlNf5YRTFVrdmKtb&a#L+-p2*m9`
zJQs*J1Mx{9z7MtRKam)u_8t(Q0OCzhv)Z9%M?>wx8@;|HT1YAW0<{w_Fb3l1ba2cw
zAT}a4>g0j=Dh(ZT8HnXbO;7wlyoUyk*#*RW<R)@fAf8V}$IO9NH&m@a$-)0<QSrt=
zn;E1!2BasF7KI@r5WgqGL9c05I_pvpWg4__P$mTqN}+{=mQvuL1+;L`Lp&D#g<@Rt
zcc|?cSv;1VgjP2uKzs_1ItgkzC=!bWZ-F=sh?$Vof!OI#Idt_Q)O65Pv_ft+5DVi`
zF9L09{6o?=ftn7w2sQL95Sx>r&kBeyK=q!XmSgy#QIL%mJ;VY~w<r&41`jnHBnHLQ
iX!eSX4ugyWS_1%uyh^6WteQvw0000<MNUMnLSTXs|FQ`H

diff --git a/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_star_black_24dp.png
deleted file mode 100644
index 8da3c8f5c33ce766bc70b2282243e4ffea716f7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002*Nkl<Zc-muN
z7-_%^ifING1MwnS87>aQKY{oM5R1~nf?6Q{55-l~Hk<{BpCDQA2#A@fX+ap0;V>LT
ziGcz@tOmq3KpY6fXRugs5-Mj6RVzTq&<Y@a3XRDBWa6JtGb*rIzzD>h6c`S}?NGCD
zf(#)3Lx#b>fjE`eIPe7G&m<WB35eZEjc5aCcoH)FF%avKo0`@TVZm}rlIwFKeLxma
zAt4Ur$*~|F%@9z^nh3?{sVs^d3uYr3a0D$PK?&d(lKeDsEVvHDFM&7#N5%n(B?0kk
uAihLSSu};1@&yP4fp{tq^D>MAasU7g?2`KWwX|vg0000<MNUMnLSTZ$+-|f0

diff --git a/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_star_black_24dp.png
deleted file mode 100644
index 63490ed07a228f18b69f01d7dd57e7f5fb17bdd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006ANkl<Zc-rlm
zIY<LR6o%sw5p9APRJ645!a`KA(Gak(Nug*bX)J_*iYTH8lF~-7@IVVsFrr1kS_Q!-
zSO^gj0xAlE7Ag_(AjE(1Ei56&CYhP+!2a+xVduU7580Ww8;ix1DN{VvMo6n|uqCVc
z3h)iSfL+D_vmi>$$Y#C}JZb_wfC8BU^lQwk^vV?AEKYz^S<E-bF|X1jLxA-p0alG}
zz6^XO3Ge}IMh-BM#JtLwQO)OrTO9#HAkT;aTsq9F^yK2(RmOn^-~a=_1H51b9MWN>
zH^4ouS*98uIy)TH!%jUj(lGFW6A%Q?Ad-eTRz#?Gki7WFTT0nzLDXOzr?Z0<(HLwL
z^P9k$$<N7a0P}O%-oS3~lLO;Q&p}qZkQ2NKH2+FF5>qwO_Q%`&9jNDZ9#nw~j^+dO
zD9Tl(;E02HKPVA(GAoaVOAO5~W^?jpst$$$T5~bHO)?CSlM&m`Fu;Lm^U6H`!Z5&-
z=m2#bcA;940fsmPaElDEq0`hQq37B)kpV&}%)EmUIxiGP>9b^Ou0@%zOkre)u8B8>
z?50>-E+Rl*g67JjU#E`sUEnG~4VQ=j3o%W@V4U7a>y?$>A%$aV&5H;S&@|iw)mhZ4
z0sESI=OQN2U%KI(4C{7-8_WMcI>kH#w1X*n=w~gZ<}_%rm@;L`lr;JS9nnljg}Zh9
P00000NkvXXu0mjfGgke@

diff --git a/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_star_black_24dp.png
deleted file mode 100644
index abc65dfe8c247ab9a5f29137da513e4016c3b01d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0009MNkl<Zc-rlo
zTZm0j7{|9;$dEJ>9w-mv7Dp&A#LFp44RURyc$pdxnv|4F6bX$o5A&eG!+0YKrQxJ8
zq4D5NLP!}#io_TUGX7uZ+d0^0pM5!JueJ92{`GsA&g`|;Z>GK0`qny*BauiX5{aZd
zS;R<+<Q!-h4c?gu2EaE^BRc-ielW=F6&-(PICxbcsE2<h;cO_7<FZb){K;((LAOLp
zKJz@}xXcwjj&s^a&?(#HOaNbe1oeaQHVfM2BgbW@t#XEf7Xbu4<Ih@`RRQF<th7;3
zE`*>C+vLm&A&2+{rrRW_HKZV-#TGf^KwktwA3>E3f_6lZ<FY;Na)y8>F$6tKvz*aj
zeGEA+YrrT|YB-ZX24q1!XaYxge{}`i1J5JAb4t<2&+Z17K^wQ-#C^$f->8qnDj{Gw
zXaom%*0}(>z$5UUr`|zBpuWE2zIX9hT6t`ZJl4=z0D29Q5S3mYYotsC4^k|L#x|uK
z>y}&!<=o)0l_ev<*%ZlXb1HNwu+MNY^s?Sl>FIs5lRw}yO%5GMZc1tmw3MfMQ{>PT
zza;5};tXD>=`QCfs8zL^uHlueu5#{zY901i7d4b~UZ*`971f(Hl5>nJ2ik?|H9r-K
z`2iYq-{sQ@#AgL^K7kdc)PClJHwnsl?c~q+jmn(_1$CMxXC$v&lM>X=`$c22Siw8U
zsN1o-6$mowlEYO6f-aeKw4-7p`_>devlT8BYfTW;pis~@69ly@6m-S}L2+tCUzw=C
z|5$f9lVc2yX1-}moLR71XF*ZU-szrVoyW84oM3kt|7Eq#f?7fr(GPLK&94}DIOHKg
zv(AF<2OLC4$SIjVdp+Q@yLFXQ6`)x560D8U27SS$r$ieACH^awCF|4a@8BpHQ>H(}
zaeij8_Lk`==wOk~-UKr%v|{fp(x#SQ$jf<D`I0!vtoNv1Ueiqu-QaR>kx}9N1Q?rO
z`*cg=WWhV|gQMBk7Z!5I==Rneh5g7BlzKBd3EBv@XjE?58gsUkNF)-8L?V$${PP=)
WT`Ll6gAF7A0000<MNUMnLSTZXE``Ma

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_star_black_24dp.png
deleted file mode 100644
index e853bc6835a4cf612989e9e62e213fe231802f01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000C-Nkl<Zc-rlq
zSx6O87{`xGn;E68T1X2~V75uwO4y=A%Y#%%P+(?YVUig=<U@po4+RAlRAf+6L=Q#_
zNc3P*kkG!+iqS$)SZTJ{V)h;UCaz-BENAAPbLRWO??o<m&iudY+?ns3nadbK5ClOG
z1VIplT1-WWFmW6_MlpnkLEv|=1sq6m_)iJghHj%c{3RNE9a4Z-_&35QR)mCaxQt@)
zkJ>H@P(!i!!-OuvH%y^;yyvh<0S;0;-VzUfH7URsuph<b9a~JoH!Px<yde^-w@`p*
z_*z0ROD%+NxQOBs&qW&rsHV8YG8X)8qX7K1qbW9Vl-mg3a4*FshCbjY2L)&ZV<|rO
z6gUXqFrVUcM+ErDMFAdAgzm_25x(JEiqSde1Qei(Vsyp`uvI_-et}68r+sz{2;Z=b
z;<QH$_(5O+8o-_ut99}OhHscdv0CSj2L-r6v37l^8P3{Qw=Kp`X_*J%8}7nw@NVf8
z+;%UW0__eC11Eu*;3{x4hFSrh2kXG+tbO*XO%gxjnCkG<w*tppg!_<*`!p2y(O38i
zG(Ooq56lKPf~Bl|{*|9&Uj?6H@1-pu@_l`R`(A}vlwvm7m{kg9=bBvbXMn;LCC_Y)
zsQ-cmU=xLE*(S_PDEwdQC58K6Ux4Gh`aVbmZ&Jvnr@9GVe<{b}*$f5VQGWK++pjaD
zDDVJ<{?~HM#CM9By~%RjY-JKG1mnxXzXdRSzC<!hmMh@t;JW~Y{}xP>tqm~>d>nxA
zAL3+@l<?KdwHk+C1IEeTkm~`S&@lYUa5Una5`nE>UBcg?YI}OE;*Go?I?SYHDB8$t
z#I~{)jA!ll@~YHOOV(}rQI$sCb#RETbHKcjcR}Lt&-&R=3l~v1g(qA1ytx>dd&{yU
zEWi>LAofUDfIux@tdp<+SAr6L3|`>KR)7|4qi9dM#AiXXf>3}Gi3_kb2nDESa!;&l
zO{C;~q4(Iy)s~40v?7vqF2Du_3b0P+0-RK!09ro?R)v;yy{_RWF?Hqx5_K%VO2HxV
zbx1j==ru{pbu56WwWNGG;C|Ne;e2uU{;h(xu}{YW+!YYaHE^=YHc|yO`n0>Fvaice
zC%@4;&*DW=1irSx#rF8)4YYdJ&_Wl78$Np$?_it#!9&dX>h1YD6<{ZGHaRZh*D=!Y
zkYacH+jT0yWg9!rpAnJI#Lmz1_gW8rv@woLx`f}2nLlng^ht+DzyThPh5ypVQHzJA
zW)`NqUPLp^!p`0TXZSd#nc!^;<4V<`0L9FF`CmbpK52ZLh0MG?UZ_I>&X_d421_tL
zz6!4LA7ebNLjgLs3GRWjB^>7*@P4PUzEM5=F(Es{AHKSY$^BzH(Rj#g4jK1Il?#xI
zJHhXmNl<9q{IN8raO|s9{{l`|c>Mfon0^p~AP9mW2!bF8f*=Tj5W*jNP%vNGd;WI-
O0000<MNUMnLSTZ$ejgbC

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 76c51a4aa..4286371a9 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -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"
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 2b38ace3f..83c1bf0ad 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 989b182c3..98faa8de5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -225,5 +225,5 @@
   <string name="notifications_thank_you_edit">Thank you for making an edit</string>
   <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
   <string name="toggle_view_button">Toggle view</string>
-    <string name="navigation_item_rate">Rate Us</string>
+  <string name="about_rate_us"><u>Rate Us</u></string>
 </resources>

From 6277272206a44c8cc95e44a452f38e97553268d9 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Wed, 28 Feb 2018 00:47:10 +0530
Subject: [PATCH 3/3] Fix merge conflicts

---
 app/src/main/res/layout/activity_about.xml | 35 +++-------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 892da2fa6..00c7fa5b8 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -104,35 +104,6 @@
 
                 </LinearLayout>
 
-                <fr.free.nrw.commons.ui.widget.HtmlTextView
-                    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:text="@string/about_privacy_policy" />
-
-                <fr.free.nrw.commons.ui.widget.HtmlTextView
-                    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" />
-
-                <TextView
-                    android:id="@+id/about_uploads_to"
-                    style="?android:textAppearanceSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/large_gap"
-                    android:alpha="0.2"
-                    android:gravity="center" />
-
-            </LinearLayout>
-
             <TextView
                 android:id="@+id/about_rate_us"
                 android:layout_width="wrap_content"
@@ -142,20 +113,22 @@
                 android:textColor="@color/primaryColor"
                 android:text="@string/about_rate_us" />
           
-            <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:textColor="@color/primaryColor"
                 android:gravity="center"
                 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:textColor="@color/primaryColor"
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
                 android:text="@string/about_credits" />