Fixes #3788 (#3966)

*Distinctively show quality images and featured images in Achievements

app/src/main/java/fr/free/nrw/commons/profile/achievements/Achievements.kt

@@ -32,6 +32,15 @@ class Achievements {
      * @param featuredImages
      */
     var featuredImages = 0
+    /**
+     * getter function to get count of featured images
+     * @return
+     */
+    /**
+     * setter function to set count of featured images
+     * @param featuredImages
+     */
+    var qualityImages = 0
     /**
      * getter function to get count of images uploaded
      * @return
@@ -57,12 +66,14 @@ class Achievements {
                 articlesUsingImages: Int,
                 thanksReceived: Int,
                 featuredImages: Int,
+                qualityImages: Int,
                 imagesUploaded: Int,
                 revertCount: Int) {
         this.uniqueUsedImages = uniqueUsedImages
         this.articlesUsingImages = articlesUsingImages
         this.thanksReceived = thanksReceived
         this.featuredImages = featuredImages
+        this.qualityImages = qualityImages
         this.imagesUploaded = imagesUploaded
         this.revertCount = revertCount
     }
@@ -91,8 +102,8 @@ class Achievements {
                 response.uniqueUsedImages,
                 response.articlesUsingImages,
                 response.thanksReceived,
-                response.featuredImages.qualityImages
-                        + response.featuredImages.featuredPicturesOnWikimediaCommons, 0,
+                response.featuredImages.featuredPicturesOnWikimediaCommons,
+                response.featuredImages.qualityImages, 0,
                 response.deletedUploads
             )
         }

app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java

@@ -77,6 +77,9 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
     @BindView(R.id.image_featured)
     TextView imagesFeatured;
 
+    @BindView(R.id.quality_images)
+    TextView tvQualityImages;
+
     @BindView(R.id.images_revert_limit_text)
     TextView imagesRevertLimitText;
 
@@ -414,6 +417,7 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
         imagesUsedByWikiProgressBar.setProgressTextFormatPattern
                 (achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages());
         imagesFeatured.setText(String.valueOf(achievements.getFeaturedImages()));
+        tvQualityImages.setText(String.valueOf(achievements.getQualityImages()));
         String levelUpInfoString = getString(R.string.level).toUpperCase();
         levelUpInfoString += " " + levelInfo.getLevelNumber();
         levelNumber.setText(levelUpInfoString);
@@ -492,6 +496,12 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
                 ,getResources().getString(R.string.thanks_received_explanation));
     }
 
+    @OnClick(R.id.quality_images_info)
+    public void showQualityImagesInfo() {
+        launchAlert(getResources().getString(R.string.statistics_quality)
+            , getResources().getString(R.string.quality_images_info));
+    }
+
     /**
      * takes title and message as input to display alerts
      * @param title

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

@@ -406,6 +406,74 @@
 
           </RelativeLayout>
 
+          <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+            android:layout_marginRight="@dimen/activity_margin_horizontal"
+            android:layout_marginEnd="@dimen/activity_margin_horizontal"
+            android:layout_marginStart="@dimen/activity_margin_horizontal"
+            android:layout_marginTop="@dimen/activity_margin_horizontal">
+
+            <LinearLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_centerVertical="true"
+              android:layout_alignParentStart="true"
+              android:layout_alignParentLeft="true"
+              android:layout_toStartOf="@+id/quality_images"
+              android:layout_toLeftOf="@+id/quality_images"
+              android:orientation="horizontal"
+              android:gravity="center_vertical">
+
+              <ImageView
+                android:layout_width="@dimen/overflow_icon_dimen"
+                android:layout_height="@dimen/overflow_icon_dimen"
+                android:id="@+id/quality_image_icon"
+                app:srcCompat="@drawable/ic_quality_images_logo"
+                android:scaleType="centerInside" />
+
+              <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:textAppearanceMedium"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:text="@string/statistics_quality"  />
+
+              <ImageView
+                android:layout_width="@dimen/medium_width"
+                android:layout_height="@dimen/medium_height"
+                android:id="@+id/quality_images_info"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                android:layout_gravity="top"
+                app:srcCompat="@drawable/ic_info_outline_24dp"
+                android:tint="@color/primaryDarkColor" />
+
+            </LinearLayout>
+
+            <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              style="?android:textAppearanceMedium"
+              android:layout_alignParentRight="true"
+              android:layout_alignParentEnd="true"
+              android:layout_marginTop="@dimen/activity_margin_horizontal"
+              android:layout_marginStart="@dimen/activity_margin_horizontal"
+              android:layout_centerVertical="true"
+              tools:text="2"
+              android:text="0"
+              android:id="@+id/quality_images"
+              android:layout_marginLeft="@dimen/activity_margin_horizontal"
+              android:layout_marginEnd="@dimen/half_standard_height"
+              android:layout_marginRight="@dimen/half_standard_height" />
+
+          </RelativeLayout>
+
           <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -697,4 +697,6 @@ Upload your first media by tapping on the add button.</string>
   <string name="limited_connection_enabled">Limited connection mode enabled!</string>
   <string name="limited_connection_disabled">Limited connection mode disabled. Pending uploads will resume now.</string>
   <string name="limited_connection">Limited Connection</string>
+  <string name="statistics_quality">Quality Images</string>
+  <string name="quality_images_info">Quality images are diagrams or photographs that meet certain quality standards (which are mostly technical in nature) and are valuable for Wikimedia projects</string>
 </resources>