From 97ac15c464b64b678124894a9406e896a1ff64e4 Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Sun, 16 Jun 2019 15:48:14 +0200
Subject: [PATCH] up

---
 .idea/caches/build_file_checksums.ser         | Bin 541 -> 541 bytes
 app/build.gradle                              |   2 +-
 app/src/main/res/layout/activity_homepage.xml |  20 ++++++++++--------
 app/src/main/res/layout/activity_login.xml    |   6 ++++--
 .../main/res/layout/activity_search_user.xml  |   2 ++
 app/src/main/res/layout/activity_signup.xml   |   2 ++
 .../main/res/layout/activity_user_account.xml |   4 ++++
 app/src/main/res/values/colors.xml            |   4 ++--
 app/src/main/res/values/styles.xml            |   3 +++
 9 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f4603f3f91cb5eabf73776b1d0cab48c26d743c0..172c202ae90b69170f4c18c2814136b63da8c5ad 100644
GIT binary patch
delta 35
tcmV+;0Nnqb1f2wsm;_(aC=`*LcMw3n*Z`L{MRsRWnuxlDvE-8@0s8&S4^037

delta 35
tcmV+;0Nnqb1f2wsm;_X<<TR0-cM$U;b3%w_8%H|Isym*4`XiGg0s0BP4=Mlv

diff --git a/app/build.gradle b/app/build.gradle
index dc77a72..99c5ee4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     defaultConfig {
         applicationId 'com.monnethic.appmobile'
         multiDexEnabled true
-        minSdkVersion 22
+        minSdkVersion 21
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/res/layout/activity_homepage.xml b/app/src/main/res/layout/activity_homepage.xml
index 20845b1..46f60ca 100644
--- a/app/src/main/res/layout/activity_homepage.xml
+++ b/app/src/main/res/layout/activity_homepage.xml
@@ -11,30 +11,32 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center"
-        android:layout_marginTop="75dp"
-        android:text="Welcome on Monnethic !"
-        android:textSize="16sp"
-        android:textStyle="bold"/>
+        android:layout_marginTop="120dp"
+        android:fontFamily="sans-serif-smallcaps"
+        android:text="WELCOME ON"
+        android:textColor="@color/colorPrimaryDark"
+        android:textSize="18sp"
+        android:textStyle="bold" />
 
     <Button
         android:id="@+id/register"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/login"
+        android:layout_below="@+id/imageView"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center"
-        android:layout_marginBottom="16dp"
+        android:layout_marginTop="80dp"
         android:text="Register" />
 
     <Button
         android:id="@+id/login"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/register"
         android:layout_alignStart="@+id/register"
-        android:layout_alignParentBottom="true"
         android:layout_gravity="center"
         android:layout_marginStart="-1dp"
-        android:layout_marginBottom="99dp"
+        android:layout_marginTop="30dp"
         android:text="LOGIN" />
 
     <ImageView
@@ -43,7 +45,7 @@
         android:layout_height="210dp"
         android:layout_below="@+id/welcomeText"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="51dp"
+        android:layout_marginTop="5dp"
         android:onClick="displayConf"
         app:srcCompat="@drawable/newlogo" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index fa87a77..aaeaa91 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -53,10 +53,12 @@
                 android:id="@+id/textView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-smallcaps"
+                android:text="LOGIN"
                 android:textAlignment="center"
+                android:textColor="@color/colorPrimaryDark"
                 android:textSize="18sp"
-                android:textStyle="bold"
-                android:text="LOGIN" />
+                android:textStyle="bold" />
 
             <EditText
                 android:id="@+id/editTextEmail"
diff --git a/app/src/main/res/layout/activity_search_user.xml b/app/src/main/res/layout/activity_search_user.xml
index ef4488c..9dc08d0 100644
--- a/app/src/main/res/layout/activity_search_user.xml
+++ b/app/src/main/res/layout/activity_search_user.xml
@@ -52,8 +52,10 @@
                 android:id="@+id/textView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-smallcaps"
                 android:text="SEARCH"
                 android:textAlignment="center"
+                android:textColor="@color/colorPrimaryDark"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index dece01f..4ea7611 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -53,8 +53,10 @@
                 android:id="@+id/textView9"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-smallcaps"
                 android:text="REGISTER"
                 android:textAlignment="center"
+                android:textColor="@color/colorPrimaryDark"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/activity_user_account.xml b/app/src/main/res/layout/activity_user_account.xml
index 2b329b1..51741f8 100644
--- a/app/src/main/res/layout/activity_user_account.xml
+++ b/app/src/main/res/layout/activity_user_account.xml
@@ -63,7 +63,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:fontFamily="sans-serif-smallcaps"
                 android:text="WALLET"
+                android:textColor="@color/colorPrimaryDark"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -90,7 +92,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:fontFamily="sans-serif-smallcaps"
                 android:text="BALANCE"
+                android:textColor="@color/colorPrimaryDark"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f0f8138..bc2f27a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorPrimary">#3f51b5</color>
+    <color name="colorPrimaryDark">#0579b8</color>
     <color name="colorAccent">#FF4081</color>
     <color name="darker_gray">#aaa</color>
     <color name="gray_transparent">#D2616161</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f8fe0dc..40534fd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlNormal">#c5c5c5</item>
+        <item name="colorControlActivated">@color/colorPrimaryDark</item>
+        <item name="colorControlHighlight">@color/colorPrimaryDark</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Light" />