diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 288b36b1efb71c411d5c27a1ea6c08e41a7fed46..94a25f7f4cb416c083d265558da75d457237d671 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt b/app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt
index 9d325656abb8aa37fa783d5a5ccaeaff6aa4e3ac..688f998967c1d3c44843daa4561c91346b5a61a3 100644
--- a/app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt
@@ -1,31 +1,15 @@
package com.example.bondoman.fragments
import android.os.Bundle
+import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import androidx.fragment.app.Fragment
import com.example.bondoman.R
-/**
- * A simple [Fragment] subclass.
- * Use the [SettingsFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
class SettingsFragment : Fragment() {
- // TODO: Rename and change types of parameters
- private var param1: String? = null
- private var param2: String? = null
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- arguments?.let {
- param1 = it.getString(ARG_PARAM1)
- param2 = it.getString(ARG_PARAM2)
- }
}
override fun onCreateView(
@@ -35,24 +19,4 @@ class SettingsFragment : Fragment() {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_settings, container, false)
}
-
- companion object {
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment settingsFragment.
- */
- // TODO: Rename and change types and number of parameters
- @JvmStatic
- fun newInstance(param1: String, param2: String) =
- SettingsFragment().apply {
- arguments = Bundle().apply {
- putString(ARG_PARAM1, param1)
- putString(ARG_PARAM2, param2)
- }
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_download.png b/app/src/main/res/drawable-hdpi/ic_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0c18f442643b6a172fa34c707cf62acccb367e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_download.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_logout.png b/app/src/main/res/drawable-hdpi/ic_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec7a736041c67e5d0569f8b1014d6003ee8d8030
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_logout.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_send.png b/app/src/main/res/drawable-hdpi/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..48e617891b2ee855c51dfe474248b0675a306295
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_send.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_download.png b/app/src/main/res/drawable-mdpi/ic_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6fb67a55f8b79f9bdbf2a7c139f2f345e19be35
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_download.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_logout.png b/app/src/main/res/drawable-mdpi/ic_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..b180755b82ff9a1b1b20e550b5d03be0ddeb5f19
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_logout.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_send.png b/app/src/main/res/drawable-mdpi/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..3df29f81db5283a50f7a37aae19e687867aeda11
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_send.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_download.png b/app/src/main/res/drawable-xhdpi/ic_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8c245725464224262266f7cb337007bdd701334
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_download.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_logout.png b/app/src/main/res/drawable-xhdpi/ic_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..553d32c2e8a72bc58ebafa1f2f93449ff9a65c84
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_logout.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_send.png b/app/src/main/res/drawable-xhdpi/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee58c27a32ca1d5135c8686ea6386a5bd2626592
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_send.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_download.png b/app/src/main/res/drawable-xxhdpi/ic_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..3731a6688e553c504705ee84c31a160a2543bbef
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_download.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_logout.png b/app/src/main/res/drawable-xxhdpi/ic_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..579276ac0f0ac7882b64b35f5c82e5ba32c8b486
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_logout.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send.png b/app/src/main/res/drawable-xxhdpi/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..bafaa51a2d8d97210de0c0b137d9b4caa415fa32
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_send.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_download.png b/app/src/main/res/drawable-xxxhdpi/ic_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..352cd3df217a28027d98edbe5f92492f72ff2bb3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_download.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_logout.png b/app/src/main/res/drawable-xxxhdpi/ic_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..962bed8367a66d9c89df2b22a576d71d767bc0b1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_logout.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_send.png b/app/src/main/res/drawable-xxxhdpi/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..11224ff49252fe3a9d1b3ebf6665b147957211f1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_send.png differ
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..835b7e8aa685a3ad9ec3b9649fd8f932592c30bb
--- /dev/null
+++ b/app/src/main/res/drawable/button_background.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="@color/primary_color" />
+ <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_donwload.png b/app/src/main/res/drawable/icon_donwload.png
new file mode 100644
index 0000000000000000000000000000000000000000..54dcac15cdca91ff284d280868da3c98ba10508c
Binary files /dev/null and b/app/src/main/res/drawable/icon_donwload.png differ
diff --git a/app/src/main/res/drawable/icon_logout.png b/app/src/main/res/drawable/icon_logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8001ae77d4ddf9780dc19220ab6b4d8951e251d
Binary files /dev/null and b/app/src/main/res/drawable/icon_logout.png differ
diff --git a/app/src/main/res/drawable/icon_send.png b/app/src/main/res/drawable/icon_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dfd040ddf783fc5cc6f6b9c3192611aa2a105e3
Binary files /dev/null and b/app/src/main/res/drawable/icon_send.png differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4212086565339b19f6a2e9d70a1cd91beb104183..b37ec55f99f03e321bb782c8d4299f12b8576be2 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -100,14 +100,15 @@
</LinearLayout>
<Button
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_700"
android:background="@drawable/rounded_button"
android:text="Masuk"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
-
+ android:textColor="@color/white"
+ android:paddingHorizontal="15dp"
/>
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 80569005c6ed4a36f8597b13702383783737800a..c11396b82e95e237c4b880adf0ea18563b6ec123 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/bg_color"
tools:context=".activities.MainActivity">
<fragment
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 7a51b15e37a8c031f60589f23ddc709b9a4af4ee..16b57800378460babb7891fb7b9ee9bc415bfd1f 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,15 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/bg_color"
tools:context=".fragments.SettingsFragment">
- <!-- TODO: Update blank fragment layout -->
- <TextView
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/brown_1"
- android:text="@string/hello_blank_fragment" />
+ android:layout_height="match_parent">
+ <LinearLayout
+ android:layout_width="329dp"
+ android:layout_height="452dp"
+ android:orientation="vertical"
+ android:background="@color/bg_color"
+ 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.175">
+
+ <Button
+ android:id="@+id/save_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:background="@drawable/button_background"
+ android:drawableStart="@drawable/ic_download"
+ android:drawablePadding="16dp"
+ android:elevation="24dp"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="16dp"
+ android:text="@string/save_button_text"
+ android:textAlignment="viewStart"
+ android:textAllCaps="false"
+ android:textSize="17sp"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/send_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:background="@drawable/button_background"
+ android:drawableStart="@drawable/ic_send"
+ android:drawablePadding="16dp"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="16dp"
+ android:text="@string/send_button_text"
+ android:textAlignment="viewStart"
+ android:textAllCaps="false"
+ android:textSize="17sp"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/logout_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:background="@drawable/button_background"
+ android:drawableStart="@drawable/ic_logout"
+ android:drawablePadding="16dp"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="16dp"
+ android:text="@string/logout_button_text"
+ android:textAlignment="viewStart"
+ android:textAllCaps="false"
+ android:textSize="17sp"
+ android:textStyle="bold" />
+
+ </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e6ac590a694046c8b85697fb5fbcaa36a078e74e..d423a8398912e64ebd8c71f2ada29a5d8cb03812 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
- <style name="Theme.BondoMan" parent="Theme.MaterialComponents.DayNight.NoActionBar">
- <!-- Primary brand color. -->
- <item name="colorPrimary">@color/purple_200</item>
- <item name="colorPrimaryVariant">@color/purple_700</item>
- <item name="colorOnPrimary">@color/black</item>
- <!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_200</item>
- <item name="colorOnSecondary">@color/black</item>
- <!-- Status bar color. -->
- <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
- <!-- Customize your theme here. -->
+ <style name="Theme.BondoMan" parent="Theme.AppCompat.Light.NoActionBar">
</style>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2271c5faecdff17b33e54554b6302046a3b60b17..03a2e2838115a1a2fd08d4a36fc55c9c8f5187bd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <color name="bg_color">#FFFFFF</color>
+ <color name="primary_color">#F1E4C3</color>
+ <color name="secondary_color">#597E52</color>
+ <color name="text_color">#000000</color>
+<!-- <color name="white">#FFFFFF</color>-->
+ <color name="shadow_color">#D9D9D9</color>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e3616242a15e5fa35bae2fe69c315a09fd8c594..09fa37af8f80e5576f5abc07f077580f26df4c4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,7 @@
<string name="app_name">BondoMan</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
+ <string name="save_button_text">Simpan daftar transaksi</string>
+ <string name="send_button_text">Kirim daftar transaksi</string>
+ <string name="logout_button_text">Keluar</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6430f18432ca3edff0705246bc5c8490935b1858..d423a8398912e64ebd8c71f2ada29a5d8cb03812 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,17 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
- <style name="Theme.BondoMan" parent="Theme.MaterialComponents.DayNight.NoActionBar">
- <!-- Primary brand color. -->
- <item name="colorPrimary">@color/white</item>
- <item name="colorPrimaryVariant">@color/black</item>
- <item name="colorOnPrimary">@color/black</item>
- <!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_700</item>
- <item name="colorOnSecondary">@color/black</item>
- <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
- <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Light</item>
-
- <!-- Customize your theme here. -->
+ <style name="Theme.BondoMan" parent="Theme.AppCompat.Light.NoActionBar">
</style>
</resources>
\ No newline at end of file