Merge pull request #166 from UdacityAndroidDevScholarship/fix-signIn_ui

SignIn UI Fix
UdacityAndroidDevScholarship · May 20, 2018 · 0631eea · 0631eea
2 parents 0dd50c8 + c9cbfe7
commit 0631eea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="@dimen/box_regular"
         android:contentDescription="@string/app_name"
         android:src="@mipmap/signin_logo" />
 
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/sigin_image_logo"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/margin_x_large"
         android:fontFamily="@font/roboto_medium"
         android:text="@string/sigin_text_almost_there"
         android:textColor="#90ffffff" />
@@ -40,10 +40,10 @@
         android:id="@+id/google_signin_btn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/signin_text_almost_there"
-        android:layout_marginEnd="32sp"
-        android:layout_marginStart="32sp"
-        android:layout_marginTop="100dp">
+        android:layout_marginEnd="@dimen/margin_x_large"
+        android:layout_marginStart="@dimen/margin_x_large"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/margin_x_large">
 
     </com.google.android.gms.common.SignInButton>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -69,6 +69,7 @@
     <dimen name="notification_description_margin_bottom">8dp</dimen>
     <dimen name="notification_description_margin_top">4dp</dimen>
     <dimen name="notification_description_margin_end">8dp</dimen>
+
     <!-- Notification Detail Activity dimesions-->
     <dimen name="notification_detail_name_text_size">16sp</dimen>
     <dimen name="notification_detail_description_text_size">15sp</dimen>
@@ -128,7 +129,7 @@
     <dimen name="margin_medium">8dp</dimen>
     <dimen name="margin_small">4dp</dimen>
 
-    //Nav Dimens
+    <!--Nav Dimens-->
     <dimen name="pad_main">15dp</dimen>
     <dimen name="pad_b_main">10dp</dimen>
     <dimen name="img_view_main">50dp</dimen>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="deadline">Deadline:</string>
 
     <!--Sign In page text-->
-    <string name="sigin_text_almost_there">Almost there, Sign In to continue</string>
+    <string name="sigin_text_almost_there">For Scholars, By Scholars</string>
 
 
     <!-- Error message when there is no internet connectivity [CHAR LIMIT=NONE] -->