Skip to content
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
2 changes: 1 addition & 1 deletion src/main/java/com/gluonhq/substrate/util/FileDeps.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public final class FileDeps {

private static final String ANDROID_KEY = "24333f8a63b6825ea9c5514f83c2829b004d1fee";
private static final String[] ANDROID_SDK_PACKAGES = {
"platforms;android-35", "build-tools;35.0.0", "platform-tools",
"platforms;android-36", "build-tools;36.0.0", "platform-tools",
"extras;android;m2repository", "extras;google;m2repository", "ndk;" + ANDROID_NDK_VERSION
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {

defaultConfig {
minSdkVersion 21
compileSdk 35
targetSdkVersion 35
compileSdk 36
targetSdkVersion 36
}

repositories {
Expand All @@ -27,7 +27,8 @@ android {
}

dependencies {
implementation 'androidx.activity:activity:1.10.1'
implementation 'androidx.activity:activity:1.11.0'
implementation 'androidx.core:core:1.17.0'
// OTHER_ANDROID_DEPENDENCIES
api fileTree(dir: '../libs', include: '*.aar')
api fileTree(dir: '../libs', include: '*.jar')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.Window;
Expand All @@ -59,9 +58,7 @@
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;

import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowCompat;

import java.util.TimeZone;
import javafx.scene.input.KeyCode;
Expand Down Expand Up @@ -101,17 +98,14 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(mViewGroup);
instance = this;

if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // > 34
// Prevent edge-to-edge display, keeping the view outside the systemBars
// Warning: this doesn't set the color of the SystemBars, which can be done
// by the StatusBarService in Attach
View decorView = getWindow().getDecorView();
ViewCompat.setOnApplyWindowInsetsListener(decorView, (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
decorView.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
}
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // <= 34
// Enable edge-to-edge display, extending the app to the full extension of the screen.
// The system bars are now on top of the application, and necessary padding should be
// applied to the top (AppBar) and bottom, to avoid overlaps.
// The DisplayService in Attach can be used to track the insets of the system bars
// and the StatusBarService can be used to set a dark or light appearance of the status bar
WindowCompat.enableEdgeToEdge(getWindow());
} // else, >= 35 has edge-to-edge enabled by default

imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
Log.v(TAG, "onCreate done");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.11.0'
classpath 'com.android.tools.build:gradle:8.11.2'
}
}

Expand Down
Loading