Fix #1959: Optimize admin_auth_activity.xml (#2225)

* Optimize admin_auth_activity.xml * resolving requested changes
oppia · Dec 4, 2020 · 408c48e · 408c48e
1 parent 33f4736
commit 408c48e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/app/src/main/res/layout-land/admin_auth_activity.xml b/app/src/main/res/layout-land/admin_auth_activity.xml
@@ -61,30 +61,27 @@
 
           <TextView
             android:id="@+id/admin_auth_heading_textview"
+            style="@style/Heading2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="72dp"
             android:layout_marginTop="44dp"
             android:layout_marginEnd="72dp"
-            android:fontFamily="sans-serif-medium"
             android:maxLines="2"
             android:text="@string/admin_auth_heading"
-            android:textColor="@color/oppiaPrimaryText"
-            android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
           <TextView
             android:id="@+id/admin_auth_sub_text"
+            style="@style/Subtitle1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif"
             android:text="@string/admin_auth_sub"
             android:textColor="@color/oppiaAdminAuthSecondaryText"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
             app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
             app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
@@ -95,8 +92,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="168dp"
             android:layout_marginTop="48dp"
-            android:layout_marginBottom="4dp"
             android:layout_marginEnd="168dp"
+            android:layout_marginBottom="4dp"
             android:addTextChangedListener="@{viewModel.inputPinTextWatcher}"
             android:imeOptions="actionDone"
             app:inputLength="5"

diff --git a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
@@ -63,28 +63,25 @@
 
           <TextView
             android:id="@+id/admin_auth_heading_textview"
+            style="@style/Heading2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="48dp"
-            android:fontFamily="sans-serif-medium"
             android:maxLines="2"
             android:text="@string/admin_auth_heading"
-            android:textColor="@color/oppiaPrimaryText"
-            android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
           <TextView
             android:id="@+id/admin_auth_sub_text"
+            style="@style/Subtitle1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif"
             android:text="@string/admin_auth_sub"
             android:textColor="@color/oppiaAdminAuthSecondaryText"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
             app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
             app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />

diff --git a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
@@ -56,27 +56,24 @@
 
         <TextView
           android:id="@+id/admin_auth_heading_textview"
+          style="@style/Heading2"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginTop="48dp"
-          android:fontFamily="sans-serif-medium"
           android:maxLines="2"
           android:text="@string/admin_auth_heading"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="20sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
           android:id="@+id/admin_auth_sub_text"
+          style="@style/Subtitle1"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginTop="12dp"
-          android:fontFamily="sans-serif"
           android:text="@string/admin_auth_sub"
           android:textColor="@color/oppiaAdminAuthSecondaryText"
-          android:textSize="16sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
@@ -111,7 +108,6 @@
           app:layout_constraintEnd_toEndOf="@+id/admin_auth_input_pin"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin"
           app:layout_constraintVertical_bias="0.0" />
-
       </androidx.constraintlayout.widget.ConstraintLayout>
 
       <View

diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
@@ -54,31 +54,28 @@
 
         <TextView
           android:id="@+id/admin_auth_heading_textview"
+          style="@style/Heading2"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginStart="28dp"
           android:layout_marginTop="40dp"
           android:layout_marginEnd="28dp"
-          android:fontFamily="sans-serif-medium"
           android:maxLines="2"
           android:text="@string/admin_auth_heading"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="20sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
           android:id="@+id/admin_auth_sub_text"
+          style="@style/Subtitle1"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginStart="28dp"
           android:layout_marginTop="12dp"
           android:layout_marginEnd="28dp"
-          android:fontFamily="sans-serif"
           android:text="@string/admin_auth_sub"
           android:textColor="@color/oppiaAdminAuthSecondaryText"
-          android:textSize="16sp"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />