diff --git a/app/src/main/res/drawable/add.png b/app/src/main/res/drawable/add.png index c7780e20973b12e26193c70a9c23e5dbeb23e48c..e092bf6fc10a596be60f56fd58dff4dfe34c4a7e 100644 Binary files a/app/src/main/res/drawable/add.png and b/app/src/main/res/drawable/add.png differ diff --git a/app/src/main/res/drawable/ic_twibbon.png b/app/src/main/res/drawable/ic_twibbon.png new file mode 100644 index 0000000000000000000000000000000000000000..46db1b5da47fb71ab6ede62b2be3c90a043d8fbd Binary files /dev/null and b/app/src/main/res/drawable/ic_twibbon.png differ diff --git a/app/src/main/res/drawable/ic_upload_img.png b/app/src/main/res/drawable/ic_upload_img.png new file mode 100644 index 0000000000000000000000000000000000000000..eebbe9a33e1b22f67aefaaa2ed9d787b439f9d76 Binary files /dev/null and b/app/src/main/res/drawable/ic_upload_img.png differ diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml index 8ea63064beb53c6c5d8cf12875746edbe74161da..6d7aa96650bb19bed2c1a5b986b1a7070669a0c7 100644 --- a/app/src/main/res/layout/fragment_scan.xml +++ b/app/src/main/res/layout/fragment_scan.xml @@ -45,31 +45,35 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="5dp" + android:layout_marginTop="-105dp" android:gravity="center" android:orientation="horizontal"> <Button android:id="@+id/btn_upload" - android:layout_width="wrap_content" + android:layout_width="135dp" android:layout_height="wrap_content" - android:layout_marginEnd="10dp" - android:text="@string/upload_file" /> + android:layout_marginEnd="30dp" + android:text="@string/upload_file" + android:textColor="#1E232C" + android:background="@color/primary3"/> <Button android:id="@+id/btn_filter" - android:layout_width="wrap_content" + android:layout_width="135dp" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:text="@string/use_filter" /> + android:text="@string/use_filter" + android:textColor="#1E232C" + android:background="@color/primary3"/> </LinearLayout> <TextView android:id="@+id/tv_result" android:layout_width="match_parent" - android:layout_height="40dp" - android:layout_marginTop="1dp" + android:layout_height="0dp" + android:layout_marginTop="0dp" android:text="..." android:textAlignment="center" android:textColor="#A92B" diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml index 7a779ece859eef4d4a9a9cafe145d40fb3055328..ea77c5cd5105f84fd77d87e7102f101aea1e6c05 100644 --- a/app/src/main/res/layout/fragment_transaction.xml +++ b/app/src/main/res/layout/fragment_transaction.xml @@ -46,6 +46,7 @@ android:layout_margin="16dp" android:contentDescription="@string/add" android:src="@drawable/add" + android:backgroundTint="@color/primary1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" />