Update dependencies and enable Edge-to-Edge for activities

eyedeekay · eyedeekay · commit 35d5f4b66b9d · 2026-04-15T14:54:06.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -92,7 +92,8 @@ dependencies {
     implementation "com.android.support:preference-v7:$supportVersion"
     implementation "com.android.support:preference-v14:$supportVersion"
     implementation "com.android.support:recyclerview-v7:$supportVersion"*/
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.activity:activity:1.9.0'
     // Remote dependencies
     implementation 'com.androidplot:androidplot-core:1.5.11'
     implementation 'com.eowise:recyclerview-stickyheaders:0.5.2@aar'
diff --git a/app/src/main/java/net/i2p/android/I2PActivityBase.java b/app/src/main/java/net/i2p/android/I2PActivityBase.java
@@ -7,6 +7,7 @@
 import android.os.Bundle;
 import android.os.IBinder;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 
 import net.i2p.android.router.service.RouterBinder;
@@ -40,6 +41,7 @@ public abstract class I2PActivityBase extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         Util.d(this + " onCreate called");
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         _sharedPrefs = getSharedPreferences(SHARED_PREFS, 0);
     }
diff --git a/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java b/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 //import android.support.v7.widget.Toolbar;
 import androidx.appcompat.widget.Toolbar;
@@ -26,6 +27,7 @@ public class BrowserConfigActivity extends AppCompatActivity implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_help);
 
diff --git a/app/src/main/java/net/i2p/android/help/HelpActivity.java b/app/src/main/java/net/i2p/android/help/HelpActivity.java
@@ -7,6 +7,7 @@
 //import android.support.v4.app.TaskStackBuilder;
 import androidx.core.app.TaskStackBuilder;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 //import android.support.v7.widget.Toolbar;
 import androidx.appcompat.widget.Toolbar;
@@ -38,6 +39,7 @@ public class HelpActivity extends AppCompatActivity implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_help);
 
diff --git a/app/src/main/java/net/i2p/android/i2ptunnel/preferences/EditTunnelActivity.java b/app/src/main/java/net/i2p/android/i2ptunnel/preferences/EditTunnelActivity.java
@@ -7,6 +7,7 @@
 //import android.support.v4.app.FragmentManager;
 import androidx.fragment.app.FragmentManager;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 //import android.support.v7.widget.Toolbar;
 import androidx.appcompat.widget.Toolbar;
@@ -24,6 +25,7 @@ public class EditTunnelActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_single_fragment);
 
diff --git a/app/src/main/java/net/i2p/android/router/SettingsActivity.java b/app/src/main/java/net/i2p/android/router/SettingsActivity.java
@@ -10,6 +10,7 @@
 //import android.support.v4.content.LocalBroadcastManager;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 //import android.support.v7.preference.Preference;
 import androidx.preference.Preference;
@@ -43,6 +44,7 @@ public class SettingsActivity extends AppCompatActivity implements
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_single_fragment);
 
diff --git a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.os.Bundle;
 //import android.support.v7.app.AppCompatActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 //import android.support.v7.widget.Toolbar;
 import androidx.appcompat.widget.Toolbar;
@@ -31,6 +32,7 @@ public class AddressbookSettingsActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         localeManager.onCreate(this);
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_addressbook_settings);
 
diff --git a/app/src/main/java/net/i2p/android/router/service/AndroidSAMSecureSession.java b/app/src/main/java/net/i2p/android/router/service/AndroidSAMSecureSession.java
@@ -7,6 +7,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import java.util.concurrent.CountDownLatch;
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 
 import net.i2p.android.I2PActivity;
@@ -41,6 +42,7 @@ public class AndroidSAMSecureSession extends AppCompatActivity implements SAMSec
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
     }
 
diff --git a/app/src/main/java/net/i2p/android/wizard/ui/AbstractWizardActivity.java b/app/src/main/java/net/i2p/android/wizard/ui/AbstractWizardActivity.java
@@ -6,6 +6,7 @@
 //import android.support.v4.app.Fragment;
 import androidx.fragment.app.Fragment;
 //import android.support.v4.app.FragmentActivity;
+import androidx.activity.EdgeToEdge;
 import androidx.fragment.app.FragmentActivity;
 //import android.support.v4.app.FragmentManager;
 import androidx.fragment.app.FragmentManager;
@@ -59,6 +60,7 @@ public void onCreate(Bundle savedInstanceState) {
             }
         }
 
+        EdgeToEdge.enable(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_wizard);
 
diff --git a/app/src/main/res/layout-land/activity_viewpager.xml b/app/src/main/res/layout-land/activity_viewpager.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_addressbook_settings.xml b/app/src/main/res/layout/activity_addressbook_settings.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_help_onepane.xml b/app/src/main/res/layout/activity_help_onepane.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_help_twopane.xml b/app/src/main/res/layout/activity_help_twopane.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_navdrawer_viewpager.xml b/app/src/main/res/layout/activity_navdrawer_viewpager.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_onepane.xml b/app/src/main/res/layout/activity_onepane.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_single_fragment.xml b/app/src/main/res/layout/activity_single_fragment.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_twopane.xml b/app/src/main/res/layout/activity_twopane.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_viewpager.xml b/app/src/main/res/layout/activity_viewpager.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_wizard.xml b/app/src/main/res/layout/activity_wizard.xml
@@ -1,7 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <net.i2p.android.wizard.ui.StepPagerStrip
         android:id="@+id/strip"

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`//import android.support.v4.app.Fragment;`
`7`	`7`	`import androidx.fragment.app.Fragment;`
`8`	`8`	`//import android.support.v4.app.FragmentActivity;`
	`9`	`+import androidx.activity.EdgeToEdge;`
`9`	`10`	`import androidx.fragment.app.FragmentActivity;`
`10`	`11`	`//import android.support.v4.app.FragmentManager;`
`11`	`12`	`import androidx.fragment.app.FragmentManager;`
`@@ -59,6 +60,7 @@ public void onCreate(Bundle savedInstanceState) {`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`
	`63`	`+ EdgeToEdge.enable(this);`
`62`	`64`	`super.onCreate(savedInstanceState);`
`63`	`65`	`setContentView(R.layout.activity_wizard);`
`64`	`66`