diff --git a/app/src/main/java/pbd/tubes/exe_android/MainActivity.kt b/app/src/main/java/pbd/tubes/exe_android/MainActivity.kt index f6aaa2cbd5c9ed7742969231765c178986a515d6..461fdf85dafc65d5797bf5e96f886f71f0ad9d2e 100644 --- a/app/src/main/java/pbd/tubes/exe_android/MainActivity.kt +++ b/app/src/main/java/pbd/tubes/exe_android/MainActivity.kt @@ -54,14 +54,6 @@ class MainActivity : AppCompatActivity() { navController.navigate(R.id.navigation_add_transaction) } } -// private fun fabShow(){ -// binding.addFab.show() -// binding.mainFabText.visibility = View.VISIBLE -// } -// private fun fabHide(){ -// binding.addFab.hide() -// binding.mainFabText.visibility = View.GONE -// } private fun isUserLoggedIn(): Boolean { val sharedPreferences = getSharedPreferences("user_session", MODE_PRIVATE) return sharedPreferences.contains("token") diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 71cbbf3ad575f04f6d1e3a57dec944f25539508b..c1a502cd24001ad452010b8205e553d41e13c5ab 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -2,7 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center"> + xmlns:tools="http://schemas.android.com/tools" + android:gravity="center" + tools:ignore="HardcodedText"> <TextView android:id="@+id/loginTextView" @@ -15,21 +17,35 @@ <EditText android:id="@+id/emailEditText" - android:layout_width="match_parent" + android:layout_centerHorizontal="true" + android:minWidth="300dp" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/loginTextView" + android:layout_margin="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:hint="Email" android:inputType="textEmailAddress" - android:layout_margin="16dp"/> + android:minHeight="48dp" + /> <EditText android:id="@+id/passwordEditText" - android:layout_width="match_parent" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" + android:layout_width="wrap_content" + android:minWidth="300dp" android:layout_height="wrap_content" + android:layout_below="@id/emailEditText" + android:layout_margin="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:hint="Password" android:inputType="textPassword" - android:layout_below="@id/emailEditText" - android:layout_margin="16dp"/> + android:minHeight="48dp" + android:layout_centerHorizontal="true" + /> <Button android:id="@+id/loginButton" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0d0ce510d92d2b50fab7a454097eec0010e742d4..4edc659db8eb13eb3a2b04976a01e8d091f36b06 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -28,17 +28,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/nav_view" android:layout_gravity="bottom|end" - /> - <TextView - android:id="@+id/main_fab_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:text="@string/transaction_operations_fab_text" - app:layout_constraintBottom_toBottomOf="@id/add_fab" - app:layout_constraintTop_toTopOf="@id/add_fab" - app:layout_constraintEnd_toStartOf="@id/add_fab" - android:visibility="gone" + android:backgroundTint="@color/design_default_color_primary" /> <fragment diff --git a/app/src/main/res/layout/transaction_list_item.xml b/app/src/main/res/layout/transaction_list_item.xml index ec8ed96b058a3224ad5b4e96ede38a305a38b2ca..4bf99a3422e51192593ddc386415cc59778e2463 100644 --- a/app/src/main/res/layout/transaction_list_item.xml +++ b/app/src/main/res/layout/transaction_list_item.xml @@ -115,7 +115,7 @@ android:background="@color/design_default_color_error" android:src="@drawable/ic_delete_24" android:layout_weight="1" - android:contentDescription="Edit Button" + android:contentDescription="Delete" /> </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>