Android16

.gitignore

@@ -32,6 +32,9 @@ local.properties
 .idea/deploymentTargetDropDown.xml
 .idea/appInsightsSettings.xml
 .idea/deploymentTargetSelector.xml
+.idea/AndroidProjectSystem.xml
+.idea/runConfigurations.xml
+.idea/deviceManager.xml
 *.iml
 
 # OS-specific files

app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 35
+    compileSdk=36
     defaultConfig {
         applicationId "com.samsung.microbit"
-        minSdkVersion 21
-        targetSdk 35
+        minSdkVersion 23
+        targetSdk 36
         // When target SDK version is 30+,
         // requestLegacyExternalStorage will continue to work for 29 Android 10
     }
@@ -20,7 +20,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
     }
@@ -30,19 +30,23 @@ android {
     lint {
         abortOnError false
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
-    implementation 'androidx.lifecycle:lifecycle-process:2.9.2'
+    implementation 'androidx.core:core:1.17.0'
+    implementation 'androidx.lifecycle:lifecycle-process:2.10.0'
     testImplementation 'junit:junit:4.13.2'
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.13.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.30'
     implementation 'no.nordicsemi.android:dfu:2.4.1'
     implementation project(':pfLibrary')
     implementation 'com.google.android.gms:play-services-analytics:18.1.1'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 }

app/src/main/AndroidManifest.xml

@@ -62,17 +62,23 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme.NoActionBar"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:enableOnBackInvokedCallback="false">
+        <property
+            android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"
+            android:value="true"/>
 
         <activity
             android:name=".ui.activity.HomeActivity"
+            android:theme="@style/AppTheme.NoActionBar.EdgeMainGray"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/home_activity_name"
             android:launchMode="singleTop"/>
 
         <!-- label was changed(removed colon), because some file managers (e.g. Total Commander) cannot open the activity.-->
         <activity
             android:name=".ui.activity.ProjectActivity"
+            android:theme="@style/AppTheme.NoActionBar.EdgeMainGray"
             android:label="@string/app_name_without_colon"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustResize"
@@ -132,6 +138,7 @@
             android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.activity.PairingActivity"
+            android:theme="@style/AppTheme.NoActionBar.EdgeMainGray"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_connect"
             android:launchMode="singleTop"
@@ -154,8 +161,9 @@
             android:launchMode="singleTask"/>
         <activity
             android:name=".ui.activity.MakeCodeWebView"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
             android:label="MakeCode Webview"
+            android:windowSoftInputMode="adjustResize"
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
         <activity

app/src/main/java/com/samsung/microbit/ui/activity/AudioRecorderActivity.java

@@ -23,6 +23,7 @@
 import android.widget.TextView;
 
 import androidx.core.app.NotificationCompat;
+import androidx.core.view.WindowCompat;
 
 import com.samsung.microbit.R;
 import com.samsung.microbit.plugin.AudioRecordPlugin;
@@ -109,11 +110,8 @@ public void onClick(View v) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        // TODO: EdgeToEdge - Remove once activities handle insets.
-        // Call before the DecorView is accessed in setContentView
-        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
-
         super.onCreate(savedInstanceState);
+        WindowCompat.enableEdgeToEdge(getWindow());
 
         mLaunchActivity = false;
 

app/src/main/java/com/samsung/microbit/ui/activity/FetchActivity.java

@@ -31,6 +31,7 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -40,6 +41,8 @@
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.PermissionChecker;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
 
 import com.samsung.microbit.MBApp;
 import com.samsung.microbit.MBAppState;
@@ -246,11 +249,8 @@ public void run() {
     protected void onCreate(Bundle savedInstanceState) {
         logi("onCreate");
 
-        // TODO: EdgeToEdge - Remove once activities handle insets.
-        // Call before the DecorView is accessed in setContentView
-        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
-
         super.onCreate(savedInstanceState);
+        WindowCompat.enableEdgeToEdge(getWindow());
 
         displayCreate();
 
@@ -741,12 +741,34 @@ private void displayCreate() {
         //Remove title bar
         this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.fetch_main);
+
+        // Pass insets to children
+        ViewCompat.setOnApplyWindowInsetsListener( findViewById(R.id.fetchMain), (v, windowInsets) -> {
+            LinearLayout root = (LinearLayout) v;
+            int childCount = root.getChildCount();
+            for (int index = 0; index < childCount; ++index) {
+                ViewCompat.dispatchApplyWindowInsets( root.getChildAt(index), windowInsets);
+            }
+            return windowInsets;
+        });
+
         displayHtmlDelete();
         displayInit();
     }
 
     public void displayConfigurationChanged(Configuration newConfig) {
         setContentView(R.layout.fetch_main);
+
+        // Pass insets to children
+        ViewCompat.setOnApplyWindowInsetsListener( findViewById(R.id.fetchMain), (v, windowInsets) -> {
+            LinearLayout root = (LinearLayout) v;
+            int childCount = root.getChildCount();
+            for (int index = 0; index < childCount; ++index) {
+                ViewCompat.dispatchApplyWindowInsets( root.getChildAt(index), windowInsets);
+            }
+            return windowInsets;
+        });
+
         displayInit();
     }
 

app/src/main/java/com/samsung/microbit/ui/activity/HelpWebView.java

@@ -8,6 +8,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.core.view.WindowCompat;
+
 import com.samsung.microbit.R;
 
 /**
@@ -30,11 +32,8 @@ protected void onStop() {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        // TODO: EdgeToEdge - Remove once activities handle insets.
-        // Call before the DecorView is accessed in setContentView
-        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
-
         super.onCreate(savedInstanceState);
+        WindowCompat.enableEdgeToEdge(getWindow());
 
         setContentView(R.layout.activity_help_web_view);
         webView = (WebView) findViewById(R.id.generalView);

app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java

@@ -33,6 +33,8 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.content.PermissionChecker;
 import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.samsung.microbit.MBApp;
@@ -124,11 +126,8 @@ protected void onStop() {
     protected void onCreate(Bundle savedInstanceState) {
         logi("onCreate() :: ");
 
-        // TODO: EdgeToEdge - Remove once activities handle insets.
-        // Call before the DecorView is accessed in setContentView
-        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
-
         super.onCreate(savedInstanceState);
+        WindowCompat.enableEdgeToEdge(getWindow());
 
         setContentView(R.layout.activity_home);
 
@@ -171,6 +170,12 @@ private void setupButtonsFontStyle() {
      */
     private void setupDrawer() {
 
+        // DrawLayout passes insets to children
+        // Allow left side menu (custom_nav_header_main, nav_view) to pass insets to child ScrollView
+        ViewCompat.setOnApplyWindowInsetsListener( findViewById(R.id.nav_view), (v, windowInsets) -> {
+            return windowInsets;
+        });
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         toolbar.setNavigationContentDescription(R.string.content_description_toolbar_home);
         ImageView imgToolbarLogo = (ImageView) findViewById(R.id.img_toolbar_logo);