Merge branch 'development' into fix-notification_click_discussion

UdacityAndroidDevScholarship · May 20, 2018 · 336bc4c · 336bc4c
2 parents 2f1262b + 0631eea
commit 336bc4c
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/res/drawable-hdpi/signin_logo.png b/app/src/main/res/drawable-hdpi/signin_logo.png
diff --git a/app/src/main/res/drawable-mdpi/signin_logo.png b/app/src/main/res/drawable-mdpi/signin_logo.png
diff --git a/app/src/main/res/drawable-xhdpi/signin_logo.png b/app/src/main/res/drawable-xhdpi/signin_logo.png
diff --git a/app/src/main/res/drawable-xxhdpi/app_logog.png b/app/src/main/res/drawable-xxhdpi/app_logog.png
diff --git a/app/src/main/res/drawable-xxhdpi/signin_logo.png b/app/src/main/res/drawable-xxhdpi/signin_logo.png
diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/signin_pic.png b/app/src/main/res/drawable/signin_pic.png
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" />
 
@@ -32,7 +32,7 @@
         android:layout_above="@+id/google_signin_btn"
         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" />

diff --git a/app/src/main/res/mipmap-hdpi/signin_logo.png b/app/src/main/res/mipmap-hdpi/signin_logo.png
diff --git a/app/src/main/res/mipmap-mdpi/signin_logo.png b/app/src/main/res/mipmap-mdpi/signin_logo.png
diff --git a/app/src/main/res/mipmap-xhdpi/signin_logo.png b/app/src/main/res/mipmap-xhdpi/signin_logo.png
diff --git a/app/src/main/res/mipmap-xxhdpi/signin_logo.png b/app/src/main/res/mipmap-xxhdpi/signin_logo.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/signin_logo.png b/app/src/main/res/mipmap-xxxhdpi/signin_logo.png
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/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
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] -->