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 @@ + + + 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 @@ + + + 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 @@ + + + android:layout_height="370sp" + 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" /> #99FFFFFF #66FFFFFF #FF000080 + #66000080 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() } }