Added koin, databinding and navigation components

Converted App class and Main activity to Kotlin. With that refactored fields within App class to allow lazy initialization

BEWARE: at this point the navigation is very much broken, won't let you anywhere beyond home screen

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java

@@ -1,193 +0,0 @@
-package com.topjohnwu.magisk.ui;
-
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.google.android.material.navigation.NavigationView;
-import com.topjohnwu.magisk.ClassMap;
-import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.ui.base.BaseActivity;
-import com.topjohnwu.magisk.ui.hide.MagiskHideFragment;
-import com.topjohnwu.magisk.ui.home.MagiskFragment;
-import com.topjohnwu.magisk.ui.log.LogFragment;
-import com.topjohnwu.magisk.ui.module.ModulesFragment;
-import com.topjohnwu.magisk.ui.module.ReposFragment;
-import com.topjohnwu.magisk.ui.settings.SettingsFragment;
-import com.topjohnwu.magisk.ui.superuser.SuperuserFragment;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.net.Networking;
-import com.topjohnwu.superuser.Shell;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.widget.Toolbar;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import butterknife.BindView;
-
-public class MainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
-
-    private final Handler mDrawerHandler = new Handler();
-    private int mDrawerItem;
-    private static boolean fromShortcut = false;
-
-    @BindView(R.id.toolbar) public Toolbar toolbar;
-    @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.nav_view) NavigationView navigationView;
-
-    private float toolbarElevation;
-
-    @Override
-    public int getDarkTheme() {
-        return R.style.AppTheme_Dark;
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        if (!SplashActivity.DONE) {
-            startActivity(new Intent(this, ClassMap.get(SplashActivity.class)));
-            finish();
-        }
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        new MainActivity_ViewBinding(this);
-        checkHideSection();
-        setSupportActionBar(toolbar);
-
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.magisk, R.string.magisk) {
-            @Override
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                super.onDrawerSlide(drawerView, 0); // this disables the arrow @ completed tate
-            }
-
-            @Override
-            public void onDrawerSlide(View drawerView, float slideOffset) {
-                super.onDrawerSlide(drawerView, 0); // this disables the animation
-            }
-        };
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            toolbarElevation = toolbar.getElevation();
-        }
-
-        drawer.addDrawerListener(toggle);
-        toggle.syncState();
-
-        if (savedInstanceState == null) {
-            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
-            fromShortcut = section != null;
-            navigate(section);
-        }
-
-        navigationView.setNavigationItemSelectedListener(this);
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (drawer.isDrawerOpen(navigationView)) {
-            drawer.closeDrawer(navigationView);
-        } else if (mDrawerItem != R.id.magisk && !fromShortcut) {
-            navigate(R.id.magisk);
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    public boolean onNavigationItemSelected(@NonNull final MenuItem menuItem) {
-        mDrawerHandler.removeCallbacksAndMessages(null);
-        mDrawerHandler.postDelayed(() -> navigate(menuItem.getItemId()), 250);
-        drawer.closeDrawer(navigationView);
-        return true;
-    }
-
-    public void checkHideSection() {
-        Menu menu = navigationView.getMenu();
-        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
-                (boolean) Config.get(Config.Key.MAGISKHIDE));
-        menu.findItem(R.id.modules).setVisible(Shell.rootAccess() && Config.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(Networking.checkNetworkStatus(this)
-                && Shell.rootAccess() && Config.magiskVersionCode >= 0);
-        menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(Utils.showSuperUser());
-    }
-
-    public void navigate(String item) {
-        int itemId = R.id.magisk;
-        if (item != null) {
-            switch (item) {
-                case "superuser":
-                    itemId = R.id.superuser;
-                    break;
-                case "modules":
-                    itemId = R.id.modules;
-                    break;
-                case "downloads":
-                    itemId = R.id.downloads;
-                    break;
-                case "magiskhide":
-                    itemId = R.id.magiskhide;
-                    break;
-                case "log":
-                    itemId = R.id.log;
-                    break;
-                case "settings":
-                    itemId = R.id.settings;
-                    break;
-            }
-        }
-        navigate(itemId);
-    }
-
-    public void navigate(int itemId) {
-        mDrawerItem = itemId;
-        navigationView.setCheckedItem(itemId);
-        switch (itemId) {
-            case R.id.magisk:
-                fromShortcut = false;
-                displayFragment(new MagiskFragment(), true);
-                break;
-            case R.id.superuser:
-                displayFragment(new SuperuserFragment(), true);
-                break;
-            case R.id.modules:
-                displayFragment(new ModulesFragment(), true);
-                break;
-            case R.id.downloads:
-                displayFragment(new ReposFragment(), true);
-                break;
-            case R.id.magiskhide:
-                displayFragment(new MagiskHideFragment(), true);
-                break;
-            case R.id.log:
-                displayFragment(new LogFragment(), false);
-                break;
-            case R.id.settings:
-                displayFragment(new SettingsFragment(), true);
-                break;
-        }
-    }
-
-    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
-        supportInvalidateOptionsMenu();
-        getSupportFragmentManager()
-                .beginTransaction()
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                .replace(R.id.content_frame, navFragment)
-                .commitNow();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            toolbar.setElevation(setElevation ? toolbarElevation : 0);
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -0,0 +1,166 @@
+package com.topjohnwu.magisk.ui
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.fragment.app.Fragment
+import com.google.android.material.navigation.NavigationView
+import com.topjohnwu.magisk.ClassMap
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ActivityMainBinding
+import com.topjohnwu.magisk.ui.base.MagiskActivity
+import com.topjohnwu.magisk.ui.hide.MagiskHideFragment
+import com.topjohnwu.magisk.ui.home.MagiskFragment
+import com.topjohnwu.magisk.ui.log.LogFragment
+import com.topjohnwu.magisk.ui.module.ModulesFragment
+import com.topjohnwu.magisk.ui.module.ReposFragment
+import com.topjohnwu.magisk.ui.settings.SettingsFragment
+import com.topjohnwu.magisk.ui.superuser.SuperuserFragment
+import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.net.Networking
+import com.topjohnwu.superuser.Shell
+import kotlinx.android.synthetic.main.toolbar.*
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>(),
+    NavigationView.OnNavigationItemSelectedListener {
+
+    override val layoutRes: Int = R.layout.activity_main
+    override val viewModel: MainViewModel by viewModel()
+    override val navHostId: Int = R.id.main_nav_host
+
+    private val mDrawerHandler = Handler()
+    private var mDrawerItem: Int = 0
+    private var toolbarElevation: Float = 0.toFloat()
+
+    /*override fun getDarkTheme(): Int {
+        return R.style.AppTheme_Dark
+    }*/
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (!SplashActivity.DONE) {
+            startActivity(Intent(this, ClassMap.get<Any>(SplashActivity::class.java)))
+            finish()
+        }
+
+        super.onCreate(savedInstanceState)
+        checkHideSection()
+        setSupportActionBar(toolbar)
+
+        val toggle = object :
+            ActionBarDrawerToggle(
+                this,
+                binding.drawerLayout,
+                toolbar,
+                R.string.magisk,
+                R.string.magisk
+            ) {
+            override fun onDrawerOpened(drawerView: View) {
+                super.onDrawerOpened(drawerView)
+                super.onDrawerSlide(drawerView, 0f) // this disables the arrow @ completed tate
+            }
+
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                super.onDrawerSlide(drawerView, 0f) // this disables the animation
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbarElevation = toolbar!!.elevation
+        }
+
+        binding.drawerLayout.addDrawerListener(toggle)
+        toggle.syncState()
+
+        if (savedInstanceState == null) {
+            val section = intent.getStringExtra(Const.Key.OPEN_SECTION)
+            fromShortcut = section != null
+            navigate(section)
+        }
+
+        binding.navView.setNavigationItemSelectedListener(this)
+    }
+
+    override fun onBackPressed() {
+        if (binding.drawerLayout.isDrawerOpen(binding.navView)) {
+            binding.drawerLayout.closeDrawer(binding.navView)
+        } else if (mDrawerItem != R.id.magisk && !fromShortcut) {
+            navigate(R.id.magisk)
+        } else {
+            finish()
+        }
+    }
+
+    override fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
+        mDrawerHandler.removeCallbacksAndMessages(null)
+        mDrawerHandler.postDelayed({ navigate(menuItem.itemId) }, 250)
+        binding.drawerLayout.closeDrawer(binding.navView)
+        return true
+    }
+
+    fun checkHideSection() {
+        val menu = binding.navView.menu
+        menu.findItem(R.id.magiskhide).isVisible =
+            Shell.rootAccess() && Config.get<Any>(Config.Key.MAGISKHIDE) as Boolean
+        menu.findItem(R.id.modules).isVisible = Shell.rootAccess() && Config.magiskVersionCode >= 0
+        menu.findItem(R.id.downloads).isVisible = (Networking.checkNetworkStatus(this)
+                && Shell.rootAccess() && Config.magiskVersionCode >= 0)
+        menu.findItem(R.id.log).isVisible = Shell.rootAccess()
+        menu.findItem(R.id.superuser).isVisible = Utils.showSuperUser()
+    }
+
+    fun navigate(item: String?) {
+        var itemId = R.id.magisk
+        if (item != null) {
+            when (item) {
+                "superuser" -> itemId = R.id.superuser
+                "modules" -> itemId = R.id.modules
+                "downloads" -> itemId = R.id.downloads
+                "magiskhide" -> itemId = R.id.magiskhide
+                "log" -> itemId = R.id.log
+                "settings" -> itemId = R.id.settings
+            }
+        }
+        navigate(itemId)
+    }
+
+    fun navigate(itemId: Int) {
+        mDrawerItem = itemId
+        binding.navView.setCheckedItem(itemId)
+        when (itemId) {
+            R.id.magisk -> {
+                fromShortcut = false
+                displayFragment(MagiskFragment(), true)
+            }
+            R.id.superuser -> displayFragment(SuperuserFragment(), true)
+            R.id.modules -> displayFragment(ModulesFragment(), true)
+            R.id.downloads -> displayFragment(ReposFragment(), true)
+            R.id.magiskhide -> displayFragment(MagiskHideFragment(), true)
+            R.id.log -> displayFragment(LogFragment(), false)
+            R.id.settings -> displayFragment(SettingsFragment(), true)
+        }
+    }
+
+    @Deprecated("")
+    private fun displayFragment(navFragment: Fragment, setElevation: Boolean) {
+        /*supportInvalidateOptionsMenu();
+        getSupportFragmentManager()
+                .beginTransaction()
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .replace(R.id.content_frame, navFragment)
+                .commitNow();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbar.setElevation(setElevation ? toolbarElevation : 0);
+        }*/
+    }
+
+    companion object {
+        private var fromShortcut = false
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt

@@ -0,0 +1,6 @@
+package com.topjohnwu.magisk.ui
+
+import com.topjohnwu.magisk.ui.base.MagiskViewModel
+
+
+class MainViewModel : MagiskViewModel()

app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java

@@ -153,7 +153,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
         if (TextUtils.equals(name, getPackageName() + "_preferences"))
-            return app.prefs;
+            return app.getPrefs();
         return super.getSharedPreferences(name, mode);
     }
 }

app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java

@@ -28,14 +28,14 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = super.onCreateView(inflater, container, savedInstanceState);
-        app.prefs.registerOnSharedPreferenceChangeListener(this);
+        app.getPrefs().registerOnSharedPreferenceChangeListener(this);
         Event.register(this);
         return v;
     }
 
     @Override
     public void onDestroyView() {
-        app.prefs.unregisterOnSharedPreferenceChangeListener(this);
+        app.getPrefs().unregisterOnSharedPreferenceChangeListener(this);
         Event.unregister(this);
         super.onDestroyView();
     }

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt

@@ -0,0 +1,8 @@
+package com.topjohnwu.magisk.ui.base
+
+import androidx.databinding.ViewDataBinding
+import com.skoumal.teanity.view.TeanityActivity
+
+
+abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+    TeanityActivity<ViewModel, Binding>()

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskFragment.kt

@@ -0,0 +1,8 @@
+package com.topjohnwu.magisk.ui.base
+
+import androidx.databinding.ViewDataBinding
+import com.skoumal.teanity.view.TeanityFragment
+
+
+abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+    TeanityFragment<ViewModel, Binding>()

app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskViewModel.kt

@@ -0,0 +1,6 @@
+package com.topjohnwu.magisk.ui.base
+
+import com.skoumal.teanity.viewmodel.TeanityViewModel
+
+
+abstract class MagiskViewModel : TeanityViewModel()

app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.ui.log;
 
 
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,7 +9,6 @@ import android.view.ViewGroup;
 import com.google.android.material.tabs.TabLayout;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.model.adapters.TabFragmentAdapter;
-import com.topjohnwu.magisk.ui.MainActivity;
 import com.topjohnwu.magisk.ui.base.BaseFragment;
 
 import androidx.viewpager.widget.ViewPager;
@@ -28,9 +26,9 @@ public class LogFragment extends BaseFragment {
         View v = inflater.inflate(R.layout.fragment_log, container, false);
         unbinder = new LogFragment_ViewBinding(this, v);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             ((MainActivity) requireActivity()).toolbar.setElevation(0);
-        }
+        }*/
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 

app/src/main/java/com/topjohnwu/magisk/ui/log/SuLogFragment.java

@@ -42,7 +42,7 @@ public class SuLogFragment extends BaseFragment {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_su_log, container, false);
         unbinder = new SuLogFragment_ViewBinding(this, v);
-        adapter = new SuLogAdapter(app.mDB);
+        adapter = new SuLogAdapter(app.getDB());
         recyclerView.setAdapter(adapter);
 
         updateList();
@@ -69,7 +69,7 @@ public class SuLogFragment extends BaseFragment {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                app.mDB.clearLogs();
+                app.getDB().clearLogs();
                 updateList();
                 return true;
             default:

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java

@@ -46,7 +46,7 @@ public class SettingsFragment extends BasePreferenceFragment {
         requireActivity().setTitle(R.string.settings);
 
         boolean showSuperuser = Utils.showSuperUser();
-        app.prefs.edit()
+        app.getPrefs().edit()
                 .putBoolean(Config.Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
                 .apply();
 
@@ -66,7 +66,7 @@ public class SettingsFragment extends BasePreferenceFragment {
             return true;
         });
         findPreference("clear").setOnPreferenceClickListener(pref -> {
-            app.prefs.edit().remove(Config.Key.ETAG_KEY).apply();
+            app.getPrefs().edit().remove(Config.Key.ETAG_KEY).apply();
             app.repoDB.clearRepo();
             Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
             return true;
@@ -94,7 +94,7 @@ public class SettingsFragment extends BasePreferenceFragment {
             if (channel == Config.Value.CUSTOM_CHANNEL) {
                 View v = LayoutInflater.from(requireActivity()).inflate(R.layout.custom_channel_dialog, null);
                 EditText url = v.findViewById(R.id.custom_url);
-                url.setText(app.prefs.getString(Config.Key.CUSTOM_CHANNEL, ""));
+                url.setText(app.getPrefs().getString(Config.Key.CUSTOM_CHANNEL, ""));
                 new AlertDialog.Builder(requireActivity())
                         .setTitle(R.string.settings_update_custom)
                         .setView(v)
@@ -183,7 +183,7 @@ public class SettingsFragment extends BasePreferenceFragment {
             case Config.Key.ROOT_ACCESS:
             case Config.Key.SU_MULTIUSER_MODE:
             case Config.Key.SU_MNT_NS:
-                app.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
+                app.getDB().setSettings(key, Utils.getPrefsInt(prefs, key));
                 break;
             case Config.Key.DARK_THEME:
                 requireActivity().recreate();

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.java

@@ -48,13 +48,13 @@ public class SuperuserFragment extends BaseFragment {
     }
 
     private void displayPolicyList() {
-        List<Policy> policyList = app.mDB.getPolicyList();
+        List<Policy> policyList = app.getDB().getPolicyList();
 
         if (policyList.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, app.mDB, pm));
+            recyclerView.setAdapter(new PolicyAdapter(policyList, app.getDB(), pm));
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java

@@ -107,8 +107,8 @@ public class SuRequestActivity extends BaseActivity {
             };
             Bundle bundle = connector.readSocketInput();
             int uid = Integer.parseInt(bundle.getString("uid"));
-            app.mDB.clearOutdated();
-            policy = app.mDB.getPolicy(uid);
+            app.getDB().clearOutdated();
+            policy = app.getDB().getPolicy(uid);
             if (policy == null) {
                 policy = new Policy(uid, getPackageManager());
             }
@@ -136,7 +136,7 @@ public class SuRequestActivity extends BaseActivity {
                 if (time >= 0) {
                     policy.until = (time == 0) ? 0
                             : (System.currentTimeMillis() / 1000 + time * 60);
-                    app.mDB.updatePolicy(policy);
+                    app.getDB().updatePolicy(policy);
                 }
                 handleAction();
             }