Apply UI theme (2) - Rectangles

tink-expo · Dec 1, 2019 · 4f591e8 · 4f591e8
1 parent 2382883
commit 4f591e8
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 17 deletions.
diff --git a/android/app/src/main/res/drawable/rectangle.xml b/android/app/src/main/res/drawable/rectangle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/rectangle">
+    <corners android:radius="10dp" />
+    <solid android:color="#ffffffff" />
+</shape>
diff --git a/android/app/src/main/res/layout/activity_fail.xml b/android/app/src/main/res/layout/activity_fail.xml
@@ -69,6 +69,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <View
+            android:id="@+id/rectangleView2"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:background="@drawable/rectangle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/textView8"
             android:layout_width="wrap_content"
@@ -98,12 +106,12 @@
         <Button
             android:id="@+id/idButton"
             style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginTop="8dp"
+            android:layout_width="64dp"
+            android:layout_height="32dp"
             android:text="Select"
+            android:textAlignment="viewEnd"
+            android:textAllCaps="false"
+            android:textColor="@color/colorPrimary"
             android:textSize="10sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -121,6 +129,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/idContraintLayout">
 
+        <View
+            android:id="@+id/rectangleView3"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:background="@drawable/rectangle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/textView9"
             android:layout_width="wrap_content"
@@ -150,12 +166,12 @@
         <Button
             android:id="@+id/pwButton"
             style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginTop="8dp"
+            android:layout_width="64dp"
+            android:layout_height="32dp"
             android:text="Edit"
+            android:textAlignment="viewEnd"
+            android:textAllCaps="false"
+            android:textColor="@color/colorPrimary"
             android:textSize="10sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/android/app/src/main/res/layout/activity_success.xml b/android/app/src/main/res/layout/activity_success.xml
@@ -49,18 +49,26 @@
 
 <android.support.constraint.ConstraintLayout
     android:id="@+id/constraintLayout2"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginStart="16dp"
+    android:layout_marginEnd="45dp"
+    android:layout_marginStart="45dp"
     android:layout_marginTop="8dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintVertical_bias="0.6">
 
+    <View
+        android:id="@+id/rectangleView"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/rectangle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/successTextView"
         android:layout_width="wrap_content"
@@ -70,9 +78,10 @@
         android:text="TextView"
         android:textColor="@color/colorBlack"
         android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintLeft_toLeftOf="@id/rectangleView"
+        app:layout_constraintRight_toRightOf="@id/rectangleView"
+        app:layout_constraintTop_toTopOf="@id/rectangleView"
+        app:layout_constraintBottom_toBottomOf="@id/rectangleView" />
 
     <TextView
         android:id="@+id/textView5"
@@ -86,6 +95,6 @@
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/successTextView" />
+        app:layout_constraintTop_toBottomOf="@+id/rectangleView" />
 </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>