From 3cfb029fd7f36949957c712a0bcc503485f199fc Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Fri, 8 Feb 2019 21:18:09 +0800
Subject: [PATCH] Remove overkill

---
 mobile/build.gradle                          |  1 -
 mobile/src/main/res/layout/activity_main.xml | 23 ++++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 5ecfdb49..aeef141a 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -70,7 +70,6 @@ dependencies {
     kapt "androidx.room:room-compiler:$roomVersion"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.browser:browser:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     implementation 'androidx.core:core-ktx:1.0.1'
     implementation 'androidx.emoji:emoji:1.0.0'
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index 808bf8cd..8afd3ff0 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -4,9 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         tools:context="be.mygod.vpnhotspot.MainActivity">
 
         <androidx.appcompat.widget.Toolbar
@@ -15,16 +16,12 @@
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            app:layout_constraintTop_toTopOf="parent"
             app:title="@string/app_name"/>
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/navigation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar">
+            android:layout_weight="1">
 
             <FrameLayout
                 android:id="@+id/fragmentHolder"
@@ -35,25 +32,19 @@
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/navigation"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:attr/windowBackground"
-            app:layout_constraintBottom_toTopOf="@+id/line"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
             app:menu="@menu/navigation"/>
 
         <View
             android:id="@+id/line"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="0.1px"
             android:background="?android:attr/navigationBarColor"
             android:elevation="9dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
             tools:ignore="PxUsage"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
 </layout>