added kotlin version

JimSeker · Aug 30, 2024 · b33a026 · b33a026
1 parent 70a0fb5
commit b33a026
Show file tree

Hide file tree

Showing 49 changed files with 1,658 additions and 10 deletions.
diff --git a/ControllerSimpleDemo/.idea/deploymentTargetSelector.xml b/ControllerSimpleDemo/.idea/deploymentTargetSelector.xml
diff --git a/ControllerSimpleDemo/.idea/other.xml b/ControllerSimpleDemo/.idea/other.xml
diff --git a/ControllerSimpleDemo/app/build.gradle b/ControllerSimpleDemo/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "edu.cs4730.controllersimpledemo"
-        minSdkVersion 28
-        targetSdk 34
+        minSdkVersion 29
+        targetSdk 35
         versionCode 1
         versionName "1.0"
     }
@@ -24,6 +24,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.activity:activity:1.9.1")
 
 }
diff --git a/ControllerSimpleDemo/app/src/main/java/edu/cs4730/controllersimpledemo/MainActivity.java b/ControllerSimpleDemo/app/src/main/java/edu/cs4730/controllersimpledemo/MainActivity.java
@@ -19,8 +19,8 @@
  */
 @SuppressLint("SetTextI18n")
 public class MainActivity extends AppCompatActivity {
-    ActivityMainBinding binding;
-    Boolean isJoyStick = false, isGamePad = false;
+    private ActivityMainBinding binding;
+    private Boolean isJoyStick = false, isGamePad = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -132,7 +132,7 @@ public boolean dispatchKeyEvent(android.view.KeyEvent event) {
     }
 
     //From Google's page on controller-input
-    public ArrayList<Integer> getGameControllerIds() {
+    private ArrayList<Integer> getGameControllerIds() {
         ArrayList<Integer> gameControllerDeviceIds = new ArrayList<Integer>();
         int[] deviceIds = InputDevice.getDeviceIds();
         for (int deviceId : deviceIds) {

diff --git a/ControllerSimpleDemo/build.gradle b/ControllerSimpleDemo/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/ControllerSimpleDemo/gradle.properties b/ControllerSimpleDemo/gradle.properties
@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.nonFinalResIds=false
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m