agdk-mainloop: update for GameActivity 2.0.2

rust-mobile · Aug 7, 2023 · d0f10a0 · d0f10a0
1 parent 3464ba2
commit d0f10a0
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 106 deletions.
diff --git a/examples/agdk-mainloop/.gitignore b/examples/agdk-mainloop/.gitignore
@@ -1,12 +1,8 @@
 *.iml
+.idea
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

diff --git a/examples/agdk-mainloop/.idea/.gitignore b/examples/agdk-mainloop/.idea/.gitignore
diff --git a/examples/agdk-mainloop/.idea/compiler.xml b/examples/agdk-mainloop/.idea/compiler.xml
diff --git a/examples/agdk-mainloop/.idea/gradle.xml b/examples/agdk-mainloop/.idea/gradle.xml
diff --git a/examples/agdk-mainloop/.idea/misc.xml b/examples/agdk-mainloop/.idea/misc.xml
diff --git a/examples/agdk-mainloop/.idea/vcs.xml b/examples/agdk-mainloop/.idea/vcs.xml
diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml
@@ -14,4 +14,4 @@ ndk = "0.7"
 
 [lib]
 name="main"
-crate_type=["cdylib"]
+crate_type=["cdylib"]
diff --git a/examples/agdk-mainloop/app/build.gradle b/examples/agdk-mainloop/app/build.gradle
@@ -12,8 +12,6 @@ android {
         targetSdk 31
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -38,12 +36,10 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.core:core:1.5.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'com.google.oboe:oboe:1.5.0'
 
     // To use the Android Frame Pacing library
     //implementation "androidx.games:games-frame-pacing:1.9.1"
@@ -52,12 +48,12 @@ dependencies {
     //implementation "androidx.games:games-performance-tuner:1.5.0"
 
     // To use the Games Activity library
-    implementation "androidx.games:games-activity:1.1.0"
+    implementation "androidx.games:games-activity:2.0.2"
 
     // To use the Games Controller Library
-    //implementation "androidx.games:games-controller:1.1.0"
+    //implementation "androidx.games:games-controller:2.0.2"
 
     // To use the Games Text Input Library
-    //implementation "androidx.games:games-text-input:1.1.0"
+    //implementation "androidx.games:games-text-input:2.0.2"
 }
 
diff --git a/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java b/examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java
@@ -63,6 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
+    protected void onResume() {
+        super.onResume();
+        hideSystemUI();
+    }
+
     public boolean isGooglePlayGames() {
         PackageManager pm = getPackageManager();
         return pm.hasSystemFeature("com.google.android.play.feature.HPE_EXPERIENCE");

diff --git a/examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml b/examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml
diff --git a/examples/agdk-mainloop/app/src/main/res/values-night/themes.xml b/examples/agdk-mainloop/app/src/main/res/values-night/themes.xml
diff --git a/examples/agdk-mainloop/app/src/main/res/values/themes.xml b/examples/agdk-mainloop/app/src/main/res/values/themes.xml
@@ -1,16 +1,3 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.RustTemplate" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<style name="Theme.RustTemplate" parent="Theme.AppCompat.Light.NoActionBar" />
 </resources>