Migrate support libraries to AndroidX.

oeffi/AndroidManifest.xml

@@ -63,7 +63,7 @@
         <activity android:name=".AboutActivity" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="de.schildbach.oeffi"
             android:exported="false"
             android:grantUriPermissions="true" >

oeffi/build.gradle

@@ -4,15 +4,16 @@ apply plugin: 'androidsvgdrawable'
 configurations {
     all*.exclude group: 'org.json', module: 'json'
     all*.exclude group: 'net.sf.kxml', module: 'kxml2'
-    all*.exclude group: 'android.arch.lifecycle', module: 'runtime'
+    all*.exclude group: 'androidx.legacy', module: 'legacy-support-core-ui'
+    all*.exclude group: 'androidx.lifecycle', module: 'lifecycle-runtime'
 }
 
 dependencies {
     compile project(':enabler')
     compile 'de.schildbach.wallet:integration-android:2.0'
-    compile 'com.android.support:support-annotations:28.0.0'
+    compile 'androidx.annotation:annotation:1.0.0'
-    compile 'com.android.support:recyclerview-v7:28.0.0'
+    compile 'androidx.recyclerview:recyclerview:1.0.0'
-    compile 'com.android.support:drawerlayout:28.0.0'
+    compile 'androidx.drawerlayout:drawerlayout:1.0.0'
     compile 'com.squareup.okhttp3:okhttp:3.11.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.11.0'
     compile 'com.google.guava:guava:26.0-android'

oeffi/proguard.cfg

@@ -44,8 +44,8 @@
 }
 
 # android-support
--dontwarn android.support.**
+-dontwarn androidx.core.**
--dontnote android.support.**
+-dontnote androidx.core.**
 
 # OkHttp
 -dontwarn okio.DeflaterSink

oeffi/res/layout/directions_content.xml

@@ -5,7 +5,7 @@
     android:baselineAligned="false"
     android:orientation="horizontal" >
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/navigation_drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -47,7 +47,7 @@
                 android:foreground="@drawable/view_shadow_bottom"
                 android:foregroundGravity="top|fill_horizontal" >
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@android:id/list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
@@ -86,7 +86,7 @@
         </LinearLayout>
 
         <include layout="@layout/navigation_drawer" />
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
     <FrameLayout
         android:id="@+id/directions_map_fragment"

oeffi/res/layout/favorites_content.xml

@@ -13,7 +13,7 @@
         android:foreground="@drawable/view_shadow_bottom"
         android:foregroundGravity="top|fill_horizontal" >
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/favorites_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

oeffi/res/layout/navigation_drawer.xml

@@ -7,7 +7,7 @@
     android:clickable="true"
     android:orientation="vertical" >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/navigation_drawer_list"
         android:layout_width="match_parent"
         android:layout_height="0px"

oeffi/res/layout/network_picker_content.xml

@@ -54,7 +54,7 @@
                             android:foreground="@drawable/view_shadow_top"
                             android:foregroundGravity="bottom|fill_horizontal" >
 
-                            <android.support.v7.widget.RecyclerView
+                            <androidx.recyclerview.widget.RecyclerView
                                 android:id="@android:id/list"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent" />

oeffi/res/layout/plans_picker_content.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/navigation_drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -74,7 +74,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1" >
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@android:id/list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
@@ -94,4 +94,4 @@
 
     <include layout="@layout/navigation_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

oeffi/res/layout/stations_content.xml

@@ -5,7 +5,7 @@
     android:baselineAligned="false"
     android:orientation="horizontal" >
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/navigation_drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -113,7 +113,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1" >
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/stations_list"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -396,7 +396,7 @@
         </LinearLayout>
 
         <include layout="@layout/navigation_drawer" />
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
     <FrameLayout
         android:id="@+id/stations_map_fragment"

oeffi/res/layout/stations_station_details_content.xml

@@ -24,7 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/stations_station_details_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java

@@ -72,9 +72,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.format.DateUtils;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -83,6 +80,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.PopupMenu;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.HttpUrl;

oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java

@@ -111,10 +111,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
 import android.provider.ContactsContract.CommonDataKinds;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.view.KeyEvent;
@@ -135,6 +131,10 @@ import android.widget.Filterable;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.TimePicker;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.HttpUrl;
 
 public class DirectionsActivity extends OeffiMainActivity implements ActivityCompat.OnRequestPermissionsResultCallback,

oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java

@@ -60,8 +60,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import okhttp3.HttpUrl;
 
 public class DirectionsShortcutActivity extends OeffiActivity

oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java

@@ -79,7 +79,6 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.CalendarContract;
-import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
@@ -98,6 +97,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TableLayout;
 import android.widget.TextView;
+import androidx.core.content.ContextCompat;
 
 public class TripDetailsActivity extends OeffiActivity implements LocationListener, LocationAware {
     private static final String INTENT_EXTRA_NETWORK = TripDetailsActivity.class.getName() + ".network";

oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryAdapter.java

@@ -31,9 +31,9 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class QueryHistoryAdapter extends RecyclerView.Adapter<QueryHistoryViewHolder> {
     private final Context context;

oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryViewHolder.java

@@ -27,7 +27,6 @@ import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -37,6 +36,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class QueryHistoryViewHolder extends RecyclerView.ViewHolder {
     private final Context context;

oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java

@@ -71,15 +71,15 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class NetworkPickerActivity extends Activity implements ActivityCompat.OnRequestPermissionsResultCallback,
         LocationHelper.Callback, NetworkClickListener, NetworkContextMenuItemListener {

oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java

@@ -24,13 +24,13 @@ import de.schildbach.oeffi.network.NetworkResources;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class NetworkViewHolder extends RecyclerView.ViewHolder {
     private final Context context;

oeffi/src/de/schildbach/oeffi/network/list/NetworksAdapter.java

@@ -26,9 +26,9 @@ import de.schildbach.oeffi.stations.NetworkContentProvider;
 import de.schildbach.pte.NetworkId;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class NetworksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final Context context;

oeffi/src/de/schildbach/oeffi/network/list/SeparatorViewHolder.java

@@ -17,9 +17,9 @@
 
 package de.schildbach.oeffi.network.list;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class SeparatorViewHolder extends RecyclerView.ViewHolder {
     private final TextView textView;

oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java

@@ -58,16 +58,16 @@ import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Cache;
 import okhttp3.HttpUrl;
 

oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java

@@ -26,7 +26,6 @@ import de.schildbach.oeffi.network.NetworkResources;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView;
 import android.text.format.DateFormat;
 import android.view.MenuItem;
 import android.view.View;
@@ -38,6 +37,7 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Call;
 
 public class PlanViewHolder extends RecyclerView.ViewHolder {

oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java

@@ -38,9 +38,9 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Cache;
 import okhttp3.Call;
 import okhttp3.Callback;

oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java

@@ -39,11 +39,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ViewAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class FavoriteStationsActivity extends OeffiActivity
         implements StationClickListener, StationContextMenuItemListener {

oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java

@@ -62,11 +62,11 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
-import android.support.v4.app.JobIntentService;
-import android.support.v4.content.ContextCompat;
 import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.RemoteViews;
+import androidx.core.app.JobIntentService;
+import androidx.core.content.ContextCompat;
 
 public class NearestFavoriteStationWidgetService extends JobIntentService {
     private AppWidgetManager appWidgetManager;

oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java

@@ -39,9 +39,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -49,6 +46,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.PopupMenu;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
 
 public class StationContextMenu extends PopupMenu {
     public StationContextMenu(final Context context, final View anchor, final NetworkId network, final Location station,

oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java

@@ -75,8 +75,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
@@ -87,6 +85,8 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class StationDetailsActivity extends OeffiActivity implements StationsAware {
     private static final String INTENT_EXTRA_NETWORK = StationDetailsActivity.class.getName() + ".network";

oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java

@@ -112,11 +112,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.format.DateUtils;
 import android.view.MenuItem;
 import android.view.View;
@@ -126,6 +121,11 @@ import android.widget.Button;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.HttpUrl;
 
 public class StationsActivity extends OeffiMainActivity implements StationsAware, LocationAware,

oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationViewHolder.java

@@ -26,13 +26,13 @@ import de.schildbach.pte.dto.Location;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class FavoriteStationViewHolder extends RecyclerView.ViewHolder {
     private final Context context;

oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java

@@ -29,9 +29,9 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class FavoriteStationsAdapter extends RecyclerView.Adapter<FavoriteStationViewHolder> {
     private final Context context;

oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java

@@ -55,7 +55,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.v7.widget.RecyclerView;
 import android.text.format.DateUtils;
 import android.view.Display;
 import android.view.LayoutInflater;
@@ -67,6 +66,7 @@ import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class StationViewHolder extends RecyclerView.ViewHolder {
     public final View favoriteView;

oeffi/src/de/schildbach/oeffi/stations/list/StationsAdapter.java

@@ -30,10 +30,10 @@ import de.schildbach.pte.NetworkId;
 import de.schildbach.pte.dto.Product;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class StationsAdapter extends RecyclerView.Adapter<StationViewHolder> implements CompassNeedleView.Callback {
     private final Context context;

oeffi/src/de/schildbach/oeffi/util/DividerItemDecoration.java

@@ -21,9 +21,9 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {
     private static final int[] ATTRS = new int[] { android.R.attr.listDivider };

oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java

@@ -60,8 +60,8 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.StatFs;
-import android.support.v4.app.ActivityManagerCompat;
+import androidx.core.app.ActivityManagerCompat;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.HttpUrl;

oeffi/src/de/schildbach/oeffi/util/NavigationMenuAdapter.java

@@ -30,7 +30,6 @@ import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v7.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.ActionProvider;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -43,6 +42,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class NavigationMenuAdapter extends RecyclerView.Adapter<NavigationMenuAdapter.ViewHolder> {
     private final Resources res;