From 96b78ec381b527253189cc7a30e7134b864b6aca Mon Sep 17 00:00:00 2001
From: goodgirlwannabe <13521006@mahasiswa.itb.ac.id>
Date: Mon, 18 Mar 2024 19:40:43 +0700
Subject: [PATCH] fix: layout
---
.../main/res/layout/activity_login_page.xml | 1 +
.../res/layout/activity_splash_screen.xml | 1 +
.../res/layout/fragment_settings_page.xml | 65 +++++++++++--------
3 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/bondoman/app/src/main/res/layout/activity_login_page.xml b/bondoman/app/src/main/res/layout/activity_login_page.xml
index 12cea6b..d770d5c 100644
--- a/bondoman/app/src/main/res/layout/activity_login_page.xml
+++ b/bondoman/app/src/main/res/layout/activity_login_page.xml
@@ -18,6 +18,7 @@
android:text="MLEBU"
android:textSize="32dp"
android:textStyle="bold"
+ android:textColor="@color/secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/bondoman/app/src/main/res/layout/activity_splash_screen.xml b/bondoman/app/src/main/res/layout/activity_splash_screen.xml
index 0ba41ed..510a214 100644
--- a/bondoman/app/src/main/res/layout/activity_splash_screen.xml
+++ b/bondoman/app/src/main/res/layout/activity_splash_screen.xml
@@ -21,6 +21,7 @@
android:layout_below="@id/logoSplashScreen"
android:layout_centerHorizontal="true"
android:fontFamily="@font/font_parisienne"
+ android:textColor="@color/secondary"
android:text="Bondoman"
android:textSize="40dp" />
</RelativeLayout>
\ No newline at end of file
diff --git a/bondoman/app/src/main/res/layout/fragment_settings_page.xml b/bondoman/app/src/main/res/layout/fragment_settings_page.xml
index bd0d728..5e766cc 100644
--- a/bondoman/app/src/main/res/layout/fragment_settings_page.xml
+++ b/bondoman/app/src/main/res/layout/fragment_settings_page.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -12,59 +13,71 @@
android:id="@+id/txt1_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
- android:layout_margin="50dp"
+ android:layout_marginTop="120dp"
android:fontFamily="@font/font_poppins"
android:text="Penatanan"
- android:textColor="@color/secondary"
android:textAllCaps="true"
+ android:textColor="@color/secondary"
android:textSize="32dp"
android:textStyle="bold"
- android:layout_centerHorizontal="true"
- />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/save_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Simpen Daftar Tumbas"
- android:fontFamily="@font/font_poppins"
- android:textSize="16dp"
- android:textColor="@color/white"
- android:textAllCaps="false"
+ android:layout_below="@id/txt1_settings"
android:layout_marginStart="30dp"
+ android:layout_marginTop="20dp"
android:layout_marginEnd="30dp"
android:background="@drawable/custom_button"
- android:layout_below="@id/txt1_settings"/>
+ android:fontFamily="@font/font_poppins"
+ android:text="Simpen Daftar Tumbas"
+ android:textAllCaps="false"
+ android:textColor="@color/white"
+ android:textSize="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/txt1_settings" />
<Button
android:id="@+id/send_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Kirim Daftar Tumbas"
- android:fontFamily="@font/font_poppins"
- android:textSize="16dp"
- android:textColor="@color/white"
- android:textAllCaps="false"
+ android:layout_below="@id/save_button"
android:layout_marginStart="30dp"
- android:layout_marginEnd="30dp"
android:layout_marginTop="20dp"
+ android:layout_marginEnd="30dp"
android:background="@drawable/custom_button"
- android:layout_below="@id/save_button"/>
+ android:fontFamily="@font/font_poppins"
+ android:text="Kirim Daftar Tumbas"
+ android:textAllCaps="false"
+ android:textColor="@color/white"
+ android:textSize="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/save_button" />
<Button
android:id="@+id/logout_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Metu"
- android:fontFamily="@font/font_poppins"
- android:textSize="16dp"
- android:textColor="@color/white"
- android:textAllCaps="false"
+ android:layout_below="@id/send_button"
android:layout_marginStart="30dp"
- android:layout_marginEnd="30dp"
android:layout_marginTop="20dp"
+ android:layout_marginEnd="30dp"
android:background="@drawable/logout_button"
- android:layout_below="@id/send_button"/>
+ android:fontFamily="@font/font_poppins"
+ android:text="Metu"
+ android:textAllCaps="false"
+ android:textColor="@color/white"
+ android:textSize="16dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/send_button" />
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
GitLab