From 43db0955de687d43f9473374dc7c5548eaa55359 Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Thu, 5 Sep 2024 09:01:39 +0300
Subject: [PATCH] Remove dependency on ConstraintLayout (#133)

---
 app/build.gradle.kts                         |  1 -
 app/src/main/res/layout/activity_main.xml    | 29 ++++++--------------
 app/src/main/res/xml/byedpi_cmd_settings.xml |  1 -
 app/src/main/res/xml/byedpi_ui_settings.xml  |  1 -
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d7b4fbc..62d8efb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -72,7 +72,6 @@ dependencies {
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("com.takisoft.preferencex:preferencex:1.1.0")
     implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
     implementation("androidx.lifecycle:lifecycle-service:2.8.4")
     testImplementation("junit:junit:4.13.2")
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2681fbb..0717a1e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:gravity="center_vertical"
     tools:context=".activities.MainActivity">
 
     <com.google.android.material.button.MaterialButton
@@ -11,42 +12,30 @@
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
         android:paddingLeft="10pt"
         android:paddingTop="5pt"
         android:paddingRight="10pt"
         android:paddingBottom="5pt"
         android:textAllCaps="false"
         android:textSize="24sp"
-        app:layout_constraintBottom_toTopOf="@+id/status_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
         tools:text="@string/vpn_connect" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/status_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/proxy_address"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/status_button"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:layout_below="@+id/status_button"
+        android:layout_marginTop="8dp"
+        android:layout_centerHorizontal="true"
         tools:text="@string/vpn_disconnected" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/proxy_address"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/status_text"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:layout_below="@+id/status_text"
+        android:layout_centerHorizontal="true"
         tools:text="127.0.0.1:1080" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/xml/byedpi_cmd_settings.xml b/app/src/main/res/xml/byedpi_cmd_settings.xml
index 5d45e09..fad9131 100644
--- a/app/src/main/res/xml/byedpi_cmd_settings.xml
+++ b/app/src/main/res/xml/byedpi_cmd_settings.xml
@@ -6,7 +6,6 @@
     <Preference
         android:key="byedpi_readme"
         android:title="Documentation"
-        android:textColor="?attr/textFillColor"
         android:icon="@drawable/ic_github_36">
         <intent
             android:action="android.intent.action.VIEW"
diff --git a/app/src/main/res/xml/byedpi_ui_settings.xml b/app/src/main/res/xml/byedpi_ui_settings.xml
index 0473b0c..550637b 100644
--- a/app/src/main/res/xml/byedpi_ui_settings.xml
+++ b/app/src/main/res/xml/byedpi_ui_settings.xml
@@ -6,7 +6,6 @@
     <Preference
         android:key="byedpi_readme"
         android:title="@string/byedpi_readme_link"
-        android:textColor="?attr/textFillColor"
         android:icon="@drawable/ic_github_36">
         <intent
             android:action="android.intent.action.VIEW"