Skip to content

Commit b33a026

Browse files
committed
added kotlin version
1 parent 70a0fb5 commit b33a026

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1658
-10
lines changed

ControllerSimpleDemo/.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ControllerSimpleDemo/.idea/other.xml

Lines changed: 318 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ControllerSimpleDemo/app/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdk 34
4+
compileSdk 35
55

66
defaultConfig {
77
applicationId "edu.cs4730.controllersimpledemo"
8-
minSdkVersion 28
9-
targetSdk 34
8+
minSdkVersion 29
9+
targetSdk 35
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -24,6 +24,8 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation 'androidx.appcompat:appcompat:1.6.1'
27+
implementation 'androidx.appcompat:appcompat:1.7.0'
28+
implementation("com.google.android.material:material:1.12.0")
29+
implementation("androidx.activity:activity:1.9.1")
2830

2931
}

ControllerSimpleDemo/app/src/main/java/edu/cs4730/controllersimpledemo/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
*/
2020
@SuppressLint("SetTextI18n")
2121
public class MainActivity extends AppCompatActivity {
22-
ActivityMainBinding binding;
23-
Boolean isJoyStick = false, isGamePad = false;
22+
private ActivityMainBinding binding;
23+
private Boolean isJoyStick = false, isGamePad = false;
2424

2525
@Override
2626
protected void onCreate(Bundle savedInstanceState) {
@@ -132,7 +132,7 @@ public boolean dispatchKeyEvent(android.view.KeyEvent event) {
132132
}
133133

134134
//From Google's page on controller-input
135-
public ArrayList<Integer> getGameControllerIds() {
135+
private ArrayList<Integer> getGameControllerIds() {
136136
ArrayList<Integer> gameControllerDeviceIds = new ArrayList<Integer>();
137137
int[] deviceIds = InputDevice.getDeviceIds();
138138
for (int deviceId : deviceIds) {

ControllerSimpleDemo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.3.2'
9+
classpath 'com.android.tools.build:gradle:8.5.2'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

ControllerSimpleDemo/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
android.enableJetifier=true
1313
android.nonFinalResIds=false
14-
android.nonTransitiveRClass=false
14+
android.nonTransitiveRClass=true
1515
android.useAndroidX=true
1616
org.gradle.jvmargs=-Xmx1536m
1717

0 commit comments

Comments
 (0)