Convert most fragments/activities to androidx

1 files changed, 10 insertions, 18 deletions

diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
index f7c46d01..2a6a0fff 100644
--- a/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
@@ -6,19 +6,14 @@
 package de.blinkt.openvpn.activities;
 
 import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.support.v4n.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.viewpager.widget.ViewPager;
+
 import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.fragments.AboutFragment;
 import de.blinkt.openvpn.fragments.FaqFragment;
@@ -28,16 +23,13 @@ import de.blinkt.openvpn.fragments.LogFragment;
 import de.blinkt.openvpn.fragments.SendDumpFragment;
 import de.blinkt.openvpn.fragments.VPNProfileList;
 import de.blinkt.openvpn.views.ScreenSlidePagerAdapter;
-import de.blinkt.openvpn.views.SlidingTabLayout;
-import de.blinkt.openvpn.views.TabBarView;
 
 
 public class MainActivity extends BaseActivity {
 
     private ViewPager mPager;
     private ScreenSlidePagerAdapter mPagerAdapter;
-    private SlidingTabLayout mSlidingTabLayout;
-    private TabBarView mTabs;
+    //private TabLayout mTabs;
 
     protected void onCreate(android.os.Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -46,8 +38,8 @@ public class MainActivity extends BaseActivity {
 
 
         // Instantiate a ViewPager and a PagerAdapter.
-        mPager = (ViewPager) findViewById(R.id.pager);
-        mPagerAdapter = new ScreenSlidePagerAdapter(getFragmentManager(), this);
+        mPager = findViewById(R.id.pager);
+        mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager(), this);
 
         /* Toolbar and slider should have the same elevation */
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -72,8 +64,8 @@ public class MainActivity extends BaseActivity {
         mPagerAdapter.addTab(R.string.about, AboutFragment.class);
         mPager.setAdapter(mPagerAdapter);
 
-        mTabs = (TabBarView) findViewById(R.id.sliding_tabs);
-        mTabs.setViewPager(mPager);
+        //mTabs =  findViewById(R.id.sliding_tabs);
+        //mTabs.setViewPager(mPager);
     }
 
     private static final String FEATURE_TELEVISION = "android.hardware.type.television";
@@ -84,9 +76,9 @@ public class MainActivity extends BaseActivity {
                 || getPackageManager().hasSystemFeature(FEATURE_LEANBACK));
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+
     private void disableToolbarElevation() {
-        ActionBar toolbar = getActionBar();
+        ActionBar toolbar = getSupportActionBar();
         toolbar.setElevation(0);
     }