Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

agdk-mainloop: update for GameActivity 2.0.2 #105

Merged
merged 1 commit into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions examples/agdk-mainloop/.gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions examples/agdk-mainloop/.idea/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions examples/agdk-mainloop/.idea/compiler.xml

This file was deleted.

19 changes: 0 additions & 19 deletions examples/agdk-mainloop/.idea/gradle.xml

This file was deleted.

5 changes: 1 addition & 4 deletions examples/agdk-mainloop/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions examples/agdk-mainloop/.idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/agdk-mainloop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ndk = "0.7"

[lib]
name="main"
crate_type=["cdylib"]
crate_type=["cdylib"]
18 changes: 7 additions & 11 deletions examples/agdk-mainloop/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ android {
targetSdk 31
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand All @@ -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"
Expand All @@ -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"
}

Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
18 changes: 0 additions & 18 deletions examples/agdk-mainloop/app/src/main/res/layout/activity_main.xml

This file was deleted.

16 changes: 0 additions & 16 deletions examples/agdk-mainloop/app/src/main/res/values-night/themes.xml

This file was deleted.

17 changes: 2 additions & 15 deletions examples/agdk-mainloop/app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -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>
Loading