From c7b123cfea2699c28806d25e7334d7cc1d2fb841 Mon Sep 17 00:00:00 2001
From: ValentinTimisica <valentin.timisica@softvision.ro>
Date: Wed, 15 Apr 2020 20:51:55 +0300
Subject: [PATCH] Fixes #9710: Vertically aligns users_count with rating
 (#9950)

---
 .../res/layout/fragment_add_on_details.xml    | 66 ++++++++++++-------
 app/src/main/res/values/dimens.xml            |  4 ++
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml
index 73263b5c3..d46e5a710 100644
--- a/app/src/main/res/layout/fragment_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_add_on_details.xml
@@ -126,32 +126,50 @@
             android:background="?android:attr/listDivider"
             android:importantForAccessibility="no" />
 
-        <TextView
-            android:id="@+id/rating_label"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/home_page_divider"
-            style="@style/AboutHeaderContentText"
-            android:text="@string/mozac_feature_addons_rating" />
+            android:layout_below="@+id/home_page_divider">
 
-        <RatingBar
-            android:id="@+id/rating_view"
-            style="@style/Widget.AppCompat.RatingBar.Small"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_below="@+id/home_page_divider"
-            android:layout_toStartOf="@+id/users_count"
-            android:isIndicator="true"
-            android:numStars="5" />
+            <TextView
+                android:id="@+id/rating_label"
+                style="@style/AboutHeaderContentText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/mozac_feature_addons_rating"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <RatingBar
+                android:id="@+id/rating_view"
+                style="@style/Widget.AppCompat.RatingBar.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/addon_details_rating_view_margin_start"
+                android:layout_marginEnd="@dimen/addon_details_rating_view_margin_end"
+                android:isIndicator="true"
+                android:numStars="5"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/users_count"
+                app:layout_constraintHorizontal_bias="1"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toEndOf="@+id/rating_label"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/users_count"
+                style="@style/AboutHeaderContentText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/rating_view"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_default="wrap"
+                tools:text="591,642" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/users_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/home_page_divider"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="6dp"
-            style="@style/AboutHeaderContentText"
-            tools:text="591,642" />
     </RelativeLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 15d5d3630..01e5887ec 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -134,4 +134,8 @@
     <dimen name="onboarding_dual_pane_radio_button_translation_x">-7dp</dimen>
     <dimen name="onboarding_dual_pane_radio_button_translation_y">-8dp</dimen>
 
+    <!-- Addon Details Fragment -->
+    <dimen name="addon_details_rating_view_margin_start">6dp</dimen>
+    <dimen name="addon_details_rating_view_margin_end">6dp</dimen>
+
 </resources>