diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8cec55bdce2e8b79f834234837b900355e2d1d6f
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/primary_bg">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/loginCard"
+ android:layout_width="350dp"
+ android:layout_height="350dp"
+ app:cardBackgroundColor="@color/login_card_bg"
+ app:cardCornerRadius="20dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.491"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.629">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="4dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent">
+
+ <TextView
+ android:id="@+id/loginTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:gravity="center_horizontal"
+ android:text="@string/login_title"
+ android:textColor="@color/white"
+ android:textSize="30sp"
+ android:visibility="visible"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/loginDescription"
+ android:layout_width="341dp"
+ android:layout_height="46dp"
+ android:layout_marginTop="15dp"
+ android:gravity="center_horizontal"
+ android:text="@string/login_description"
+ android:textColor="@color/text_secondary"
+ android:textSize="20sp"
+ android:visibility="visible"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/loginTitle" />
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView4"
+ android:layout_width="300dp"
+ android:layout_height="55dp"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="15dp"
+ app:cardBackgroundColor="@color/login_input_field"
+ app:cardCornerRadius="20dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/loginDescription">
+
+
+ <EditText
+ android:id="@+id/editTextEmailAddress"
+ android:layout_width="285dp"
+ android:layout_height="55dp"
+ android:layout_gravity="center"
+ android:autofillHints="emailAddress"
+ android:ems="10"
+ android:hint="@string/login_email_placeholder"
+ android:inputType="textEmailAddress"
+ android:textColor="@color/white"
+ android:textColorHint="@color/text_secondary" />
+
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView5"
+ android:layout_width="300dp"
+ android:layout_height="55dp"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="85dp"
+ app:cardBackgroundColor="@color/login_input_field"
+ app:cardCornerRadius="20dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/loginDescription">
+
+
+ <EditText
+ android:id="@+id/editTextPassword"
+ android:layout_width="285dp"
+ android:layout_height="55dp"
+ android:layout_gravity="center"
+ android:autofillHints="password"
+ android:ems="10"
+ android:hint="@string/login_password_placeholder"
+ android:textColor="@color/white"
+ android:inputType="textPassword"
+ android:textColorHint="@color/text_secondary" />
+
+ </androidx.cardview.widget.CardView>
+
+ <Button
+ android:id="@+id/button"
+ android:layout_width="130dp"
+ android:layout_height="55dp"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="156dp"
+ android:labelFor="@id/button"
+ android:text="@string/login_title"
+ android:textColor="@color/white"
+ android:textSize="20sp"
+ android:backgroundTint="@color/button_bg"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/loginDescription" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+ </androidx.cardview.widget.CardView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index f2c30fb6f6ed0c1150c1c9546eae3ec31f650df6..73537e63124d0ee65fe692acbf7096989604395b 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -41,11 +41,11 @@
<com.google.android.material.navigation.NavigationView
android:id="@+id/navigationView"
- android:layout_width="78dp"
+ android:layout_width="80dp"
android:layout_height="0dp"
-
+ android:orientation="vertical"
+ android:paddingTop="60dp"
android:background="@color/navbar_bg"
- app:elevation="1dp"
app:itemBackground="@color/navbar_bg"
app:itemIconTint="@color/navbar_icon"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-land/add_transaction.xml b/app/src/main/res/layout-land/add_transaction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e356f9aa79a7a8b5f75e20a4de70467429cf5dd
--- /dev/null
+++ b/app/src/main/res/layout-land/add_transaction.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_marginStart="75dp"
+ android:layout_marginTop="25dp"
+ android:layout_marginEnd="75dp"
+ android:layout_marginBottom="25dp"
+ android:background="@drawable/round_corner_input_transaction_form">
+
+ <TextView
+ android:id="@+id/addTransactionTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/new_transaction"
+ android:textSize="25sp"
+ android:textStyle="bold"
+ android:textColor="@color/primary_bg"
+ android:gravity="center"
+ android:layout_marginTop="20sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/addTransactionSubTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/insert_trans_details"
+ android:textSize="15sp"
+ android:textStyle="bold"
+ android:gravity="center"
+ android:textColor="@color/date_text"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/addTransactionTitle" />
+
+ <LinearLayout
+ android:id="@+id/topHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintTop_toBottomOf="@id/addTransactionSubTitle"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/nameInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="20sp"
+ android:autofillHints="Name Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/name"
+ android:inputType="text"
+ android:padding="11sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <RadioGroup
+ android:id="@+id/categoryInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <RadioButton
+ android:id="@+id/incomeInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.5"
+ android:background="@drawable/round_corner_input_category_income"
+ android:buttonTint="@color/white"
+ android:checked="true"
+ android:text="@string/income"
+ android:textColor="@color/white"
+ android:textSize="18sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+
+ <RadioButton
+ android:id="@+id/outcomeInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.5"
+ android:layout_marginStart="20dp"
+ android:background="@drawable/round_corner_input_category_outcome"
+ android:buttonTint="@color/white"
+ android:text="@string/outcome"
+ android:textColor="@color/white"
+ android:textSize="18sp" />
+
+ </RadioGroup>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/bottomHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintTop_toBottomOf="@id/topHorizontalLayout"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/nominalInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:autofillHints="Nominal Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="100"
+ android:hint="@string/nominal"
+ android:inputType="number"
+ android:padding="10sp"
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <LinearLayout
+ android:id="@+id/bottomRightHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_marginStart="20dp"
+ android:orientation="horizontal">
+
+ <EditText
+ android:id="@+id/locationInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="20dp"
+ android:autofillHints="Location Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/location"
+ android:inputType="text"
+ android:padding="10sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp"
+ tools:ignore="NestedWeights" />
+
+ <ImageView
+ android:id="@+id/autoFillLocationButton"
+ android:layout_width="45dp"
+ android:layout_height="45dp"
+ android:background="@drawable/ic_location"
+ android:contentDescription="@string/autofill_location_button" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/cancelButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/cancel"
+ android:textSize="18sp"
+ android:textColor="@color/white"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginStart="20dp"
+ android:background="@drawable/round_corner_button_weak"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/bottomHorizontalLayout"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+ <Button
+ android:id="@+id/addButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginEnd="20dp"
+ android:textColor="@color/white"
+ android:textSize="18sp"
+ android:text="@string/add"
+ android:background="@drawable/round_corner_button_strong"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/bottomHorizontalLayout"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_scan.xml b/app/src/main/res/layout-land/fragment_scan.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dc7f8500b1bde3d668fd6eb1ea507fee165d3c64
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_scan.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:background="@color/primary_bg"
+ android:orientation="horizontal"
+ tools:context=".fragments.scan.ScanFragment">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/scanConstraintLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.camera.view.PreviewView
+ android:id="@+id/previewView"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/scanVerticalLayout"
+ android:layout_marginTop="50dp"
+ android:layout_marginBottom="50dp"
+ android:layout_marginStart="50dp"
+ android:layout_marginEnd="50dp"
+ android:layout_gravity="center" />
+
+ <LinearLayout
+ android:id="@+id/scanVerticalLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/previewView"
+ android:layout_marginBottom="50dp"
+ android:layout_marginTop="50dp"
+ android:layout_marginEnd="50dp">
+
+ <ImageButton
+ android:id="@+id/galleryButton"
+ android:layout_width="75dp"
+ android:layout_height="75dp"
+ android:layout_gravity="top"
+ android:background="@drawable/round_corner_button_weak"
+ android:contentDescription="@string/gallery_button"
+ android:scaleType="fitCenter"
+ android:src="@android:drawable/ic_menu_gallery"
+ tools:ignore="RedundantDescriptionCheck" />
+
+ <Space
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+
+ <ImageButton
+ android:id="@+id/captureButton"
+ android:layout_width="75dp"
+ android:layout_height="75dp"
+ android:layout_gravity="bottom"
+ android:background="@drawable/round_corner_button_weak"
+ android:contentDescription="@string/capture_button"
+ android:scaleType="fitCenter"
+ android:src="@android:drawable/ic_menu_camera"
+ tools:ignore="RedundantDescriptionCheck" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_transaction.xml b/app/src/main/res/layout-land/fragment_transaction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc6bc3bedd002737478377fb00ff9b14ef61c6d3
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_transaction.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/primary_bg"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ tools:context=".fragments.transaction.TransactionFragment">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/base_bg"
+ android:paddingTop="20dp"
+ android:paddingBottom="20dp"
+ android:paddingStart="50dp"
+ android:paddingEnd="20dp">
+
+ <ImageView
+ android:id="@+id/saveTransactionsButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/button_save"
+
+ android:layout_marginStart="10dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:contentDescription="@string/save_transactions_button" />
+
+ <ImageView
+ android:id="@+id/sendTransactionsButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/button_send"
+ android:layout_marginEnd="10dp"
+
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:contentDescription="@string/send_transactions_button" />
+
+ <TextView
+ android:id="@+id/myTransaction"
+ android:layout_width="0sp"
+ android:layout_height="wrap_content"
+ android:text="@string/my_transaction"
+ android:textColor="@color/white"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:layout_marginStart="10dp"
+ android:layout_marginTop="40dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/saveTransactionsButton"
+ />
+
+ <ImageView
+ android:id="@+id/randomizeTransactionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="30dp"
+ android:layout_marginEnd="10dp"
+ android:background="@drawable/random"
+ android:contentDescription="@string/randomize_transaction_button"
+ app:layout_constraintEnd_toStartOf="@id/addTransactionButton"
+ app:layout_constraintTop_toBottomOf="@id/sendTransactionsButton" />
+
+ <ImageView
+ android:id="@+id/addTransactionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/plus"
+ android:layout_marginTop="30dp"
+ app:layout_constraintTop_toBottomOf="@id/sendTransactionsButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:contentDescription="@string/add_transaction_button"/>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/recyclerView"
+ android:layout_marginTop="20dp"
+ app:layout_constraintTop_toBottomOf="@+id/myTransaction"
+ />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginStart="28dp"
+ android:background="@drawable/round_corner_save_selection"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/saveTransactionsButton" >
+
+ <TextView
+ android:id="@+id/xlsSave"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/xls"
+ android:background="@drawable/border_save_selection"
+ android:textSize="18sp"
+ android:textColor="@color/base_bg"
+ android:paddingTop="2dp"
+ android:paddingStart="30dp"
+ android:paddingBottom="4dp"
+ android:paddingEnd="30dp"
+ android:visibility="gone"
+ />
+
+ <TextView
+ android:id="@+id/xlsxSave"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textColor="@color/base_bg"
+ android:text="@string/xlsx"
+ android:paddingBottom="3dp"
+ android:paddingStart="26dp"
+ android:paddingEnd="30dp"
+ android:visibility="gone"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginEnd="28dp"
+ android:background="@drawable/round_corner_save_selection"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/sendTransactionsButton" >
+
+ <TextView
+ android:id="@+id/xlsSend"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/xls"
+ android:background="@drawable/border_save_selection"
+ android:textSize="18sp"
+ android:textColor="@color/base_bg"
+ android:paddingTop="2dp"
+ android:paddingStart="30dp"
+ android:paddingBottom="4dp"
+ android:paddingEnd="30dp"
+ android:visibility="gone"
+ />
+
+ <TextView
+ android:id="@+id/xlsxSend"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textColor="@color/base_bg"
+ android:text="@string/xlsx"
+ android:paddingBottom="3dp"
+ android:paddingStart="26dp"
+ android:paddingEnd="30dp"
+ android:visibility="gone"
+ />
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/modify_transaction.xml b/app/src/main/res/layout-land/modify_transaction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b7326428d5e1b87e5f15d3500090ac193d96580
--- /dev/null
+++ b/app/src/main/res/layout-land/modify_transaction.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_marginStart="75dp"
+ android:layout_marginTop="25dp"
+ android:layout_marginEnd="75dp"
+ android:layout_marginBottom="25dp"
+ android:background="@drawable/round_corner_input_transaction_form">
+
+ <TextView
+ android:id="@+id/addTransactionTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/new_transaction"
+ android:textSize="25sp"
+ android:textStyle="bold"
+ android:textColor="@color/primary_bg"
+ android:gravity="center"
+ android:layout_marginTop="20sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/addTransactionSubTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/insert_trans_details"
+ android:textSize="15sp"
+ android:textStyle="bold"
+ android:gravity="center"
+ android:textColor="@color/date_text"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/addTransactionTitle" />
+
+ <LinearLayout
+ android:id="@+id/topHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintTop_toBottomOf="@id/addTransactionSubTitle"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/nameInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="20sp"
+ android:autofillHints="Name Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/name"
+ android:inputType="text"
+ android:padding="11sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <RadioGroup
+ android:id="@+id/categoryInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <RadioButton
+ android:id="@+id/incomeInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.5"
+ android:background="@drawable/round_corner_input_category_income"
+ android:buttonTint="@color/white"
+ android:checked="true"
+ android:text="@string/income"
+ android:textColor="@color/white"
+ android:textSize="18sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+
+ <RadioButton
+ android:id="@+id/outcomeInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.5"
+ android:layout_marginStart="20dp"
+ android:background="@drawable/round_corner_input_category_outcome"
+ android:buttonTint="@color/white"
+ android:text="@string/outcome"
+ android:textColor="@color/white"
+ android:textSize="18sp" />
+
+ </RadioGroup>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/bottomHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintTop_toBottomOf="@id/topHorizontalLayout"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/nominalInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:autofillHints="Nominal Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="100"
+ android:hint="@string/nominal"
+ android:inputType="number"
+ android:padding="10sp"
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <TextView
+ android:id="@+id/transactionDateDialog"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="20dp"
+ android:ems="10"
+ android:padding="10sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:background="@drawable/round_corner_input_transaction"
+ android:textSize="18sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/horizontalLayout" />
+
+ <LinearLayout
+ android:id="@+id/bottomRightHorizontalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:layout_marginStart="20dp"
+ android:orientation="horizontal">
+
+ <EditText
+ android:id="@+id/locationInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="20dp"
+ android:autofillHints="Location Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/location"
+ android:inputType="text"
+ android:padding="10sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp"
+ tools:ignore="NestedWeights" />
+
+ <ImageView
+ android:id="@+id/autoFillLocationButton"
+ android:layout_width="45dp"
+ android:layout_height="45dp"
+ android:background="@drawable/ic_location"
+ android:contentDescription="@string/autofill_location_button" />
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/cancelButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/cancel"
+ android:textSize="18sp"
+ android:textColor="@color/white"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginStart="20dp"
+ android:background="@drawable/round_corner_button_weak"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/bottomHorizontalLayout"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+ <Button
+ android:id="@+id/addButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="40dp"
+ android:layout_marginBottom="20dp"
+ android:layout_marginEnd="20dp"
+ android:textColor="@color/white"
+ android:textSize="18sp"
+ android:text="@string/add"
+ android:background="@drawable/round_corner_button_strong"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/bottomHorizontalLayout"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_transaction.xml b/app/src/main/res/layout/add_transaction.xml
index f24067587d744d282fa859f915a17f80d019a6aa..254e496d6c25eb67421041f5e0d6042b795d37e0 100644
--- a/app/src/main/res/layout/add_transaction.xml
+++ b/app/src/main/res/layout/add_transaction.xml
@@ -76,16 +76,14 @@
android:id="@+id/incomeInput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="40dp"
- android:paddingEnd="20dp"
- android:paddingStart="0dp"
+ android:layout_weight="0.5"
android:text="@string/income"
android:checked="true"
android:buttonTint="@color/white"
android:textColor="@color/white"
android:background="@drawable/round_corner_input_category_income"
android:textSize="18sp"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/outcomeInput"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nameInput" />
@@ -93,14 +91,14 @@
android:id="@+id/outcomeInput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingEnd="20dp"
- android:paddingStart="0dp"
+ android:layout_weight="0.5"
android:buttonTint="@color/white"
android:textColor="@color/white"
- android:layout_marginStart="25dp"
+ android:layout_marginStart="20dp"
android:background="@drawable/round_corner_input_category_outcome"
android:text="@string/outcome"
android:textSize="18sp" />
+
</RadioGroup>
<EditText
@@ -125,39 +123,43 @@
app:layout_constraintTop_toBottomOf="@+id/categoryInput"
android:autofillHints="Nominal Input" />
- <EditText
- android:id="@+id/locationInput"
- android:layout_width="270dp"
+ <LinearLayout
+ android:id="@+id/horizontalLayout"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="20dp"
- android:layout_marginTop="15dp"
- android:layout_marginEnd="0dp"
- android:ems="10"
- android:hint="@string/location"
- android:padding="10sp"
- android:paddingStart="20sp"
- android:paddingEnd="20sp"
- android:background="@drawable/round_corner_input_transaction"
- android:inputType="text"
- android:textSize="18sp"
- android:textColor="@color/white"
- android:textColorHint="@color/base_blur"
- app:layout_constraintEnd_toStartOf="@id/autoFillLocationButton"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/nominalInput"
- android:autofillHints="Location Input" />
-
- <ImageView
- android:id="@+id/autoFillLocationButton"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:background="@drawable/ic_location"
- android:layout_marginTop="15dp"
- android:layout_marginEnd="20dp"
+ android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/nominalInput"
- app:layout_constraintStart_toEndOf="@id/locationInput"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:contentDescription="@string/autofill_location_button"/>
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/locationInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="10dp"
+ android:autofillHints="Location Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/location"
+ android:inputType="text"
+ android:padding="10sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <ImageView
+ android:id="@+id/autoFillLocationButton"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:background="@drawable/ic_location"
+ android:contentDescription="@string/autofill_location_button" />
+ </LinearLayout>
<Button
android:id="@+id/cancelButton"
@@ -171,7 +173,7 @@
android:layout_marginStart="20dp"
android:background="@drawable/round_corner_button_weak"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/locationInput"
+ app:layout_constraintTop_toBottomOf="@+id/horizontalLayout"
app:layout_constraintBottom_toBottomOf="parent" />
<Button
@@ -186,7 +188,7 @@
android:text="@string/add"
android:background="@drawable/round_corner_button_strong"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/locationInput"
+ app:layout_constraintTop_toBottomOf="@+id/horizontalLayout"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index 3d5bb3139356fbef43e87b7008307190a98e0070..66f40a1b2aad6da3214efafa257a9c3db27de07d 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -3,32 +3,43 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primary_bg"
+ android:orientation="horizontal"
tools:context=".fragments.scan.ScanFragment">
- <LinearLayout
- android:id="@+id/scanVerticalLayout"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/scanConstraintLayout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- tools:ignore="UselessParent">
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="50dp" />
+ android:layout_height="match_parent">
<androidx.camera.view.PreviewView
android:id="@+id/previewView"
- android:layout_width="300dp"
- android:layout_height="400dp"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/scanHorizontalLayout"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="50dp"
+ android:layout_marginBottom="50dp"
+ android:layout_marginStart="50dp"
+ android:layout_marginEnd="50dp"
android:layout_gravity="center" />
<LinearLayout
android:id="@+id/scanHorizontalLayout"
- android:layout_width="300dp"
- android:layout_height="160dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="center"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ app:layout_constraintTop_toBottomOf="@id/previewView"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginBottom="50dp"
+ android:layout_marginStart="50dp"
+ android:layout_marginEnd="50dp">
<ImageButton
android:id="@+id/captureButton"
@@ -50,7 +61,7 @@
android:id="@+id/galleryButton"
android:layout_width="75dp"
android:layout_height="75dp"
- android:layout_gravity="center"
+ android:layout_gravity="end"
android:background="@drawable/round_corner_button_weak"
android:contentDescription="@string/gallery_button"
android:scaleType="fitCenter"
@@ -59,10 +70,6 @@
</LinearLayout>
- <Space
- android:layout_width="match_parent"
- android:layout_height="125dp" />
-
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml
index 5958b058e46b416ad179ff50e61af2eb36c81ef4..c39600afca809239bcef28901cdd7687e01bf3ac 100644
--- a/app/src/main/res/layout/fragment_transaction.xml
+++ b/app/src/main/res/layout/fragment_transaction.xml
@@ -54,10 +54,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
- android:layout_marginEnd="50dp"
+ android:layout_marginEnd="10dp"
android:background="@drawable/random"
android:contentDescription="@string/randomize_transaction_button"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/addTransactionButton"
app:layout_constraintTop_toBottomOf="@id/sendTransactionsButton" />
<ImageView
@@ -120,9 +120,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_marginStart="290dp"
+ android:layout_marginEnd="28dp"
android:background="@drawable/round_corner_save_selection"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/sendTransactionsButton" >
<TextView
diff --git a/app/src/main/res/layout/modify_transaction.xml b/app/src/main/res/layout/modify_transaction.xml
index b7ac88171b772f8f0a5037460e4714fed9c5fc17..e83cbb0f126668e70a076e6368aaa7f1b186ea2b 100644
--- a/app/src/main/res/layout/modify_transaction.xml
+++ b/app/src/main/res/layout/modify_transaction.xml
@@ -75,14 +75,14 @@
android:id="@+id/incomeInput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="40dp"
- android:paddingEnd="20dp"
- android:paddingStart="0dp"
+ android:layout_weight="0.5"
android:text="@string/income"
+ android:checked="true"
android:buttonTint="@color/white"
android:textColor="@color/white"
android:background="@drawable/round_corner_input_category_income"
android:textSize="18sp"
+ app:layout_constraintEnd_toStartOf="@id/outcomeInput"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nameInput" />
@@ -90,17 +90,14 @@
android:id="@+id/outcomeInput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingEnd="20dp"
- android:paddingStart="0dp"
+ android:layout_weight="0.5"
android:buttonTint="@color/white"
android:textColor="@color/white"
- android:layout_marginStart="25dp"
- android:layout_marginEnd="0dp"
+ android:layout_marginStart="20dp"
android:background="@drawable/round_corner_input_category_outcome"
android:text="@string/outcome"
- android:textSize="18sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+ android:textSize="18sp" />
+
</RadioGroup>
<EditText
@@ -125,46 +122,50 @@
app:layout_constraintTop_toBottomOf="@+id/categoryInput"
android:autofillHints="Nominal Input" />
- <EditText
- android:id="@+id/locationInput"
- android:layout_width="270dp"
+ <LinearLayout
+ android:id="@+id/horizontalLayout"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="20dp"
- android:layout_marginTop="15dp"
- android:layout_marginEnd="0dp"
- android:ems="10"
- android:hint="@string/location"
- android:padding="10sp"
- android:paddingStart="20sp"
- android:paddingEnd="20sp"
- android:background="@drawable/round_corner_input_transaction"
- android:inputType="text"
- android:textSize="18sp"
- android:textColor="@color/white"
- android:textColorHint="@color/base_blur"
- app:layout_constraintEnd_toStartOf="@id/autoFillLocationButton"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/nominalInput"
- android:autofillHints="Location Input" />
-
- <ImageView
- android:id="@+id/autoFillLocationButton"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:background="@drawable/ic_location"
- android:layout_marginTop="15dp"
- android:layout_marginEnd="20dp"
+ android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/nominalInput"
- app:layout_constraintStart_toEndOf="@id/locationInput"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:contentDescription="@string/autofill_location_button"/>
+ android:layout_marginTop="20dp"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+
+ <EditText
+ android:id="@+id/locationInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginEnd="10dp"
+ android:autofillHints="Location Input"
+ android:background="@drawable/round_corner_input_transaction"
+ android:ems="10"
+ android:hint="@string/location"
+ android:inputType="text"
+ android:padding="10sp"
+ android:paddingStart="20sp"
+ android:paddingEnd="20sp"
+ android:textColor="@color/white"
+ android:textColorHint="@color/base_blur"
+ android:textSize="18sp" />
+
+ <ImageView
+ android:id="@+id/autoFillLocationButton"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:background="@drawable/ic_location"
+ android:contentDescription="@string/autofill_location_button" />
+ </LinearLayout>
<TextView
android:id="@+id/transactionDateDialog"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:ems="10"
android:padding="10sp"
@@ -176,7 +177,7 @@
android:textColorHint="@color/base_blur"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/locationInput" />
+ app:layout_constraintTop_toBottomOf="@+id/horizontalLayout" />
<Button
android:id="@+id/deleteButton"
diff --git a/app/src/main/res/menu/bottom_navbar.xml b/app/src/main/res/menu/bottom_navbar.xml
index abadd8d6406f01b1c523ddf35f943cbe42d9b99f..538d095be0d805970514b71b2619e143c4db09c2 100644
--- a/app/src/main/res/menu/bottom_navbar.xml
+++ b/app/src/main/res/menu/bottom_navbar.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-
<item android:title="@string/navbar_transaction"
android:id="@+id/transaction"
android:icon="@drawable/ic_transaction"/>