From c5d2d762b4cbafe8c576ab7130c305c35c740a0b Mon Sep 17 00:00:00 2001
From: Omer Schloss <schlossomer@gmail.com>
Date: Mon, 21 Jun 2021 14:09:46 +0300
Subject: [PATCH] Joystick view

---
 .idea/misc.xml                                |   3 +++
 app/build.gradle                              |  12 ++++-----
 .../view_model/JoyStickVM.kt                  |   4 +++
 .../{JoystickView.kt => JoyStickView.kt}      |   5 ++--
 .../ic_baseline_airplanemode_active_24.xml    |  10 ++++++++
 app/src/main/res/layout/activity_main.xml     |  24 +++++++++++++++---
 .../main/res/mipmap-anydpi-v26/joystick.png   | Bin 9261 -> 0 bytes
 .../res/mipmap-anydpi-v26/joystick_bg.png     | Bin 3945 -> 0 bytes
 app/src/main/res/values/colors.xml            |   1 +
 build.gradle                                  |   3 +--
 10 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/example/flightgearcontrollerapp/view_model/JoyStickVM.kt
 rename app/src/main/java/com/example/flightgearcontrollerapp/views/{JoystickView.kt => JoyStickView.kt} (68%)
 create mode 100644 app/src/main/res/drawable/ic_baseline_airplanemode_active_24.xml
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/joystick.png
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/joystick_bg.png

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66..12b0fa1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ProjectPlainTextFileTypeManager">
+    <file url="file://$PROJECT_DIR$/app/src/main/java/com/example/flightgearcontrollerapp/views/JoystickListener.kt" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index f8ec934..80c3074 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 android {
     compileSdkVersion 30
-
+    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.example.flightgearcontrollerapp"
         minSdkVersion 26
@@ -16,6 +16,9 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        dataBinding true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -30,19 +33,16 @@ android {
         jvmTarget = '1.8'
     }
 
-    buildFeatures {
-        dataBinding true
-    }
 }
 
 dependencies {
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.5.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
+    implementation 'com.jackandphantom.android:joystickview:1.0.2'
+    //testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/flightgearcontrollerapp/view_model/JoyStickVM.kt b/app/src/main/java/com/example/flightgearcontrollerapp/view_model/JoyStickVM.kt
new file mode 100644
index 0000000..97ab617
--- /dev/null
+++ b/app/src/main/java/com/example/flightgearcontrollerapp/view_model/JoyStickVM.kt
@@ -0,0 +1,4 @@
+package com.example.flightgearcontrollerapp.view_model
+
+class JoyStickVM {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/flightgearcontrollerapp/views/JoystickView.kt b/app/src/main/java/com/example/flightgearcontrollerapp/views/JoyStickView.kt
similarity index 68%
rename from app/src/main/java/com/example/flightgearcontrollerapp/views/JoystickView.kt
rename to app/src/main/java/com/example/flightgearcontrollerapp/views/JoyStickView.kt
index aa812e6..445e939 100644
--- a/app/src/main/java/com/example/flightgearcontrollerapp/views/JoystickView.kt
+++ b/app/src/main/java/com/example/flightgearcontrollerapp/views/JoyStickView.kt
@@ -1,4 +1,5 @@
 package com.example.flightgearcontrollerapp.views
 
-class JoystickView{
-}
\ No newline at end of file
+class JoyStickView{
+
+}
diff --git a/app/src/main/res/drawable/ic_baseline_airplanemode_active_24.xml b/app/src/main/res/drawable/ic_baseline_airplanemode_active_24.xml
new file mode 100644
index 0000000..0ad3ad1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_airplanemode_active_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22,16v-2l-8.5,-5V3.5C13.5,2.67 12.83,2 12,2s-1.5,0.67 -1.5,1.5V9L2,14v2l8.5,-2.5V19L8,20.5L8,22l4,-1l4,1l0,-1.5L13.5,19v-5.5L22,16z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e8818f..38f941a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,12 @@
         <variable
             name="viewModel"
             type="com.example.flightgearcontrollerapp.view_model.FGViewModel" />
+        <variable
+            name="joystickVM"
+            type="com.example.flightgearcontrollerapp.view_model.JoyStickVM"/>
+        <variable
+            name="model"
+            type="com.example.flightgearcontrollerapp.view_model.FGViewModel"/>
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -127,13 +133,25 @@
 
                 <RelativeLayout
                     android:layout_width="360sp"
-                    android:layout_height="370sp">
+                    android:layout_height="370sp"
+                    android:layout_gravity="center">
 
-                    <RelativeLayout
+                    <com.jackandphantom.joystickview.JoyStickView
                         android:id="@+id/widget_joystick"
                         android:layout_width="360sp"
                         android:layout_height="360sp"
-                        android:layout_gravity="center" />
+
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginEnd="0dp"
+                        android:layout_marginBottom="-3dp"
+                        app:innerCircleColor="#f6FFFFFF"
+                        app:innerCircleImage="@drawable/ic_baseline_airplanemode_active_24"
+                        app:outerCircleBorderColor="#fff"
+                        app:outerCircleBorderWidth="5"
+                        app:outerCircleColor="@color/navy_blue_40"
+                        app:shadowColor="#000"
+                        app:shadowRadius="7" />
                 </RelativeLayout>
 
                 <GridLayout
diff --git a/app/src/main/res/mipmap-anydpi-v26/joystick.png b/app/src/main/res/mipmap-anydpi-v26/joystick.png
deleted file mode 100644
index 3c4834fd13921b14dad81e9e1e2a7107215804c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9261
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

diff --git a/app/src/main/res/mipmap-anydpi-v26/joystick_bg.png b/app/src/main/res/mipmap-anydpi-v26/joystick_bg.png
deleted file mode 100644
index 359c61f519976ea239c03c1747243505a2fcecd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3945
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
K+^W{T7xjNsrc8nW

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3f73e83..53e7857 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,5 @@
     <color name="white_60">#99FFFFFF</color>
     <color name="white_40">#66FFFFFF</color>
     <color name="navy_blue">#FF000080</color>
+    <color name="navy_blue_40">#66000080</color>
 </resources>
diff --git a/build.gradle b/build.gradle
index 3194816..30ecab6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.5.10"
     repositories {
@@ -8,7 +7,6 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:4.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -18,6 +16,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
 }