Skip to content

Commit 6f72dde

Browse files
authored
Merge pull request #105 from rust-mobile/rib/pr/agdk-mainloop-update-v2.0.2
agdk-mainloop: update for GameActivity 2.0.2
2 parents 3464ba2 + d0f10a0 commit 6f72dde

File tree

12 files changed

+18
-106
lines changed

12 files changed

+18
-106
lines changed

examples/agdk-mainloop/.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
*.iml
2+
.idea
23
.gradle
34
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
5+
/.idea
106
.DS_Store
117
/build
128
/captures

examples/agdk-mainloop/.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

examples/agdk-mainloop/.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

examples/agdk-mainloop/.idea/gradle.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/agdk-mainloop/.idea/misc.xml

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/agdk-mainloop/.idea/vcs.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/agdk-mainloop/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ndk = "0.7"
1414

1515
[lib]
1616
name="main"
17-
crate_type=["cdylib"]
17+
crate_type=["cdylib"]

examples/agdk-mainloop/app/build.gradle

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ android {
1212
targetSdk 31
1313
versionCode 1
1414
versionName "1.0"
15-
16-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1715
}
1816

1917
buildTypes {
@@ -38,12 +36,10 @@ android {
3836

3937
dependencies {
4038

41-
implementation 'androidx.appcompat:appcompat:1.4.1'
42-
implementation 'com.google.android.material:material:1.5.0'
43-
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
44-
testImplementation 'junit:junit:4.13.2'
45-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
46-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
39+
implementation "androidx.core:core:1.5.0"
40+
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
41+
implementation 'androidx.fragment:fragment:1.2.5'
42+
implementation 'com.google.oboe:oboe:1.5.0'
4743

4844
// To use the Android Frame Pacing library
4945
//implementation "androidx.games:games-frame-pacing:1.9.1"
@@ -52,12 +48,12 @@ dependencies {
5248
//implementation "androidx.games:games-performance-tuner:1.5.0"
5349

5450
// To use the Games Activity library
55-
implementation "androidx.games:games-activity:1.1.0"
51+
implementation "androidx.games:games-activity:2.0.2"
5652

5753
// To use the Games Controller Library
58-
//implementation "androidx.games:games-controller:1.1.0"
54+
//implementation "androidx.games:games-controller:2.0.2"
5955

6056
// To use the Games Text Input Library
61-
//implementation "androidx.games:games-text-input:1.1.0"
57+
//implementation "androidx.games:games-text-input:2.0.2"
6258
}
6359

examples/agdk-mainloop/app/src/main/java/co/realfit/agdkmainloop/MainActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
6363
super.onCreate(savedInstanceState);
6464
}
6565

66+
protected void onResume() {
67+
super.onResume();
68+
hideSystemUI();
69+
}
70+
6671
public boolean isGooglePlayGames() {
6772
PackageManager pm = getPackageManager();
6873
return pm.hasSystemFeature("com.google.android.play.feature.HPE_EXPERIENCE");

examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/agdk-mainloop/app/src/main/res/values-night/themes.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
<resources xmlns:tools="http://schemas.android.com/tools">
2-
<!-- Base application theme. -->
3-
<style name="Theme.RustTemplate" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
4-
<!-- Primary brand color. -->
5-
<item name="colorPrimary">@color/purple_500</item>
6-
<item name="colorPrimaryVariant">@color/purple_700</item>
7-
<item name="colorOnPrimary">@color/white</item>
8-
<!-- Secondary brand color. -->
9-
<item name="colorSecondary">@color/teal_200</item>
10-
<item name="colorSecondaryVariant">@color/teal_700</item>
11-
<item name="colorOnSecondary">@color/black</item>
12-
<!-- Status bar color. -->
13-
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
14-
<!-- Customize your theme here. -->
15-
</style>
1+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
2+
<style name="Theme.RustTemplate" parent="Theme.AppCompat.Light.NoActionBar" />
163
</resources>

0 commit comments

Comments
 (0)