From 33ab56a376826161576f6e145dcdded1e3ea2a45 Mon Sep 17 00:00:00 2001
From: Omer Schloss <schlossomer@gmail.com>
Date: Wed, 23 Jun 2021 15:16:09 +0300
Subject: [PATCH] bug fixed

---
 .../views/MainActivity.kt                     |   2 -
 app/src/main/res/layout/activity_main.xml     | 287 +++++++++---------
 2 files changed, 144 insertions(+), 145 deletions(-)

diff --git a/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt b/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt
index 286047b..b8f0ba3 100644
--- a/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt
+++ b/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt
@@ -15,8 +15,6 @@ import com.example.flightgearcontrollerapp.view_model.FGViewModel
 
 
 class MainActivity : AppCompatActivity() {
-
-    //private var vmConnection: FGViewModel = FGViewModel()
     private var isConnected = false
     private val vmConnection = FGViewModel()
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 732861e..24a1566 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layout 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">
 
     <data>
         <variable
@@ -19,121 +19,121 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/background"
-        tools:context=".views.MainActivity">
-
+        android:background="@mipmap/background">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            tools:context="com.setheightwidthpercentage_android_examples.com.MainActivity"
             android:weightSum="100"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="30sp"
-                    android:paddingBottom="10sp"
-                    android:text="@string/header_text"
-                    android:textColor="@color/white"
-                    android:textSize="41sp"
-                    android:textStyle="bold|italic"
-                    android:textAlignment="center"
-                    android:gravity="center" />
-
-                <TextView
-                    android:id="@+id/text_ip"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ask_ip"
-                    android:textSize="20sp"
-                    android:textColor="@color/white"
-                    android:paddingStart="15sp"
-                    android:paddingEnd="15sp"
-                    android:paddingTop="5sp"
-                    android:paddingBottom="5sp" />
-
-                <EditText
-                    android:id="@+id/ip_address"
-                    android:labelFor="@id/ip_address"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:digits="0123456789."
-                    android:inputType="number|numberDecimal"
-                    android:textSize="20sp"
-                    android:textDirection="ltr"
-                    android:textColor="@color/white"
-                    android:theme="@android:style/Theme.Holo"
-                    android:paddingLeft="15sp"
-                    android:paddingRight="15sp"
-                    android:paddingTop="5sp"
-                    android:paddingBottom="5sp"
-                    android:singleLine="true"
-                    android:nextFocusForward="@+id/port_address"
-                    android:importantForAutofill="no" />
-
-                <TextView
-                    android:id="@+id/text_port"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ask_port"
-                    android:textSize="20sp"
-                    android:textColor="@color/white"
-                    android:paddingLeft="15sp"
-                    android:paddingRight="15sp"
-                    android:paddingTop="5sp"
-                    android:paddingBottom="5sp" />
-
-                <EditText
-                    android:id="@+id/port_address"
-                    android:labelFor="@id/port_address"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:digits="0123456789"
-                    android:inputType="number"
-                    android:textSize="20sp"
-                    android:textDirection="ltr"
-                    android:theme="@android:style/Theme.Holo"
-                    android:paddingLeft="15sp"
-                    android:paddingRight="15sp"
-                    android:paddingTop="5sp"
-                    android:paddingBottom="5sp"
-
-                    android:importantForAutofill="no"
-                    android:singleLine="true" />
-
-                <Button
-                    android:id="@+id/btn_connect"
-                    android:textSize="23sp"
-                    android:textAllCaps="false"
-                    android:paddingLeft="20sp"
-                    android:paddingRight="20sp"
-                    android:paddingTop="12sp"
-                    android:paddingBottom="12sp"
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:onClick="onClickConnect"
-                    android:text="@string/btn_connect" />
-
-            </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="13"
+                android:paddingTop="20dp"
+                android:paddingBottom="10dp"
+                android:text="@string/header_text"
+                android:textColor="@color/white"
+                android:textSize="40sp"
+                android:textStyle="bold|italic"
+                android:textAlignment="center"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/text_ip"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="6"
+                android:text="@string/ask_ip"
+                android:textSize="20sp"
+                android:textColor="@color/white"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp" />
+
+            <EditText
+                android:id="@+id/ip_address"
+                android:labelFor="@id/ip_address"
+                android:layout_width="match_parent"
+                android:layout_height="0sp"
+                android:layout_weight="6"
+                android:digits="0123456789."
+                android:inputType="number|numberDecimal"
+                android:textSize="20sp"
+                android:textDirection="ltr"
+                android:textColor="@color/white"
+                android:theme="@android:style/Theme.Holo"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:singleLine="true"
+                android:nextFocusForward="@+id/port_address"
+                android:importantForAutofill="no" />
+
+            <TextView
+                android:id="@+id/text_port"
+                android:layout_width="match_parent"
+                android:layout_height="0sp"
+                android:layout_weight="6"
+                android:text="@string/ask_port"
+                android:textSize="20sp"
+                android:textColor="@color/white"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp" />
+
+            <EditText
+                android:id="@+id/port_address"
+                android:labelFor="@id/port_address"
+                android:layout_width="match_parent"
+                android:layout_height="0sp"
+                android:layout_weight="6"
+                android:digits="0123456789"
+                android:inputType="number"
+                android:textSize="20sp"
+                android:textDirection="ltr"
+                android:theme="@android:style/Theme.Holo"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+
+                android:importantForAutofill="no"
+                android:singleLine="true" />
+
+            <Button
+                android:id="@+id/btn_connect"
+                android:textSize="20sp"
+                android:textAllCaps="false"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="9"
+                android:onClick="onClickConnect"
+                android:text="@string/btn_connect" />
 
             <LinearLayout
-                android:id="@+id/throttle_slider"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:layout_weight="80"
-                android:background="@color/black_60">
+                android:layout_height="0dp"
+                android:layout_weight="43"
+                tools:context="com.setheightwidthpercentage_android_examples.com.MainActivity"
+                android:weightSum="100"
+                android:background="@color/black_60"
+                android:baselineAligned="false">
 
                 <RelativeLayout
-                    android:layout_width="360sp"
-                    android:layout_height="370sp"
+                    android:layout_height="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_weight="75"
                     android:layout_gravity="center">
 
                     <com.jackandphantom.joystickview.JoyStickView
@@ -154,57 +154,59 @@
                         app:shadowRadius="7" />
                 </RelativeLayout>
 
-                <GridLayout
-
-                    android:layout_width="100sp"
+                <LinearLayout
                     android:layout_height="match_parent"
-                    android:background="@color/white_40">
-
+                    android:layout_width="0dp"
+                    android:layout_weight="25"
+                    tools:context="com.setheightwidthpercentage_android_examples.com.MainActivity"
+                    android:weightSum="100"
+                    android:background="@color/white_40"
+                    android:orientation="vertical">
                     <TextView
                         android:id="@+id/text_throttle"
-                        android:layout_width="100sp"
-                        android:layout_height="66sp"
-                        android:layout_row="0"
-                        android:layout_column="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="20"
                         android:gravity="center"
                         android:text="@string/txt_throttle"
                         android:textColor="@color/black_60"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.slider.Slider
-
-                        android:layout_width="320sp"
-                        android:layout_height="wrap_content"
-                        android:layout_row="1"
-                        android:layout_column="1"
-                        android:layout_marginLeft="-110sp"
-                        android:layout_marginTop="120sp"
-                        android:rotation="270"
-                        android:value="0"
-                        android:valueFrom="0"
-                        android:valueTo="1" />
-                </GridLayout>
+                        android:autoSizeTextType="uniform"
+                        android:autoSizeMaxTextSize="20sp"
+                        android:textStyle="bold"/>
+                    <RelativeLayout
+                        android:layout_width="230dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="80"
+                        android:layout_marginStart="-65dp"
+                        android:layout_marginBottom="10dp"
+                        android:gravity="center">
+
+                        <com.google.android.material.slider.Slider
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:rotation="270"
+                            android:value="0"
+                            android:valueFrom="0"
+                            android:valueTo="1" />
+                    </RelativeLayout>
+                </LinearLayout>
 
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="11"
                 android:background="@color/white_40"
-                android:orientation="vertical"
-                android:paddingTop="5sp"
-                android:paddingBottom="5sp">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/text_rudder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:paddingLeft="15sp"
-                    android:paddingTop="5sp"
-                    android:paddingRight="15sp"
-                    android:paddingBottom="0sp"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
                     android:text="@string/txt_rudder"
                     android:textColor="@color/black_60"
                     android:textSize="20sp"
@@ -212,10 +214,9 @@
 
                 <com.google.android.material.slider.Slider
                     android:layout_width="match_parent"
-                    android:layout_marginLeft="30sp"
-                    android:layout_marginRight="30sp"
-                    android:layout_height="0sp"
-                    android:layout_weight="0"
+                    android:layout_marginLeft="30dp"
+                    android:layout_marginRight="30dp"
+                    android:layout_height="fill_parent"
                     app:trackColorActive="@color/navy_blue_40"
                     app:trackColorInactive="@color/navy_blue_40"
                     android:value="0"