update android version and increment version code

app/build.gradle

@@ -9,6 +9,9 @@ repositories {
 android {
     namespace 'net.i2p.android.router'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
+    buildFeatures {
+        viewBinding true
+    }
     defaultConfig {
         versionCode Integer.parseInt(project.I2P_ANDROID_VERSION_CODE as String)
         versionName "$I2P_ANDROID_VERSION"
@@ -66,10 +69,10 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.appcompat:appcompat:1.7.1"
-    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.preference:preference:1.2.1"
-    implementation "androidx.annotation:annotation:1.5.0"
+    implementation "androidx.annotation:annotation:1.9.1"
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
     // Local dependencies
     implementation project(':lib:client')
     implementation project(':lib:helper')

app/proguard-rules.pro

@@ -27,3 +27,5 @@
 -keep class !android.support.v7.view.menu.**,** {*;}
 -dontwarn **
 -dontnote **
+
+-keep class net.i2p.android.client.util.SummaryEditTextPreference { *; }

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:sharedUserId="net.i2p">
 
     <uses-sdk xmlns:tools="http://schemas.android.com/tools"
-        tools:overrideLibrary="android.support.v14.preference" />
+        tools:overrideLibrary="androidx.preference" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/net/i2p/android/i2ptunnel/TunnelsContainer.java

@@ -107,10 +107,6 @@ public class TunnelsContainer extends Fragment implements
         mNewTunnel = v.findViewById(R.id.promoted_action);
         mNewTunnel.setVisibility(showActions() ? View.VISIBLE : View.GONE);
 
-        // Initialize ViewPager adapter
-        mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
-        mViewPager.setAdapter(mFragPagerAdapter);
-
         if (v.findViewById(R.id.detail_fragment) != null) {
             mTwoPane = true;
         }
@@ -122,8 +118,6 @@ public class TunnelsContainer extends Fragment implements
                     savedInstanceState, FRAGMENT_SERVER);
         }
 
-        setupMagicIndicator();
-
         return v;
     }
 

app/src/main/java/net/i2p/android/preferences/util/CustomPreferenceFragment.java

@@ -10,7 +10,7 @@ import androidx.preference.PreferenceFragmentCompat;
  */
 public abstract class CustomPreferenceFragment extends PreferenceFragmentCompat {
     private static final String DIALOG_FRAGMENT_TAG =
-            "android.support.v7.preference.PreferenceFragment.DIALOG";
+        "androidx.preference.PreferenceFragment.DIALOG";
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {

app/src/main/java/net/i2p/android/preferences/util/SummaryEditTextPreference.java

@@ -1,8 +1,9 @@
 package net.i2p.android.preferences.util;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 //import android.support.v7.preference.EditTextPreference;
-import android.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 public class SummaryEditTextPreference extends EditTextPreference {
@@ -15,8 +16,13 @@ public class SummaryEditTextPreference extends EditTextPreference {
         super(context, attrs);
     }
 
-    public SummaryEditTextPreference(Context context, AttributeSet attrs, int defStyle) {
+    public SummaryEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyle);
+        super(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(21)
+    public SummaryEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
     }
 
     @Override

app/src/main/res/layout/container_with_add_onepane.xml

@@ -4,12 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- The main content view -->
+    <LinearLayout
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true" />
+        android:orientation="vertical">
+
+        <net.lucode.hackware.magicindicator.MagicIndicator
+            android:id="@+id/magic_indicator"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/pager_indicator_height"
+            android:theme="@style/MagicIndicator" />
+
+        <!-- The main content view -->
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
 
     <net.i2p.android.ext.floatingactionbutton.AddFloatingActionButton
         android:id="@+id/promoted_action"

app/src/main/res/layout/fragment_graph.xml

@@ -6,14 +6,10 @@
 
     <com.androidplot.xy.XYPlot
         android:id="@+id/rate_stat_plot"
-        androidPlot.graphWidget.domainLabelPaint.textSize="@dimen/graph_domain_tick_label_font_size"
-        androidPlot.graphWidget.domainOriginLabelPaint.textSize="@dimen/graph_domain_tick_label_font_size"
         androidPlot.graphWidget.marginBottom="20dp"
         androidPlot.graphWidget.marginLeft="20dp"
         androidPlot.graphWidget.marginRight="10dp"
         androidPlot.graphWidget.marginTop="11dp"
-        androidPlot.graphWidget.rangeLabelPaint.textSize="@dimen/graph_range_tick_label_font_size"
-        androidPlot.graphWidget.rangeOriginLabelPaint.textSize="@dimen/graph_range_tick_label_font_size"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </LinearLayout>

gradle.properties

@@ -14,8 +14,8 @@
 ANDROID_BUILD_SDK_VERSION=35
 ANDROID_BUILD_TARGET_SDK_VERSION=35
 GROUP=net.i2p.android
-I2P_ANDROID_VERSION=2.10.0
+I2P_ANDROID_VERSION=2.10.1
-I2P_ANDROID_VERSION_CODE=4745296
+I2P_ANDROID_VERSION_CODE=4745297
 I2P_VERSION=2.10.0-1
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 POM_DEVELOPER_ID=idk