diff --git a/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDetailFragment.kt b/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDetailFragment.kt index c6fc790375b7510d5839679df3967e15815ccc36..8dae7d0244890ff2f16c9a40dd2fb33852df3a41 100644 --- a/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDetailFragment.kt +++ b/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionDetailFragment.kt @@ -50,11 +50,6 @@ class TransactionDetailFragment : Fragment(), OnMapReadyCallback { if (transaction != null) { displayTransactionDetails(transaction) - - binding.btnBack.setOnClickListener { - findNavController().popBackStack() - } - binding.btnDelete.setOnClickListener { transaction?.let { deleteTransaction(it) } } diff --git a/app/src/main/res/drawable/baseline_edit_square_24.xml b/app/src/main/res/drawable/baseline_edit_square_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..d084bf24e95f3514e2fd9629dc16ccbe5ff58de0 --- /dev/null +++ b/app/src/main/res/drawable/baseline_edit_square_24.xml @@ -0,0 +1,7 @@ +<vector android:height="24dp" android:tint="#B29F7A" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M7,17V9.93L13.93,3l0,0H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-8.93L14.07,17H7z"/> + <path android:fillColor="@android:color/white" android:pathData="M9,15l4.24,0l7.2,-7.2l-4.24,-4.24l-7.2,7.2z"/> + <path android:fillColor="@android:color/white" android:pathData="M22.91,2.49l-1.41,-1.41c-0.78,-0.78 -2.05,-0.78 -2.83,0l-1.06,1.06l4.24,4.24l1.06,-1.06C23.7,4.54 23.7,3.27 22.91,2.49z"/> +</vector> diff --git a/app/src/main/res/layout/fragment_transaction_detail.xml b/app/src/main/res/layout/fragment_transaction_detail.xml index 0ba68d8cdf7f0565674dd838413e1b87674f0f5c..8c6628a1dcabbbe9ca9e9fc7f6b925f610a4d694 100644 --- a/app/src/main/res/layout/fragment_transaction_detail.xml +++ b/app/src/main/res/layout/fragment_transaction_detail.xml @@ -13,6 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingHorizontal="16dp" + android:paddingTop="10dp" android:paddingBottom="30dp" > @@ -135,15 +136,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/textViewLocation" /> - <Button - android:id="@+id/btnBack" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:elevation="2dp" - android:text="Back" - android:textColor="@android:color/black" - tools:layout_editor_absoluteX="16dp" - tools:layout_editor_absoluteY="16dp" /> <Button android:id="@+id/btnDelete" @@ -151,9 +143,10 @@ android:layout_height="wrap_content" android:elevation="2dp" android:text="Delete" - android:textColor="@android:color/black" - tools:layout_editor_absoluteX="171dp" - tools:layout_editor_absoluteY="16dp" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintRight_toRightOf="parent" + + /> <Button android:id="@+id/btnEdit" @@ -163,9 +156,11 @@ android:layout_alignParentBottom="true" android:elevation="2dp" android:text="Edit" - android:textColor="@android:color/black" - tools:layout_editor_absoluteX="293dp" - tools:layout_editor_absoluteY="16dp" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + + android:drawableEnd="@drawable/baseline_edit_square_24" + /> <fragment android:id="@+id/mapFragment"