diff --git a/android/app/src/main/java/com/chatman/MainActivity.java b/android/app/src/main/java/com/chatman/MainActivity.java
index 23af0620fd08aafd51c091ef0e96729cb28e0a50..5c2b6adc8796346e1785ee28299f757bb4817ebe 100644
--- a/android/app/src/main/java/com/chatman/MainActivity.java
+++ b/android/app/src/main/java/com/chatman/MainActivity.java
@@ -48,7 +48,8 @@ public class MainActivity extends AppCompatActivity
if (drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
} else {
- super.onBackPressed();
+// super.onBackPressed();
+ this.moveTaskToBack(true);
}
}
diff --git a/android/app/src/main/res/drawable-v24/logo.png b/android/app/src/main/res/drawable-v24/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..be8c4c6ccaf082f84b25233151331f49c7468cd5
Binary files /dev/null and b/android/app/src/main/res/drawable-v24/logo.png differ
diff --git a/android/app/src/main/res/layout/activity_auth.xml b/android/app/src/main/res/layout/activity_auth.xml
index d09dc4d16b616ee1fa898e566bddd76ecbd3b4d4..08d9050a7ee581d3dd1200c340f7f79b927e8fd1 100644
--- a/android/app/src/main/res/layout/activity_auth.xml
+++ b/android/app/src/main/res/layout/activity_auth.xml
@@ -15,7 +15,7 @@
android:layout_marginRight="48dp"
android:orientation="vertical">
- <!-- Etsi logo and title -->
+ <!-- Logo and title -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -24,9 +24,9 @@
android:orientation="horizontal">
<ImageView
- android:layout_width="200dp"
+ android:layout_width="300dp"
android:layout_height="100dp"
- android:src="@drawable/logo_dark" />
+ android:src="@drawable/logo" />
</LinearLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 69b22338c6510250df3b43672635120dbce2fa49..a1900f3f8900d93b5e791674ce907739f7912343 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="colorPrimary">#008577</color>
- <color name="colorPrimaryDark">#00574B</color>
- <color name="colorAccent">#D81B60</color>
+ <color name="colorPrimary">#8793c8</color>
+ <color name="colorPrimaryDark">#233a63</color>
+ <color name="colorRed">#ff3a63</color>
+ <color name="colorAccent">#4bd79b</color>
+ <color name="black_overlay">#66000000</color>
+ <color name="white">#FFFFFF</color>
</resources>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 4ab4520ffa990a8cd9759d59f22dce30cf158528..5e2ce9f9791c19765ed5108dfe1dca51c9b50854 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -2,7 +2,10 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
- <dimen name="nav_header_vertical_spacing">8dp</dimen>
- <dimen name="nav_header_height">176dp</dimen>
+ <dimen name="image_dashboard_height">200dp</dimen>
+ <dimen name="image_avatar_size">48dp</dimen>
+ <dimen name="name_text_size">16sp</dimen>
+ <dimen name="dashboard_spacing">2dp</dimen>
+ <dimen name="card_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index c886316c506b0d9037655db9c2f7f2c2b4c1e342..6da7ca3ddbe36696de762d20094ec40aed0110b9 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -6,4 +6,14 @@
<string name="nav_header_subtitle">android.studio@android.com</string>
<string name="nav_header_desc">Navigation header</string>
<string name="action_settings">Settings</string>
+
+ <!--Auth Strings-->
+ <string name="name">Nama</string>
+ <string name="email">Email</string>
+ <string name="password">Password</string>
+ <string name="confirm">Konfirmasi Password</string>
+ <string name="login">Masuk</string>
+ <string name="register">Daftar</string>
+ <string name="register_word">Belum punya akun?</string>
</resources>
+
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 545b9c6d2c45df7938f8ffd5ac2d806dec36f122..1bf313c1afff0167fe21ffe8adbeab3fbd6283eb 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -17,4 +17,40 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+ <style name="auth_form_card">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_margin">4dp</item>
+ <item name="android:padding">8dp</item>
+ </style>
+
+ <style name="auth_form_input">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:padding">8dp</item>
+ <item name="android:textColor">@android:color/black</item>
+ <item name="android:textColorHint">@color/black_overlay</item>
+ <item name="android:textSize">@dimen/small_text</item>
+ </style>
+
+ <style name="auth_button">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:layout_marginTop">16dp</item>
+ <item name="android:padding">4dp</item>
+ </style>
+
+ <style name="normal_button" parent="Widget.AppCompat.Button.Colored">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:layout_marginTop">16dp</item>
+ <item name="android:padding">4dp</item>
+ <item name="colorButtonNormal">@color/colorPrimary</item>
+ <item name="android:textColor">@color/white</item>
+ </style>
+
+ <dimen name="small_text">16sp</dimen>
+
</resources>