diff --git a/app/src/main/res/drawable/broadcast_btn.png b/app/src/main/res/drawable/broadcast_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..b770d48e0354eb3c89fa11bbc30e95dcb04c9c9a Binary files /dev/null and b/app/src/main/res/drawable/broadcast_btn.png differ diff --git a/app/src/main/res/drawable/download_history.png b/app/src/main/res/drawable/download_history.png index 599dd4c208fde7f3524d2d82ba4bb1c7cda67bf2..3ded8b1857e9f3ab7621ca2b8f67b6778021e10f 100644 Binary files a/app/src/main/res/drawable/download_history.png and b/app/src/main/res/drawable/download_history.png differ diff --git a/app/src/main/res/drawable/keluar.png b/app/src/main/res/drawable/keluar.png index ca6f21a02ccd3047b6580dee442c7600cc150e3d..12e610b1033784aa8691762129b3535d1b3be48b 100644 Binary files a/app/src/main/res/drawable/keluar.png and b/app/src/main/res/drawable/keluar.png differ diff --git a/app/src/main/res/drawable/upload_history.png b/app/src/main/res/drawable/upload_history.png index 494675e8acd0acee9779e99cc75387b067c25c2a..08790f3393f3679a68d14e26b9cf751ae77dd1c6 100644 Binary files a/app/src/main/res/drawable/upload_history.png and b/app/src/main/res/drawable/upload_history.png differ diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 46c35f036ec8f263076cdf881f8597af1d970c6b..8997720adae18def7f93bd55257e87abbcc3dfc9 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -27,25 +27,27 @@ app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> - <ImageView - android:layout_marginTop="60dp" - android:src="@drawable/logo" - android:contentDescription="@string/logo" - android:layout_width="100dp" - android:layout_height="100dp" - /> - - - <TextView - android:layout_marginTop="20dp" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/how_would_you_like_to_do" - android:textSize="30sp" - android:fontFamily="@font/montserrat" - android:textStyle="bold" - android:textColor="@color/white" - /> + android:orientation="horizontal"> + <ImageView + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_marginTop="60dp" + android:contentDescription="@string/logo" + android:src="@drawable/logo" /> + <TextView + android:layout_width="252dp" + android:layout_height="wrap_content" + android:layout_marginTop="70dp" + android:layout_marginStart="20dp" + android:fontFamily="@font/montserrat" + android:text="@string/how_would_you_like_to_do" + android:textColor="@color/white" + android:textSize="30sp" + android:textStyle="bold" /> + </LinearLayout> <LinearLayout android:layout_marginVertical="20dp" @@ -53,16 +55,30 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center"> + <ImageButton + android:id="@+id/btn_broadcast" + android:layout_width="match_parent" + android:layout_height="88dp" + android:background="@drawable/broadcast_btn" + android:text="@string/randomize_transaction"/> + </LinearLayout> + + <LinearLayout + android:layout_marginVertical="10dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center"> <ImageButton android:id="@+id/btn_settings" android:layout_width="match_parent" android:layout_height="88dp" android:background="@drawable/download_history" - android:text="Settings"/> + android:text="@string/download_history"/> </LinearLayout> <LinearLayout - android:layout_marginVertical="20dp" + android:layout_marginVertical="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -72,11 +88,11 @@ android:layout_width="match_parent" android:layout_height="88dp" android:background="@drawable/upload_history" - android:text="Settings"/> + android:text="@string/upload_history"/> </LinearLayout> <LinearLayout - android:layout_marginVertical="20dp" + android:layout_marginVertical="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -86,7 +102,7 @@ android:layout_width="match_parent" android:layout_height="88dp" android:background="@drawable/keluar" - android:text="Settings"/> + android:text="@string/logout_text"/> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1a0d697d15a9c369fdd778755537461439d8cd9..5611bc8e87fed9197992dfe7d780abacd1b847b8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,4 +58,8 @@ <!-- Settings--> <string name="setting_header">Setting</string> + <string name="randomize_transaction">Randomize Transaction</string> + <string name="download_history">Download History</string> + <string name="upload_history">Upload History</string> + <string name="logout_text">Log-Out</string> </resources>