diff --git a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt index e09ec1f9ad1c6eb42017da0fe494eb3e616abc74..73f7443100d0db74b380e1920423822e34ea456b 100644 --- a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt +++ b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt @@ -57,8 +57,6 @@ class LoginActivity : AppCompatActivity() { cardLogin.visibility = CardView.VISIBLE }, 1000) - - val securePreferences = SecurePreferences(this) loginRepository = AuthRepository(securePreferences) if(securePreferences.getToken() != null){ diff --git a/app/src/main/res/layout/activity_add_transaksi.xml b/app/src/main/res/layout/activity_add_transaksi.xml index c609127d78578b71d585cae6904768f93cac3b4f..730a173cf2e35217c373b5e05c33e57e9cc45478 100644 --- a/app/src/main/res/layout/activity_add_transaksi.xml +++ b/app/src/main/res/layout/activity_add_transaksi.xml @@ -56,12 +56,13 @@ <EditText android:id="@+id/editTextTitle" android:layout_width="match_parent" + android:minHeight="50dp" android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:paddingVertical="6dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" - android:hint="Title" /> + android:hint="New Title" /> <TextView android:id="@+id/textViewAmountLabel" @@ -70,18 +71,19 @@ android:text="Amount" android:layout_marginBottom="8dp" android:layout_alignParentTop="true" - android:layout_alignParentStart="true" /> + android:layout_alignParentStart="true" + /> <EditText android:id="@+id/editTextAmount" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/edittext_enabled" + android:minHeight="50dp" + android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:inputType="numberDecimal" android:paddingVertical="6dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" - android:hint="Amount" /> + android:hint="New Amount" /> <TextView android:id="@+id/textViewLocationLabel" @@ -95,12 +97,12 @@ <EditText android:id="@+id/editTextLocation" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/edittext_enabled" + android:minHeight="50dp" + android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:paddingVertical="6dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" - android:hint="Location" /> + android:hint="New Location" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_edit_transaksi.xml b/app/src/main/res/layout/activity_edit_transaksi.xml index 717af90fea4a0ebd04ecc046750dbeef1e2bbd87..c4d342ec6a48a4228f6a869fefbad2ed5b017a36 100644 --- a/app/src/main/res/layout/activity_edit_transaksi.xml +++ b/app/src/main/res/layout/activity_edit_transaksi.xml @@ -29,10 +29,13 @@ android:layout_height="wrap_content" android:inputType="none" android:background="@drawable/edittext_disabled" - android:paddingVertical="6dp" + android:paddingVertical="15dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" - android:hint="Select Date" /> + android:hint="Select Date" + android:textColor="@color/black" + android:textColorHint="@color/black" + /> <TextView android:id="@+id/textViewTypeLabel" @@ -46,13 +49,15 @@ <TextView android:id="@+id/editTextType" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="none" + android:layout_height="wrap_content" android:inputType="none" android:background="@drawable/edittext_disabled" - android:paddingVertical="6dp" + android:paddingVertical="15dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" - android:hint="Income" /> + android:hint="Income" + android:textColor="@color/black" + android:textColorHint="@color/black" + /> <TextView android:id="@+id/textViewTitleLabel" @@ -66,8 +71,8 @@ <EditText android:id="@+id/editTextTitle" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/edittext_enabled" + android:minHeight="50dp" + android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:paddingVertical="6dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" @@ -85,8 +90,8 @@ <EditText android:id="@+id/editTextAmount" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/edittext_enabled" + android:minHeight="50dp" + android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:inputType="numberDecimal" android:paddingVertical="6dp" android:paddingHorizontal="12dp" @@ -105,8 +110,8 @@ <EditText android:id="@+id/editTextLocation" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/edittext_enabled" + android:minHeight="50dp" + android:layout_height="wrap_content" android:background="@drawable/edittext_enabled" android:paddingVertical="6dp" android:paddingHorizontal="12dp" android:layout_marginBottom="8dp" @@ -121,7 +126,9 @@ android:layout_alignParentTop="true" android:layout_alignParentStart="true" android:textStyle="italic" - android:layout_gravity="right"/> + android:layout_gravity="right" + android:paddingVertical="15dp" + /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 38b1d48794ae75ba6aca6ae18494660b78b0429b..f432bdb41d72341ec714f91a8174c97efda359ae 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -15,7 +15,8 @@ <LinearLayout android:id="@+id/settings_linear_layout" - android:layout_width="329dp" + android:maxWidth="340dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:background="@color/bg_color"