Release new canary build

Fix #8457

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,21 +1,22 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
+<!--
+
 ## READ BEFORE OPENING ISSUES
 
-All bug reports require you to **USE CANARY BUILDS**. Please include the version name and version code in the bug report.
+All bug reports require you to **USE DEBUG BUILDS**. Please include the version name and version code in the bug report.
 
-If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT ROOT**.
+If you experience a bootloop, attach a `dmesg` (kernel logs) when the device refuse to boot. This may very likely require a custom kernel on some devices as `last_kmsg` or `pstore ramoops` are usually not enabled by default. In addition, please also upload the result of `cat /proc/mounts` when your device is working correctly **WITHOUT MAGISK**.
 
-If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk Manager, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
+If you experience issues during installation, in recovery, upload the recovery logs, or in Magisk, upload the install logs. Please also upload the `boot.img` or `recovery.img` that you are using for patching.
 
-If you experience a crash of Magisk Manager, dump the full `logcat` **when the crash happens**. **DO NOT** upload `magisk.log`.
+If you experience a crash of Magisk app, dump the full `logcat` **when the crash happens**.
 
 If you experience other issues related to Magisk, upload `magisk.log`, and preferably also include a boot `logcat` (start dumping `logcat` when the device boots up)
 
@@ -26,3 +27,10 @@ If you experience other issues related to Magisk, upload `magisk.log`, and prefe
 **DO NOT** report issues if you have any modules installed.
 
 Without following the rules above, your issue will be closed without explanation.
+
+-->
+
+Device:
+Android version:
+Magisk version name:
+Magisk version code:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: XDA Community Support
+    url: https://forum.xda-developers.com/f/magisk.5903/
+    about: Please ask and answer questions here.
+

.github/actions/setup/action.yml

@@ -0,0 +1,100 @@
+name: Magisk Setup
+inputs:
+  is-asset-build:
+    required: false
+    default: false
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        distribution: "temurin"
+        java-version: "21"
+
+    - name: Set up Python 3
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.x"
+
+    - name: Install GNU make
+      if: runner.os == 'macOS'
+      shell: bash
+      run: |
+        brew install make
+        echo 'GNUMAKE=gmake' >> "$GITHUB_ENV"
+
+    - name: Cache sccache
+      uses: actions/cache@v4
+      with:
+        path: .sccache
+        key: sccache-${{ runner.os }}-${{ github.sha }}
+        restore-keys: sccache-${{ runner.os }}-
+
+    - name: Set up sccache
+      shell: bash
+      env:
+        SCCACHE_DIRECT: false
+        SCCACHE_DIR: ${{ github.workspace }}/.sccache
+        SCCACHE_CACHE_SIZE: 2G
+        SCCACHE_IDLE_TIMEOUT: 0
+      run: |
+        bash $GITHUB_ACTION_PATH/sccache.sh
+        sccache --start-server
+        sccache -z
+
+    - name: Show sccache stats
+      uses: gacts/run-and-post-run@v1
+      with:
+        run: sccache -s
+        post: sccache -s
+
+    - name: Set GRADLE_USER_HOME
+      shell: bash
+      run: echo "GRADLE_USER_HOME=$GITHUB_WORKSPACE/.gradle" >> "$GITHUB_ENV"
+
+    - name: Cache Gradle dependencies
+      uses: actions/cache@v4
+      if: inputs.is-asset-build == 'true'
+      with:
+        path: |
+          .gradle/caches
+          .gradle/wrapper
+          !.gradle/caches/build-cache-*
+        key: gradle-cache-${{ hashFiles('gradle/**') }}
+        restore-keys: gradle-cache-
+
+    - name: Restore Gradle dependencies
+      uses: actions/cache/restore@v4
+      if: inputs.is-asset-build == 'false'
+      with:
+        path: |
+          .gradle/caches
+          .gradle/wrapper
+          !.gradle/caches/build-cache-*
+        key: gradle-cache-${{ hashFiles('gradle/**') }}
+        restore-keys: gradle-cache-
+        enableCrossOsArchive: true
+
+    - name: Cache Gradle build cache
+      uses: actions/cache@v4
+      if: inputs.is-asset-build == 'true'
+      with:
+        path: |
+          .gradle/caches/build-cache-*
+        key: gradle-build-cache-${{ github.sha }}
+        restore-keys: gradle-build-cache-
+
+    - name: Restore Gradle build cache
+      uses: actions/cache/restore@v4
+      if: inputs.is-asset-build == 'false'
+      with:
+        path: |
+          .gradle/caches/build-cache-*
+        key: gradle-build-cache-${{ github.sha }}
+        restore-keys: gradle-build-cache-
+        enableCrossOsArchive: true
+
+    - name: Set up NDK
+      shell: bash
+      run: python build.py -v ndk

.github/actions/setup/sccache.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Get latest sccache version
+get_sccache_ver() {
+  curl -sL 'https://api.github.com/repos/mozilla/sccache/releases/latest' | jq -r .name
+}
+
+# $1=variant
+# $2=install_dir
+# $3=exe
+install_from_gh() {
+  local ver=$(curl -sL 'https://api.github.com/repos/mozilla/sccache/releases/latest' | jq -r .name)
+  local url="https://github.com/mozilla/sccache/releases/download/${ver}/sccache-${ver}-$1.tar.gz"
+  local dest="$2/$3"
+  curl -L "$url" | tar xz -O --wildcards "*/$3" > $dest
+  chmod +x $dest
+}
+
+if [ $RUNNER_OS = "macOS" ]; then
+  brew install sccache
+elif [ $RUNNER_OS = "Linux" ]; then
+  install_from_gh x86_64-unknown-linux-musl /usr/local/bin sccache
+elif [ $RUNNER_OS = "Windows" ]; then
+  install_from_gh x86_64-pc-windows-msvc $USERPROFILE/.cargo/bin sccache.exe
+fi

.github/ci.prop

@@ -0,0 +1 @@
+abiList=arm64-v8a

.github/workflows/build.yml

@@ -2,93 +2,204 @@ name: Magisk Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
     paths:
-      - 'app/**'
-      - 'native/**'
-      - 'stub/**'
-      - 'buildSrc/**'
-      - 'build.py'
-      - 'gradle.properties'
+      - "app/**"
+      - "native/**"
+      - "buildSrc/**"
+      - "build.py"
+      - "gradle.properties"
+      - ".github/workflows/build.yml"
   pull_request:
-    branches: [ master ]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build on ${{ matrix.os }}
+    name: Build Magisk artifacts
+    runs-on: macos-14
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Setup environment
+        uses: ./.github/actions/setup
+        with:
+          is-asset-build: true
+
+      - name: Build release
+        run: ./build.py -vr all
+
+      - name: Build debug
+        run: ./build.py -v all
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ github.sha }}
+          path: out
+          compression-level: 9
+
+      - name: Upload mapping and native debug symbols
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ github.sha }}-symbols
+          path: app/apk/build/outputs
+          compression-level: 9
+
+  test-build:
+    name: Test building on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
+        os: [windows-latest, ubuntu-latest]
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Setup environment
+        uses: ./.github/actions/setup
+
+      - name: Test build
+        run: python build.py -v -c .github/ci.prop all
+
+      - name: Stop gradle daemon
+        run: ./gradlew --stop
+
+  avd-test:
+    name: Test API ${{ matrix.version }} (x86_64)
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34]
+        type: [""]
+        include:
+          - version: 35
+            type: "google_apis"
 
     steps:
       - name: Check out
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-          fetch-depth: 0
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Set up GitHub env (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          $oldAndroidPath = $env:ANDROID_SDK_ROOT
-          $sdk_root = "C:\Android"
-          New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
-          $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
-          echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
-          echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
-          echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
-          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
-
-      - name: Set up GitHub env (Unix)
-        if: runner.os != 'Windows'
-        run: |
-          ndk_ver=$(sed -n 's/^magisk.fullNdkVersion=//p' gradle.properties)
-          echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
-          echo MAGISK_NDK_VERSION=$ndk_ver >> $GITHUB_ENV
-
-      - name: Cache Gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: ${{ runner.os }}-gradle-
-
-      - name: Cache NDK
-        id: ndk-cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.ANDROID_SDK_ROOT }}/ndk/magisk
-          key: ${{ runner.os }}-ndk-${{ env.MAGISK_NDK_VERSION }}
-
-      - name: Set up NDK
-        if: steps.ndk-cache.outputs.cache-hit != 'true'
-        run: python build.py ndk
-
-      - name: Build release
-        run: python build.py -vr all
-
-      - name: Build debug
-        run: python build.py -v all
-
-      # Only upload artifacts built on Linux
-      - name: Upload build artifact
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
         with:
           name: ${{ github.sha }}
           path: out
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Run AVD test
+        timeout-minutes: 10
+        env:
+          AVD_TEST_LOG: 1
+        run: scripts/avd_test.sh ${{ matrix.version }} ${{ matrix.type }}
+
+      - name: Upload logs on error
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: "avd-logs-${{ matrix.version }}"
+          path: |
+            kernel.log
+            logcat.log
+
+  avd-test-32:
+    name: Test API ${{ matrix.version }} (x86)
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [23, 24, 25, 26, 27, 28, 29, 30]
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ github.sha }}
+          path: out
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Run AVD test
+        timeout-minutes: 10
+        env:
+          FORCE_32_BIT: 1
+          AVD_TEST_LOG: 1
+        run: scripts/avd_test.sh ${{ matrix.version }}
+
+      - name: Upload logs on error
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: "avd32-logs-${{ matrix.version }}"
+          path: |
+            kernel.log
+            logcat.log
+
+  cf_test:
+    name: Test ${{ matrix.device }}
+    runs-on: ubuntu-24.04
+    needs: build
+    env:
+      CF_HOME: /home/runner/aosp_cf_phone
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - branch: "aosp-main"
+            device: "aosp_cf_x86_64_phone"
+          - branch: "aosp-main-throttled"
+            device: "aosp_cf_x86_64_phone_pgagnostic"
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ github.sha }}
+          path: out
+
+      - name: Setup Cuttlefish environment
+        run: |
+          scripts/cuttlefish.sh setup
+          scripts/cuttlefish.sh download ${{ matrix.branch }} ${{ matrix.device }}
+
+      - name: Run Cuttlefish test
+        timeout-minutes: 10
+        run: su $USER -c 'scripts/cuttlefish.sh test'
+
+      - name: Upload logs on error
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: "cvd-logs-${{ matrix.device }}"
+          path: |
+            /home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/logs
+            /home/runner/aosp_cf_phone/cuttlefish/instances/cvd-1/cuttlefish_config.json

.gitignore

@@ -3,7 +3,9 @@ out
 *.jks
 *.apk
 /config.prop
+/notes.md
 /update.sh
+/app/dict.txt
 
 # Built binaries
 native/out
@@ -11,7 +13,7 @@ native/out
 # Android Studio / Gradle
 *.iml
 .gradle
+.idea
 /local.properties
-/.idea
 /build
 /captures

.gitmodules

@@ -1,33 +1,36 @@
 [submodule "selinux"]
-	path = native/jni/external/selinux
+	path = native/src/external/selinux
 	url = https://github.com/topjohnwu/selinux.git
-[submodule "busybox"]
-	path = native/jni/external/busybox
-	url = https://github.com/topjohnwu/ndk-busybox.git
-[submodule "dtc"]
-	path = native/jni/external/dtc
-	url = https://github.com/dgibson/dtc
 [submodule "lz4"]
-	path = native/jni/external/lz4
+	path = native/src/external/lz4
 	url = https://github.com/lz4/lz4.git
 [submodule "bzip2"]
-	path = native/jni/external/bzip2
+	path = native/src/external/bzip2
 	url = https://github.com/nemequ/bzip2.git
 [submodule "xz"]
-	path = native/jni/external/xz
+	path = native/src/external/xz
 	url = https://github.com/xz-mirror/xz.git
-[submodule "nanopb"]
-	path = native/jni/external/nanopb
-	url = https://github.com/nanopb/nanopb.git
-[submodule "mincrypt"]
-	path = native/jni/external/mincrypt
-	url = https://github.com/topjohnwu/mincrypt.git
-[submodule "pcre"]
-	path = native/jni/external/pcre
-	url = https://android.googlesource.com/platform/external/pcre
-[submodule "xhook"]
-	path = native/jni/external/xhook
-	url = https://github.com/iqiyi/xHook.git
+[submodule "libcxx"]
+	path = native/src/external/libcxx
+	url = https://github.com/topjohnwu/libcxx.git
+[submodule "zlib"]
+	path = native/src/external/zlib
+	url = https://android.googlesource.com/platform/external/zlib
+[submodule "zopfli"]
+	path = native/src/external/zopfli
+	url = https://github.com/google/zopfli.git
+[submodule "cxx-rs"]
+	path = native/src/external/cxx-rs
+	url = https://github.com/topjohnwu/cxx.git
+[submodule "lsplt"]
+	path = native/src/external/lsplt
+	url = https://github.com/LSPosed/LSPlt.git
+[submodule "system_properties"]
+	path = native/src/external/system_properties
+	url = https://github.com/topjohnwu/system_properties.git
+[submodule "crt0"]
+	path = native/src/external/crt0
+	url = https://github.com/topjohnwu/crt0.git
 [submodule "termux-elf-cleaner"]
 	path = tools/termux-elf-cleaner
 	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -1,75 +1,50 @@
 ![](docs/images/logo.png)
 
-![ZIP Downloads](https://img.shields.io/badge/dynamic/json?color=blue&label=ZIP%20Downloads&query=magisk&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
-![APK Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=APK%20Downloads&query=manager&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk_files%2Fcount%2Fcount.json&cacheSeconds=1800)
+[![Downloads](https://img.shields.io/badge/dynamic/json?color=green&label=Downloads&query=totalString&url=https%3A%2F%2Fraw.githubusercontent.com%2Ftopjohnwu%2Fmagisk-files%2Fcount%2Fcount.json&cacheSeconds=1800)](https://raw.githubusercontent.com/topjohnwu/magisk-files/count/count.json)
+
+#### This is not an officially supported Google product
 
 ## Introduction
 
-Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 4.2. It covers fundamental parts of Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+Magisk is a suite of open source software for customizing Android, supporting devices higher than Android 6.0.<br>
+Some highlight features:
 
-Here are some feature highlights:
-
-- **MagiskSU**: Provide root access to your device
+- **MagiskSU**: Provide root access for applications
 - **Magisk Modules**: Modify read-only partitions by installing modules
-- **MagiskHide**: Hide Magisk from root detections / system integrity checks
+- **MagiskBoot**: The most complete tool for unpacking and repacking Android boot images
+- **Zygisk**: Run code in every Android applications' processes
 
 ## Downloads
 
-[![](https://img.shields.io/badge/Magisk%20Manager-v8.0.6-green)](https://github.com/topjohnwu/Magisk/releases/download/manager-v8.0.6/MagiskManager-v8.0.6.apk)
-[![](https://img.shields.io/badge/Magisk%20Manager-Canary-red)](https://raw.githubusercontent.com/topjohnwu/magisk_files/canary/app-debug.apk)
-<br>
-[![](https://img.shields.io/badge/Magisk-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
-[![](https://img.shields.io/badge/Magisk%20Beta-v21.3-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v21.3)
+[Github](https://github.com/topjohnwu/Magisk/) is the only source where you can get official Magisk information and downloads.
+
+Click the icon below to download Magisk apk.
+
+[![](https://img.shields.io/badge/Magisk-v27.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v27.0)
+[![](https://img.shields.io/badge/Magisk%20Beta-v28.0-blue)](https://github.com/topjohnwu/Magisk/releases/tag/v28.0)
+[![](https://img.shields.io/badge/Magisk-Canary-red)](https://github.com/topjohnwu/Magisk/releases/tag/canary-28002)
 
 ## Useful Links
 
 - [Installation Instruction](https://topjohnwu.github.io/Magisk/install.html)
-- [Frequently Asked Questions](https://topjohnwu.github.io/Magisk/faq.html)
+- [Building and Development](https://topjohnwu.github.io/Magisk/build.html)
 - [Magisk Documentation](https://topjohnwu.github.io/Magisk/)
-- [Magisk Troubleshoot Wiki](https://www.didgeridoohan.com/magisk/HomePage) (by [@Didgeridoohan](https://github.com/Didgeridoohan))
-
-## Android Version Support
-
-- Android 4.2+: MagiskSU and Magisk Modules Only
-- Android 4.4+: All core features available
-- Android 6.0+: Guaranteed MagiskHide support
-- Android 7.0+: Full MagiskHide protection
-- Android 9.0+: Magisk Manager stealth mode
+- [Zygisk module sample](https://github.com/topjohnwu/zygisk-module-sample)
 
 ## Bug Reports
 
-Canary Channels are cutting edge builds for those adventurous. To access canary builds, install the Canary Magisk Manager, switch to the Canary Channel in settings and upgrade.
-
-**Only bug reports from Canary builds will be accepted.**
+**Only bug reports from Debug builds will be accepted.**
 
 For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
-For Magisk Manager crashes, record and upload the logcat when the crash occurs.
-
-## Building and Development
-
-- Magisk builds on any OS Android Studio supports. Install Android Studio and do the initial setups.
-- Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
-- Install Python 3.6+ \
-(Windows only: select **'Add Python to PATH'** in installer, and run `pip install colorama` after install)
-- Configure to use the JDK bundled in Android Studio:
-	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
-	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
-	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
-- Set environment variable `ANDROID_SDK_ROOT` to the Android SDK folder (can be found in Android Studio settings)
-- Run `./build.py ndk` to let the script download and install NDK for you
-- To start building, run `build.py` to see your options. \
-For each action, use `-h` to access help (e.g. `./build.py all -h`)
-- To start development, open the project in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
-- Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
-- To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
+For Magisk app crashes, record and upload the logcat when the crash occurs.
 
 ## Translation Contributions
 
-Default string resources for Magisk Manager and its stub APK are located here:
+Default string resources for the Magisk app and its stub APK are located here:
 
-- `app/src/main/res/values/strings.xml`
-- `stub/src/main/res/values/strings.xml`
+- `app/core/src/main/res/values/strings.xml`
+- `app/stub/src/main/res/values/strings.xml`
 
 Translate each and place them in the respective locations (`[module]/src/main/res/values-[lang]/strings.xml`).
 

app/.gitignore

@@ -1,11 +0,0 @@
-*.iml
-.gradle
-/local.properties
-.idea/
-/build
-app/release
-*.hprof
-.externalNativeBuild/
-public.certificate.x509.pem
-private.key.pk8
-*.apk

app/apk/build.gradle.kts

@@ -0,0 +1,59 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("plugin.parcelize")
+    kotlin("kapt")
+    id("androidx.navigation.safeargs.kotlin")
+}
+
+setupMainApk()
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", "1000")
+    }
+}
+
+android {
+    buildFeatures {
+        dataBinding = true
+    }
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            isShrinkResources = true
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":app:core"))
+    coreLibraryDesugaring(libs.jdk.libs)
+
+    implementation(libs.indeterminate.checkbox)
+    implementation(libs.rikka.layoutinflater)
+    implementation(libs.rikka.insets)
+    implementation(libs.rikka.recyclerview)
+
+    implementation(libs.navigation.fragment.ktx)
+    implementation(libs.navigation.ui.ktx)
+
+    implementation(libs.constraintlayout)
+    implementation(libs.swiperefreshlayout)
+    implementation(libs.recyclerview)
+    implementation(libs.transition)
+    implementation(libs.fragment.ktx)
+    implementation(libs.appcompat)
+    implementation(libs.material)
+
+    // Make sure kapt runs with a proper kotlin-stdlib
+    kapt(kotlin("stdlib"))
+}

app/apk/src/main/AndroidManifest.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application android:localeConfig="@xml/locale_config">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.surequest.SuRequestActivity"
+            android:directBootAware="true"
+            android:exported="false"
+            android:taskAffinity=""
+            tools:ignore="AppLinkUrlError">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

app/apk/src/main/java/com/topjohnwu/magisk/arch/AsyncLoadViewModel.kt

@@ -0,0 +1,22 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.annotation.MainThread
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+abstract class AsyncLoadViewModel : BaseViewModel() {
+
+    private var loadingJob: Job? = null
+
+    @MainThread
+    fun startLoading() {
+        if (loadingJob?.isActive == true) {
+            // Prevent multiple jobs from running at the same time
+            return
+        }
+        loadingJob = viewModelScope.launch { doLoadWork() }
+    }
+
+    protected abstract suspend fun doLoadWork()
+}

app/apk/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt

@@ -5,28 +5,28 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.Insets
+import androidx.core.view.MenuProvider
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.OnRebindCallback
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.ktx.startAnimations
 
-abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
-    Fragment(), BaseUIComponent<VM> {
+abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHolder {
 
-    val activity get() = requireActivity() as BaseUIActivity<*, *>
+    val activity get() = getActivity() as? NavigationActivity<*>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
 
-    override val viewRoot: View get() = binding.root
-    private val navigation get() = activity.navigation
+    private val navigation get() = activity?.navigation
+    open val snackbarView: View? get() = null
+    open val snackbarAnchorView: View? get() = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        startObserveEvents()
+        startObserveLiveData()
     }
 
     override fun onCreateView(
@@ -36,19 +36,27 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     ): View? {
         binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).also {
             it.setVariable(BR.viewModel, viewModel)
-            it.lifecycleOwner = this
+            it.lifecycleOwner = viewLifecycleOwner
         }
+        if (this is MenuProvider) {
+            activity?.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.STARTED)
+        }
+        savedInstanceState?.let { viewModel.onRestoreState(it) }
         return binding.root
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.onSaveState(outState)
+    }
+
     override fun onStart() {
         super.onStart()
-        activity.supportActionBar?.subtitle = null
+        activity?.supportActionBar?.subtitle = null
     }
 
     override fun onEventDispatched(event: ViewEvent) = when(event) {
         is ContextExecutor -> event(requireContext())
-        is ActivityExecutor -> event(activity)
+        is ActivityExecutor -> activity?.let { event(it) } ?: Unit
         is FragmentExecutor -> event(this)
         else -> Unit
     }
@@ -64,7 +72,7 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
         super.onViewCreated(view, savedInstanceState)
         binding.addOnRebindCallback(object : OnRebindCallback<Binding>() {
             override fun onPreBind(binding: Binding): Boolean {
-                this@BaseUIFragment.onPreBind(binding)
+                this@BaseFragment.onPreBind(binding)
                 return true
             }
         })
@@ -72,7 +80,10 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
 
     override fun onResume() {
         super.onResume()
-        viewModel.requestRefresh()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
     }
 
     protected open fun onPreBind(binding: Binding) {
@@ -80,13 +91,6 @@ abstract class BaseUIFragment<VM : BaseViewModel, Binding : ViewDataBinding> :
     }
 
     fun NavDirections.navigate() {
-        navigation?.navigate(this)
+        navigation?.currentDestination?.getAction(actionId)?.let { navigation!!.navigate(this) }
     }
-
-}
-
-interface ReselectionTarget {
-
-    fun onReselected()
-
 }

app/apk/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt

@@ -0,0 +1,83 @@
+package com.topjohnwu.magisk.arch
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.databinding.PropertyChangeRegistry
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.databinding.ObservableHost
+import com.topjohnwu.magisk.events.BackPressEvent
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.events.DialogEvent
+import com.topjohnwu.magisk.events.NavigationEvent
+import com.topjohnwu.magisk.events.PermissionEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+
+abstract class BaseViewModel : ViewModel(), ObservableHost {
+
+    override var callbacks: PropertyChangeRegistry? = null
+
+    private val _viewEvents = MutableLiveData<ViewEvent>()
+    val viewEvents: LiveData<ViewEvent> get() = _viewEvents
+
+    open fun onSaveState(state: Bundle) {}
+    open fun onRestoreState(state: Bundle) {}
+    open fun onNetworkChanged(network: Boolean) {}
+
+    fun withPermission(permission: String, callback: (Boolean) -> Unit) {
+        PermissionEvent(permission, callback).publish()
+    }
+
+    inline fun withExternalRW(crossinline callback: () -> Unit) {
+        withPermission(WRITE_EXTERNAL_STORAGE) {
+            if (!it) {
+                SnackbarEvent(R.string.external_rw_permission_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    inline fun withInstallPermission(crossinline callback: () -> Unit) {
+        withPermission(REQUEST_INSTALL_PACKAGES) {
+            if (!it) {
+                SnackbarEvent(R.string.install_unknown_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    inline fun withPostNotificationPermission(crossinline callback: () -> Unit) {
+        withPermission(POST_NOTIFICATIONS) {
+            if (!it) {
+                SnackbarEvent(R.string.post_notifications_denied).publish()
+            } else {
+                callback()
+            }
+        }
+    }
+
+    fun back() = BackPressEvent().publish()
+
+    fun ViewEvent.publish() {
+        _viewEvents.postValue(this)
+    }
+
+    fun DialogBuilder.show() {
+        DialogEvent(this).publish()
+    }
+
+    fun NavDirections.navigate(pop: Boolean = false) {
+        _viewEvents.postValue(NavigationEvent(this, pop))
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/arch/NavigationActivity.kt

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.arch
+
+import android.view.KeyEvent
+import androidx.databinding.ViewDataBinding
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.fragment.NavHostFragment
+
+abstract class NavigationActivity<Binding : ViewDataBinding> : UIActivity<Binding>() {
+
+    abstract val navHostId: Int
+
+    private val navHostFragment by lazy {
+        supportFragmentManager.findFragmentById(navHostId) as NavHostFragment
+    }
+
+    protected val currentFragment get() =
+        navHostFragment.childFragmentManager.fragments.getOrNull(0) as? BaseFragment<*>
+
+    val navigation: NavController get() = navHostFragment.navController
+
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        return if (binded && currentFragment?.onKeyEvent(event) == true) true else super.dispatchKeyEvent(event)
+    }
+
+    override fun onBackPressed() {
+        if (binded) {
+            if (currentFragment?.onBackPressed() == false) {
+                super.onBackPressed()
+            }
+        }
+    }
+
+    fun NavDirections.navigate() {
+        navigation.navigate(this)
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt

@@ -0,0 +1,141 @@
+package com.topjohnwu.magisk.arch
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.res.use
+import androidx.core.view.WindowCompat
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import androidx.transition.AutoTransition
+import androidx.transition.TransitionManager
+import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.base.ActivityExtension
+import com.topjohnwu.magisk.core.base.IActivityExtension
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.reflectField
+import com.topjohnwu.magisk.core.wrap
+import rikka.insets.WindowInsetsHelper
+import rikka.layoutinflater.view.LayoutInflaterFactory
+
+abstract class UIActivity<Binding : ViewDataBinding>
+    : AppCompatActivity(), ViewModelHolder, IActivityExtension {
+
+    protected lateinit var binding: Binding
+    protected abstract val layoutRes: Int
+    override val extension = ActivityExtension(this)
+
+    protected val binded get() = ::binding.isInitialized
+
+    open val snackbarView get() = binding.root
+    open val snackbarAnchorView: View? get() = null
+
+    init {
+        AppCompatDelegate.setDefaultNightMode(Config.darkTheme)
+    }
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
+            .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
+
+        extension.onCreate(savedInstanceState)
+        if (isRunningAsStub) {
+            // Overwrite private members to avoid nasty "false" stack traces being logged
+            val delegate = delegate
+            val clz = delegate.javaClass
+            clz.reflectField("mActivityHandlesConfigFlagsChecked").set(delegate, true)
+            clz.reflectField("mActivityHandlesConfigFlags").set(delegate, 0)
+        }
+
+        super.onCreate(savedInstanceState)
+
+        startObserveLiveData()
+
+        // We need to set the window background explicitly since for whatever reason it's not
+        // propagated upstream
+        obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
+            .use { it.getDrawable(0) }
+            .also { window.setBackgroundDrawable(it) }
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            window?.decorView?.post {
+                // If navigation bar is short enough (gesture navigation enabled), make it transparent
+                if ((window.decorView.rootWindowInsets?.systemWindowInsetBottom
+                        ?: 0) < Resources.getSystem().displayMetrics.density * 40) {
+                    window.navigationBarColor = Color.TRANSPARENT
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        window.navigationBarDividerColor = Color.TRANSPARENT
+                    }
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        window.isNavigationBarContrastEnforced = false
+                        window.isStatusBarContrastEnforced = false
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        extension.onSaveInstanceState(outState)
+    }
+
+    fun setContentView() {
+        binding = DataBindingUtil.setContentView<Binding>(this, layoutRes).also {
+            it.setVariable(BR.viewModel, viewModel)
+            it.lifecycleOwner = this
+        }
+    }
+
+    fun setAccessibilityDelegate(delegate: View.AccessibilityDelegate?) {
+        binding.root.rootView.accessibilityDelegate = delegate
+    }
+
+    fun showSnackbar(
+        message: CharSequence,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) = Snackbar.make(snackbarView, message, length)
+        .setAnchorView(snackbarAnchorView).apply(builder).show()
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.let {
+            if (it is AsyncLoadViewModel)
+                it.startLoading()
+        }
+    }
+
+    override fun onEventDispatched(event: ViewEvent) = when (event) {
+        is ContextExecutor -> event(this)
+        is ActivityExecutor -> event(this)
+        else -> Unit
+    }
+}
+
+fun ViewGroup.startAnimations() {
+    val transition = AutoTransition()
+        .setInterpolator(FastOutSlowInInterpolator())
+        .setDuration(400)
+        .excludeTarget(R.id.main_toolbar, true)
+    TransitionManager.beginDelayedTransition(
+        this,
+        transition
+    )
+}

app/apk/src/main/java/com/topjohnwu/magisk/arch/ViewEvent.kt

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.arch
 
 import android.content.Context
-import kotlinx.coroutines.CoroutineScope
 
 /**
  * Class for passing events from ViewModels to Activities/Fragments
@@ -9,18 +8,14 @@ import kotlinx.coroutines.CoroutineScope
  */
 abstract class ViewEvent
 
-abstract class ViewEventWithScope: ViewEvent() {
-    lateinit var scope: CoroutineScope
-}
-
 interface ContextExecutor {
     operator fun invoke(context: Context)
 }
 
 interface ActivityExecutor {
-    operator fun invoke(activity: BaseUIActivity<*, *>)
+    operator fun invoke(activity: UIActivity<*>)
 }
 
 interface FragmentExecutor {
-    operator fun invoke(fragment: BaseUIFragment<*, *>)
+    operator fun invoke(fragment: BaseFragment<*>)
 }

app/apk/src/main/java/com/topjohnwu/magisk/arch/ViewModelHolder.kt

@@ -0,0 +1,49 @@
+package com.topjohnwu.magisk.arch
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.ui.install.InstallViewModel
+import com.topjohnwu.magisk.ui.log.LogViewModel
+import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
+import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
+
+interface ViewModelHolder : LifecycleOwner, ViewModelStoreOwner {
+
+    val viewModel: BaseViewModel
+
+    fun startObserveLiveData() {
+        viewModel.viewEvents.observe(this, this::onEventDispatched)
+        Info.isConnected.observe(this, viewModel::onNetworkChanged)
+    }
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+}
+
+object VMFactory : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return when (modelClass) {
+            HomeViewModel::class.java -> HomeViewModel(ServiceLocator.networkService)
+            LogViewModel::class.java -> LogViewModel(ServiceLocator.logRepo)
+            SuperuserViewModel::class.java -> SuperuserViewModel(ServiceLocator.policyDB)
+            InstallViewModel::class.java ->
+                InstallViewModel(ServiceLocator.networkService, ServiceLocator.markwon)
+            SuRequestViewModel::class.java ->
+                SuRequestViewModel(ServiceLocator.policyDB, ServiceLocator.timeoutPrefs)
+            else -> modelClass.newInstance()
+        } as T
+    }
+}
+
+inline fun <reified VM : ViewModel> ViewModelHolder.viewModel() =
+    lazy(LazyThreadSafetyMode.NONE) {
+        ViewModelProvider(this, VMFactory)[VM::class.java]
+    }

app/apk/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt

@@ -4,12 +4,15 @@ import android.animation.ValueAnimator
 import android.content.res.ColorStateList
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
+import android.text.Spanned
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.ProgressBar
+import android.widget.Spinner
 import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.Toolbar
@@ -22,19 +25,20 @@ import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.ktx.coroutineScope
-import com.topjohnwu.magisk.ktx.get
-import com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.utils.TextHolder
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import com.topjohnwu.widget.IndeterminateCheckBox
-import io.noties.markwon.Markwon
-import kotlinx.coroutines.*
 import kotlin.math.roundToInt
 
 @BindingAdapter("gone")
@@ -58,11 +62,8 @@ fun setInvisibleUnless(view: View, invisibleUnless: Boolean) {
 }
 
 @BindingAdapter("markdownText")
-fun setMarkdownText(tv: TextView, text: CharSequence) {
-    tv.coroutineScope.launch(Dispatchers.IO) {
-        val markwon = get<Markwon>()
-        markwon.setMarkdown(tv, text.toString())
-    }
+fun setMarkdownText(tv: TextView, markdown: Spanned) {
+    ServiceLocator.markwon.setParsedMarkdown(tv, markdown)
 }
 
 @BindingAdapter("onNavigationClick")
@@ -80,22 +81,6 @@ fun setImageResource(view: ImageView, drawable: Drawable) {
     view.setImageDrawable(drawable)
 }
 
-@BindingAdapter("movieBehavior", "movieBehaviorText")
-fun setMovieBehavior(view: TextView, isMovieBehavior: Boolean, text: String) {
-    (view.tag as? Job)?.cancel()
-    view.tag = null
-    if (isMovieBehavior) {
-        view.tag = GlobalScope.launch(Dispatchers.Main.immediate) {
-            while (true) {
-                delay(150)
-                view.text = text.replaceRandomWithSpecial()
-            }
-        }
-    } else {
-        view.text = text
-    }
-}
-
 @BindingAdapter("onTouch")
 fun setOnTouchListener(view: View, listener: View.OnTouchListener) {
     view.setOnTouchListener(listener)
@@ -311,3 +296,13 @@ fun TextView.setTextColorAttr(attr: Int) {
     context.theme.resolveAttribute(attr, tv, true)
     setTextColor(tv.data)
 }
+
+@BindingAdapter("android:text")
+fun TextView.setText(text: TextHolder) {
+    this.text = text.getText(context.resources)
+}
+
+@BindingAdapter("items", "layout")
+fun Spinner.setAdapter(items: Array<Any>, layoutRes: Int) {
+    adapter = ArrayAdapter(context, layoutRes, items)
+}

app/apk/src/main/java/com/topjohnwu/magisk/databinding/DiffObservableList.kt

@@ -0,0 +1,156 @@
+package com.topjohnwu.magisk.databinding
+
+import androidx.annotation.MainThread
+import androidx.annotation.WorkerThread
+import androidx.databinding.ListChangeRegistry
+import androidx.databinding.ObservableList
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListUpdateCallback
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.AbstractList
+
+// Only expose the immutable List types
+interface DiffList<T : DiffItem<*>> : List<T> {
+    fun calculateDiff(newItems: List<T>): DiffUtil.DiffResult
+
+    @MainThread
+    fun update(newItems: List<T>, diffResult: DiffUtil.DiffResult)
+
+    @WorkerThread
+    suspend fun update(newItems: List<T>)
+}
+
+interface FilterList<T : DiffItem<*>> : List<T> {
+    fun filter(filter: (T) -> Boolean)
+
+    @MainThread
+    fun set(newItems: List<T>)
+}
+
+fun <T : DiffItem<*>> diffList(): DiffList<T> = DiffObservableList()
+
+fun <T : DiffItem<*>> filterList(scope: CoroutineScope): FilterList<T> =
+    FilterableDiffObservableList(scope)
+
+private open class DiffObservableList<T : DiffItem<*>>
+    : AbstractList<T>(), ObservableList<T>, DiffList<T>, ListUpdateCallback {
+
+    protected var list: List<T> = emptyList()
+    private val listeners = ListChangeRegistry()
+
+    override val size: Int get() = list.size
+
+    override fun get(index: Int) = list[index]
+
+    override fun calculateDiff(newItems: List<T>): DiffUtil.DiffResult {
+        return doCalculateDiff(list, newItems)
+    }
+
+    protected fun doCalculateDiff(oldItems: List<T>, newItems: List<T>): DiffUtil.DiffResult {
+        return DiffUtil.calculateDiff(object : DiffUtil.Callback() {
+            override fun getOldListSize() = oldItems.size
+
+            override fun getNewListSize() = newItems.size
+
+            @Suppress("UNCHECKED_CAST")
+            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldItems[oldItemPosition]
+                val newItem = newItems[newItemPosition]
+                return (oldItem as DiffItem<Any>).itemSameAs(newItem)
+            }
+
+            @Suppress("UNCHECKED_CAST")
+            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldItems[oldItemPosition]
+                val newItem = newItems[newItemPosition]
+                return (oldItem as DiffItem<Any>).contentSameAs(newItem)
+            }
+        }, true)
+    }
+
+    @MainThread
+    override fun update(newItems: List<T>, diffResult: DiffUtil.DiffResult) {
+        list = ArrayList(newItems)
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    @WorkerThread
+    override suspend fun update(newItems: List<T>) {
+        val diffResult = calculateDiff(newItems)
+        withContext(Dispatchers.Main) {
+            update(newItems, diffResult)
+        }
+    }
+
+    override fun addOnListChangedCallback(listener: ObservableList.OnListChangedCallback<out ObservableList<T>>) {
+        listeners.add(listener)
+    }
+
+    override fun removeOnListChangedCallback(listener: ObservableList.OnListChangedCallback<out ObservableList<T>>) {
+        listeners.remove(listener)
+    }
+
+    override fun onChanged(position: Int, count: Int, payload: Any?) {
+        listeners.notifyChanged(this, position, count)
+    }
+
+    override fun onMoved(fromPosition: Int, toPosition: Int) {
+        listeners.notifyMoved(this, fromPosition, toPosition, 1)
+    }
+
+    override fun onInserted(position: Int, count: Int) {
+        modCount += 1
+        listeners.notifyInserted(this, position, count)
+    }
+
+    override fun onRemoved(position: Int, count: Int) {
+        modCount += 1
+        listeners.notifyRemoved(this, position, count)
+    }
+}
+
+private class FilterableDiffObservableList<T : DiffItem<*>>(
+    private val scope: CoroutineScope
+) : DiffObservableList<T>(), FilterList<T> {
+
+    private var sublist: List<T> = emptyList()
+    private var job: Job? = null
+    private var lastFilter: ((T) -> Boolean)? = null
+
+    // ---
+
+    override fun filter(filter: (T) -> Boolean) {
+        lastFilter = filter
+        job?.cancel()
+        job = scope.launch(Dispatchers.Default) {
+            val oldList = sublist
+            val newList = list.filter(filter)
+            val diff = doCalculateDiff(oldList, newList)
+            withContext(Dispatchers.Main) {
+                sublist = newList
+                diff.dispatchUpdatesTo(this@FilterableDiffObservableList)
+            }
+        }
+    }
+
+    // ---
+
+    override fun get(index: Int): T {
+        return sublist[index]
+    }
+
+    override val size: Int
+        get() = sublist.size
+
+    @MainThread
+    override fun set(newItems: List<T>) {
+        onRemoved(0, sublist.size)
+        list = newItems
+        sublist = emptyList()
+        lastFilter?.let { filter(it) }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/databinding/MergeObservableList.kt

@@ -0,0 +1,162 @@
+package com.topjohnwu.magisk.databinding
+
+import androidx.databinding.ListChangeRegistry
+import androidx.databinding.ObservableList
+import androidx.databinding.ObservableList.OnListChangedCallback
+import java.util.AbstractList
+
+@Suppress("UNCHECKED_CAST")
+class MergeObservableList<T> : AbstractList<T>(), ObservableList<T> {
+
+    private val lists: MutableList<List<T>> = mutableListOf()
+    private val listeners = ListChangeRegistry()
+    private val callback = Callback<T>()
+
+    override fun addOnListChangedCallback(callback: OnListChangedCallback<out ObservableList<T>>) {
+        listeners.add(callback)
+    }
+
+    override fun removeOnListChangedCallback(callback: OnListChangedCallback<out ObservableList<T>>) {
+        listeners.remove(callback)
+    }
+
+    override fun get(index: Int): T {
+        if (index < 0)
+            throw IndexOutOfBoundsException()
+        var idx = index
+        for (list in lists) {
+            val size = list.size
+            if (idx < size) {
+                return list[idx]
+            }
+            idx -= size
+        }
+        throw IndexOutOfBoundsException()
+    }
+
+    override val size: Int
+        get() = lists.fold(0) { i, it -> i + it.size }
+
+
+    fun insertItem(obj: T): MergeObservableList<T> {
+        val idx = size
+        lists.add(listOf(obj))
+        ++modCount
+        listeners.notifyInserted(this, idx, 1)
+        return this
+    }
+
+    fun insertList(list: List<T>): MergeObservableList<T> {
+        val idx = size
+        lists.add(list)
+        ++modCount
+        (list as? ObservableList<T>)?.addOnListChangedCallback(callback)
+        if (list.isNotEmpty())
+            listeners.notifyInserted(this, idx, list.size)
+        return this
+    }
+
+    fun removeItem(obj: T): Boolean {
+        var idx = 0
+        for ((i, list) in lists.withIndex()) {
+            if (list !is ObservableList<*>) {
+                if (obj == list[0]) {
+                    lists.removeAt(i)
+                    ++modCount
+                    listeners.notifyRemoved(this, idx, 1)
+                    return true
+                }
+            }
+            idx += list.size
+        }
+        return false
+    }
+
+    fun removeList(listToRemove: List<T>): Boolean {
+        var idx = 0
+        for ((i, list) in lists.withIndex()) {
+            if (listToRemove === list) {
+                (list as? ObservableList<T>)?.removeOnListChangedCallback(callback)
+                lists.removeAt(i)
+                ++modCount
+                listeners.notifyRemoved(this, idx, list.size)
+                return true
+            }
+            idx += list.size
+        }
+        return false
+    }
+
+    override fun clear() {
+        val sz = size
+        for (list in lists) {
+            if (list is ObservableList) {
+                list.removeOnListChangedCallback(callback)
+            }
+        }
+        ++modCount
+        lists.clear()
+        if (sz > 0)
+            listeners.notifyRemoved(this, 0, sz)
+    }
+
+    private fun subIndexToIndex(subList: List<*>, index: Int): Int {
+        if (index < 0)
+            throw IndexOutOfBoundsException()
+        var idx = 0
+        for (list in lists) {
+            if (subList === list) {
+                return idx + index
+            }
+            idx += list.size
+        }
+        throw IllegalArgumentException()
+    }
+
+    inner class Callback<T> : OnListChangedCallback<ObservableList<T>>() {
+        override fun onChanged(sender: ObservableList<T>) {
+            ++modCount
+            listeners.notifyChanged(this@MergeObservableList)
+        }
+
+        override fun onItemRangeChanged(
+            sender: ObservableList<T>,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            listeners.notifyChanged(this@MergeObservableList,
+                subIndexToIndex(sender, positionStart), itemCount)
+        }
+
+        override fun onItemRangeInserted(
+            sender: ObservableList<T>,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            ++modCount
+            listeners.notifyInserted(this@MergeObservableList,
+                subIndexToIndex(sender, positionStart), itemCount)
+        }
+
+        override fun onItemRangeMoved(
+            sender: ObservableList<T>,
+            fromPosition: Int,
+            toPosition: Int,
+            itemCount: Int
+        ) {
+            val idx = subIndexToIndex(sender, 0)
+            listeners.notifyMoved(this@MergeObservableList,
+                idx + fromPosition, idx + toPosition, itemCount)
+        }
+
+        override fun onItemRangeRemoved(
+            sender: ObservableList<T>,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            ++modCount
+            listeners.notifyRemoved(this@MergeObservableList,
+                subIndexToIndex(sender, positionStart), itemCount)
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/databinding/ObservableHost.kt

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.utils
+package com.topjohnwu.magisk.databinding
 
 import androidx.databinding.Observable
 import androidx.databinding.PropertyChangeRegistry

app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.databinding
+
+import androidx.databinding.PropertyChangeRegistry
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class RvItem {
+    abstract val layoutRes: Int
+}
+
+abstract class ObservableRvItem : RvItem(), ObservableHost {
+    override var callbacks: PropertyChangeRegistry? = null
+}
+
+interface ItemWrapper<E> {
+    val item: E
+}
+
+interface ViewAwareItem {
+    fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView)
+}
+
+interface DiffItem<T : Any> {
+
+    fun itemSameAs(other: T): Boolean {
+        if (this === other) return true
+        return when (this) {
+            is ItemWrapper<*> -> item == (other as ItemWrapper<*>).item
+            is Comparable<*> -> compareValues(this, other as Comparable<*>) == 0
+            else -> this == other
+        }
+    }
+
+    fun contentSameAs(other: T) = true
+}

app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt

@@ -0,0 +1,121 @@
+package com.topjohnwu.magisk.databinding
+
+import android.annotation.SuppressLint
+import android.util.SparseArray
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.databinding.BindingAdapter
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ObservableList
+import androidx.databinding.ObservableList.OnListChangedCallback
+import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.topjohnwu.magisk.BR
+
+class RvItemAdapter<T: RvItem>(
+    val items: List<T>,
+    val extraBindings: SparseArray<*>?
+) : RecyclerView.Adapter<RvItemAdapter.ViewHolder>() {
+
+    private var lifecycleOwner: LifecycleOwner? = null
+    private var recyclerView: RecyclerView? = null
+    private val observer by lazy(LazyThreadSafetyMode.NONE) { ListObserver<T>() }
+
+    override fun onAttachedToRecyclerView(rv: RecyclerView) {
+        lifecycleOwner = rv.findViewTreeLifecycleOwner()
+        recyclerView = rv
+        if (items is ObservableList)
+            items.addOnListChangedCallback(observer)
+    }
+
+    override fun onDetachedFromRecyclerView(rv: RecyclerView) {
+        lifecycleOwner = null
+        recyclerView = null
+        if (items is ObservableList)
+            items.removeOnListChangedCallback(observer)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, layoutRes: Int): ViewHolder {
+        val inflator = LayoutInflater.from(parent.context)
+        return ViewHolder(DataBindingUtil.inflate(inflator, layoutRes, parent, false))
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+        holder.binding.setVariable(BR.item, item)
+        extraBindings?.let {
+            for (i in 0 until it.size()) {
+                holder.binding.setVariable(it.keyAt(i), it.valueAt(i))
+            }
+        }
+        holder.binding.lifecycleOwner = lifecycleOwner
+        holder.binding.executePendingBindings()
+        recyclerView?.let {
+            if (item is ViewAwareItem)
+                item.onBind(holder.binding, it)
+        }
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].layoutRes
+
+    class ViewHolder(val binding: ViewDataBinding) : RecyclerView.ViewHolder(binding.root)
+
+    inner class ListObserver<T: RvItem> : OnListChangedCallback<ObservableList<T>>() {
+
+        @SuppressLint("NotifyDataSetChanged")
+        override fun onChanged(sender: ObservableList<T>) {
+            notifyDataSetChanged()
+        }
+
+        override fun onItemRangeChanged(
+            sender: ObservableList<T>,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            notifyItemRangeChanged(positionStart, itemCount)
+        }
+
+        override fun onItemRangeInserted(
+            sender: ObservableList<T>?,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            notifyItemRangeInserted(positionStart, itemCount)
+        }
+
+        override fun onItemRangeMoved(
+            sender: ObservableList<T>?,
+            fromPosition: Int,
+            toPosition: Int,
+            itemCount: Int
+        ) {
+            for (i in 0 until itemCount) {
+                notifyItemMoved(fromPosition + i, toPosition + i)
+            }
+        }
+
+        override fun onItemRangeRemoved(
+            sender: ObservableList<T>?,
+            positionStart: Int,
+            itemCount: Int
+        ) {
+            notifyItemRangeRemoved(positionStart, itemCount)
+        }
+    }
+}
+
+inline fun bindExtra(body: (SparseArray<Any?>) -> Unit) = SparseArray<Any?>().also(body)
+
+@BindingAdapter("items", "extraBindings", requireAll = false)
+fun <T: RvItem> RecyclerView.setAdapter(items: List<T>?, extraBindings: SparseArray<*>?) {
+    if (items != null) {
+        val rva = (adapter as? RvItemAdapter<*>)
+        if (rva == null || rva.items !== items || rva.extraBindings !== extraBindings) {
+            adapter = RvItemAdapter(items, extraBindings)
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/DarkThemeDialog.kt

@@ -0,0 +1,41 @@
+package com.topjohnwu.magisk.dialog
+
+import android.app.Activity
+import androidx.appcompat.app.AppCompatDelegate
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.core.R as CoreR
+
+class DarkThemeDialog : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        val activity = dialog.ownerActivity!!
+        dialog.apply {
+            setTitle(CoreR.string.settings_dark_mode_title)
+            setMessage(CoreR.string.settings_dark_mode_message)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = CoreR.string.settings_dark_mode_light
+                icon = R.drawable.ic_day
+                onClick { selectTheme(AppCompatDelegate.MODE_NIGHT_NO, activity) }
+            }
+            setButton(MagiskDialog.ButtonType.NEUTRAL) {
+                text = CoreR.string.settings_dark_mode_system
+                icon = R.drawable.ic_day_night
+                onClick { selectTheme(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, activity) }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = CoreR.string.settings_dark_mode_dark
+                icon = R.drawable.ic_night
+                onClick { selectTheme(AppCompatDelegate.MODE_NIGHT_YES, activity) }
+            }
+        }
+    }
+
+    private fun selectTheme(mode: Int, activity: Activity) {
+        Config.darkTheme = mode
+        (activity as UIActivity<*>).delegate.localNightMode = mode
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/EnvFixDialog.kt

@@ -0,0 +1,65 @@
+package com.topjohnwu.magisk.dialog
+
+import android.widget.Toast
+import androidx.core.os.postDelayed
+import androidx.lifecycle.lifecycleScope
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.ktx.reboot
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.ui.home.HomeViewModel
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.superuser.internal.UiThreadHandler
+import kotlinx.coroutines.launch
+
+class EnvFixDialog(private val vm: HomeViewModel, private val code: Int) : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.env_fix_title)
+            setMessage(R.string.env_fix_msg)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                doNotDismiss = true
+                onClick {
+                    dialog.apply {
+                        setTitle(R.string.setup_title)
+                        setMessage(R.string.setup_msg)
+                        resetButtons()
+                        setCancelable(false)
+                    }
+                    dialog.activity.lifecycleScope.launch {
+                        MagiskInstaller.FixEnv().exec { success ->
+                            dialog.dismiss()
+                            context.toast(
+                                if (success) R.string.reboot_delay_toast else R.string.setup_fail,
+                                Toast.LENGTH_LONG
+                            )
+                            if (success)
+                                UiThreadHandler.handler.postDelayed(5000) { reboot() }
+                        }
+                    }
+                }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+
+        if (code == 2 || // No rules block, module policy not loaded
+            Info.env.versionCode != BuildConfig.APP_VERSION_CODE ||
+            Info.env.versionString != BuildConfig.APP_VERSION_NAME) {
+            dialog.setMessage(R.string.env_full_fix_msg)
+            dialog.setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick {
+                    vm.onMagiskPressed()
+                    dialog.dismiss()
+                }
+            }
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/LocalModuleInstallDialog.kt

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.dialog
+
+import android.net.Uri
+import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.ui.module.ModuleViewModel
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class LocalModuleInstallDialog(
+    private val viewModel: ModuleViewModel,
+    private val uri: Uri,
+    private val displayName: String
+) : DialogBuilder {
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.confirm_install_title)
+            setMessage(context.getString(R.string.confirm_install, displayName))
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick {
+                    viewModel.apply {
+                        MainDirections.actionFlashFragment(Const.Value.FLASH_ZIP, uri).navigate()
+                    }
+                }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/ManagerInstallDialog.kt

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.dialog
+
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.Subject
+import com.topjohnwu.magisk.view.MagiskDialog
+import java.io.File
+
+class ManagerInstallDialog : MarkDownDialog() {
+
+    private val svc get() = ServiceLocator.networkService
+
+    override suspend fun getMarkdownText(): String {
+        val text = svc.fetchString(Info.remote.magisk.note)
+        // Cache the changelog
+        AppContext.cacheDir.listFiles { _, name -> name.endsWith(".md") }.orEmpty().forEach {
+            it.delete()
+        }
+        File(AppContext.cacheDir, "${Info.remote.magisk.versionCode}.md").writeText(text)
+        return text
+    }
+
+    override fun build(dialog: MagiskDialog) {
+        super.build(dialog)
+        dialog.apply {
+            setCancelable(true)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = R.string.install
+                onClick { DownloadEngine.startWithActivity(activity, Subject.App()) }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/MarkDownDialog.kt

@@ -0,0 +1,39 @@
+package com.topjohnwu.magisk.dialog
+
+import android.view.LayoutInflater
+import android.widget.TextView
+import androidx.annotation.CallSuper
+import androidx.lifecycle.lifecycleScope
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.IOException
+import com.topjohnwu.magisk.core.R as CoreR
+
+abstract class MarkDownDialog : DialogBuilder {
+
+    abstract suspend fun getMarkdownText(): String
+
+    @CallSuper
+    override fun build(dialog: MagiskDialog) {
+        with(dialog) {
+            val view = LayoutInflater.from(context).inflate(R.layout.markdown_window_md2, null)
+            setView(view)
+            val tv = view.findViewById<TextView>(R.id.md_txt)
+            activity.lifecycleScope.launch {
+                try {
+                    val text = withContext(Dispatchers.IO) { getMarkdownText() }
+                    ServiceLocator.markwon.setMarkdown(tv, text)
+                } catch (e: IOException) {
+                    Timber.e(e)
+                    tv.setText(CoreR.string.download_file_error)
+                }
+            }
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/OnlineModuleInstallDialog.kt

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.dialog
+
+import android.content.Context
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.di.ServiceLocator
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.core.download.Subject
+import com.topjohnwu.magisk.core.model.module.OnlineModule
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.view.Notifications
+import kotlinx.parcelize.Parcelize
+
+class OnlineModuleInstallDialog(private val item: OnlineModule) : MarkDownDialog() {
+
+    private val svc get() = ServiceLocator.networkService
+
+    override suspend fun getMarkdownText(): String {
+        val str = svc.fetchString(item.changelog)
+        return if (str.length > 1000) str.substring(0, 1000) else str
+    }
+
+    @Parcelize
+    class Module(
+        override val module: OnlineModule,
+        override val autoLaunch: Boolean,
+        override val notifyId: Int = Notifications.nextId()
+    ) : Subject.Module() {
+        override fun pendingIntent(context: Context) = FlashFragment.installIntent(context, file)
+    }
+
+    override fun build(dialog: MagiskDialog) {
+        super.build(dialog)
+        dialog.apply {
+
+            fun download(install: Boolean) {
+                DownloadEngine.startWithActivity(activity, Module(item, install))
+            }
+
+            val title = context.getString(R.string.repo_install_title,
+                item.name, item.version, item.versionCode)
+
+            setTitle(title)
+            setCancelable(true)
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = R.string.download
+                onClick { download(false) }
+            }
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = R.string.install
+                onClick { download(true) }
+            }
+            setButton(MagiskDialog.ButtonType.NEUTRAL) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/SecondSlotWarningDialog.kt

@@ -0,0 +1,19 @@
+package com.topjohnwu.magisk.dialog
+
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class SecondSlotWarningDialog : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(android.R.string.dialog_alert_title)
+            setMessage(R.string.install_inactive_slot_msg)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+            }
+            setCancelable(true)
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/SuperuserRevokeDialog.kt

@@ -0,0 +1,25 @@
+package com.topjohnwu.magisk.dialog
+
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.view.MagiskDialog
+
+class SuperuserRevokeDialog(
+    private val appName: String,
+    private val onSuccess: () -> Unit
+) : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.su_revoke_title)
+            setMessage(R.string.su_revoke_msg, appName)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = android.R.string.ok
+                onClick { onSuccess() }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = android.R.string.cancel
+            }
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/dialog/UninstallDialog.kt

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.dialog
+
+import android.app.ProgressDialog
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import com.topjohnwu.magisk.arch.NavigationActivity
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.tasks.MagiskInstaller
+import com.topjohnwu.magisk.events.DialogBuilder
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import com.topjohnwu.magisk.view.MagiskDialog
+import kotlinx.coroutines.launch
+
+class UninstallDialog : DialogBuilder {
+
+    override fun build(dialog: MagiskDialog) {
+        dialog.apply {
+            setTitle(R.string.uninstall_magisk_title)
+            setMessage(R.string.uninstall_magisk_msg)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = R.string.restore_img
+                onClick { restore(dialog.activity) }
+            }
+            setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                text = R.string.complete_uninstall
+                onClick { completeUninstall(dialog) }
+            }
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    private fun restore(activity: UIActivity<*>) {
+        val dialog = ProgressDialog(activity).apply {
+            setMessage(activity.getString(R.string.restore_img_msg))
+            show()
+        }
+
+        activity.lifecycleScope.launch {
+            MagiskInstaller.Restore().exec { success ->
+                dialog.dismiss()
+                if (success) {
+                    activity.toast(R.string.restore_done, Toast.LENGTH_SHORT)
+                } else {
+                    activity.toast(R.string.restore_fail, Toast.LENGTH_LONG)
+                }
+            }
+        }
+    }
+
+    private fun completeUninstall(dialog: MagiskDialog) {
+        (dialog.ownerActivity as NavigationActivity<*>)
+            .navigation.navigate(FlashFragment.uninstall())
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/events/ViewEvents.kt

@@ -0,0 +1,124 @@
+package com.topjohnwu.magisk.events
+
+import android.content.Context
+import android.view.View
+import androidx.annotation.StringRes
+import androidx.navigation.NavDirections
+import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.ContextExecutor
+import com.topjohnwu.magisk.arch.NavigationActivity
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.arch.ViewEvent
+import com.topjohnwu.magisk.core.base.ContentResultCallback
+import com.topjohnwu.magisk.core.base.relaunch
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.view.Shortcuts
+
+class PermissionEvent(
+    private val permission: String,
+    private val callback: (Boolean) -> Unit
+) : ViewEvent(), ActivityExecutor {
+
+    override fun invoke(activity: UIActivity<*>) =
+        activity.withPermission(permission, callback)
+}
+
+class BackPressEvent : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        activity.onBackPressed()
+    }
+}
+
+class DieEvent : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        activity.finish()
+    }
+}
+
+class ShowUIEvent(private val delegate: View.AccessibilityDelegate?)
+    : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        activity.setContentView()
+        activity.setAccessibilityDelegate(delegate)
+    }
+}
+
+class RecreateEvent : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        activity.relaunch()
+    }
+}
+
+class AuthEvent(
+    private val callback: () -> Unit
+) : ViewEvent(), ActivityExecutor {
+
+    override fun invoke(activity: UIActivity<*>) {
+        activity.withAuthentication { if (it) callback() }
+    }
+}
+
+class GetContentEvent(
+    private val type: String,
+    private val callback: ContentResultCallback
+) : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        activity.getContent(type, callback)
+    }
+}
+
+class NavigationEvent(
+    private val directions: NavDirections,
+    private val pop: Boolean
+) : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        (activity as? NavigationActivity<*>)?.apply {
+            if (pop) navigation.popBackStack()
+            directions.navigate()
+        }
+    }
+}
+
+class AddHomeIconEvent : ViewEvent(), ContextExecutor {
+    override fun invoke(context: Context) {
+        Shortcuts.addHomeIcon(context)
+    }
+}
+
+class SnackbarEvent(
+    private val msg: TextHolder,
+    private val length: Int = Snackbar.LENGTH_SHORT,
+    private val builder: Snackbar.() -> Unit = {}
+) : ViewEvent(), ActivityExecutor {
+
+    constructor(
+        @StringRes res: Int,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) : this(res.asText(), length, builder)
+
+    constructor(
+        msg: String,
+        length: Int = Snackbar.LENGTH_SHORT,
+        builder: Snackbar.() -> Unit = {}
+    ) : this(msg.asText(), length, builder)
+
+    override fun invoke(activity: UIActivity<*>) {
+        activity.showSnackbar(msg.getText(activity.resources), length, builder)
+    }
+}
+
+class DialogEvent(
+    private val builder: DialogBuilder
+) : ViewEvent(), ActivityExecutor {
+    override fun invoke(activity: UIActivity<*>) {
+        MagiskDialog(activity).apply(builder::build).show()
+    }
+}
+
+interface DialogBuilder {
+    fun build(dialog: MagiskDialog)
+}

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

@@ -0,0 +1,278 @@
+package com.topjohnwu.magisk.ui
+
+import android.Manifest
+import android.Manifest.permission.REQUEST_INSTALL_PACKAGES
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import android.view.WindowManager
+import android.widget.Toast
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.view.forEach
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavDirections
+import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.arch.NavigationActivity
+import com.topjohnwu.magisk.arch.startAnimations
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.base.SplashController
+import com.topjohnwu.magisk.core.base.SplashScreenHost
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.model.module.LocalModule
+import com.topjohnwu.magisk.core.tasks.AppMigration
+import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
+import com.topjohnwu.magisk.ui.home.HomeFragmentDirections
+import com.topjohnwu.magisk.ui.theme.Theme
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.magisk.view.Shortcuts
+import kotlinx.coroutines.launch
+import java.io.File
+import com.topjohnwu.magisk.core.R as CoreR
+
+class MainViewModel : BaseViewModel()
+
+class MainActivity : NavigationActivity<ActivityMainMd2Binding>(), SplashScreenHost {
+
+    override val layoutRes = R.layout.activity_main_md2
+    override val viewModel by viewModel<MainViewModel>()
+    override val navHostId: Int = R.id.main_nav_host
+    override val splashController = SplashController(this)
+    override val snackbarView: View
+        get() {
+            val fragmentOverride = currentFragment?.snackbarView
+            return fragmentOverride ?: super.snackbarView
+        }
+    override val snackbarAnchorView: View?
+        get() {
+            val fragmentAnchor = currentFragment?.snackbarAnchorView
+            return when {
+                fragmentAnchor?.isVisible == true -> fragmentAnchor
+                binding.mainNavigation.isVisible -> return binding.mainNavigation
+                else -> null
+            }
+        }
+
+    private var isRootFragment = true
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(Theme.selected.themeRes)
+        splashController.preOnCreate()
+        super.onCreate(savedInstanceState)
+        splashController.onCreate(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        splashController.onResume()
+    }
+
+    @SuppressLint("InlinedApi")
+    override fun onCreateUi(savedInstanceState: Bundle?) {
+        setContentView()
+        showUnsupportedMessage()
+        askForHomeShortcut()
+
+        // Ask permission to post notifications for background update check
+        if (Config.checkUpdate) {
+            withPermission(Manifest.permission.POST_NOTIFICATIONS) {
+                Config.checkUpdate = it
+            }
+        }
+
+        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+
+        navigation.addOnDestinationChangedListener { _, destination, _ ->
+            isRootFragment = when (destination.id) {
+                R.id.homeFragment,
+                R.id.modulesFragment,
+                R.id.superuserFragment,
+                R.id.logFragment -> true
+                else -> false
+            }
+
+            setDisplayHomeAsUpEnabled(!isRootFragment)
+            requestNavigationHidden(!isRootFragment)
+
+            binding.mainNavigation.menu.forEach {
+                if (it.itemId == destination.id) {
+                    it.isChecked = true
+                }
+            }
+        }
+
+        setSupportActionBar(binding.mainToolbar)
+
+        binding.mainNavigation.setOnItemSelectedListener {
+            getScreen(it.itemId)?.navigate()
+            true
+        }
+        binding.mainNavigation.setOnItemReselectedListener {
+            // https://issuetracker.google.com/issues/124538620
+        }
+        binding.mainNavigation.menu.apply {
+            findItem(R.id.superuserFragment)?.isEnabled = Info.showSuperUser
+            findItem(R.id.modulesFragment)?.isEnabled = Info.env.isActive && LocalModule.loaded()
+        }
+
+        val section =
+            if (intent.action == Intent.ACTION_APPLICATION_PREFERENCES)
+                Const.Nav.SETTINGS
+            else
+                intent.getStringExtra(Const.Key.OPEN_SECTION)
+
+        getScreen(section)?.navigate()
+
+        if (!isRootFragment) {
+            requestNavigationHidden(requiresAnimation = savedInstanceState == null)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> onBackPressed()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    fun setDisplayHomeAsUpEnabled(isEnabled: Boolean) {
+        binding.mainToolbar.startAnimations()
+        when {
+            isEnabled -> binding.mainToolbar.setNavigationIcon(R.drawable.ic_back_md2)
+            else -> binding.mainToolbar.navigationIcon = null
+        }
+    }
+
+    internal fun requestNavigationHidden(hide: Boolean = true, requiresAnimation: Boolean = true) {
+        val bottomView = binding.mainNavigation
+        if (requiresAnimation) {
+            bottomView.isVisible = true
+            bottomView.isHidden = hide
+        } else {
+            bottomView.isGone = hide
+        }
+    }
+
+    fun invalidateToolbar() {
+        //binding.mainToolbar.startAnimations()
+        binding.mainToolbar.invalidate()
+    }
+
+    private fun getScreen(name: String?): NavDirections? {
+        return when (name) {
+            Const.Nav.SUPERUSER -> MainDirections.actionSuperuserFragment()
+            Const.Nav.MODULES -> MainDirections.actionModuleFragment()
+            Const.Nav.SETTINGS -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
+            else -> null
+        }
+    }
+
+    private fun getScreen(id: Int): NavDirections? {
+        return when (id) {
+            R.id.homeFragment -> MainDirections.actionHomeFragment()
+            R.id.modulesFragment -> MainDirections.actionModuleFragment()
+            R.id.superuserFragment -> MainDirections.actionSuperuserFragment()
+            R.id.logFragment -> MainDirections.actionLogFragment()
+            else -> null
+        }
+    }
+
+    @SuppressLint("InlinedApi")
+    override fun showInvalidStateMessage(): Unit = runOnUiThread {
+        MagiskDialog(this).apply {
+            setTitle(CoreR.string.unsupport_nonroot_stub_title)
+            setMessage(CoreR.string.unsupport_nonroot_stub_msg)
+            setButton(MagiskDialog.ButtonType.POSITIVE) {
+                text = CoreR.string.install
+                onClick {
+                    withPermission(REQUEST_INSTALL_PACKAGES) {
+                        if (!it) {
+                            toast(CoreR.string.install_unknown_denied, Toast.LENGTH_SHORT)
+                            showInvalidStateMessage()
+                        } else {
+                            lifecycleScope.launch {
+                                AppMigration.restore(this@MainActivity)
+                            }
+                        }
+                    }
+                }
+            }
+            setCancelable(false)
+            show()
+        }
+    }
+
+    private fun showUnsupportedMessage() {
+        if (Info.env.isUnsupported) {
+            MagiskDialog(this).apply {
+                setTitle(CoreR.string.unsupport_magisk_title)
+                setMessage(CoreR.string.unsupport_magisk_msg, Const.Version.MIN_VERSION)
+                setButton(MagiskDialog.ButtonType.POSITIVE) { text = android.R.string.ok }
+                setCancelable(false)
+            }.show()
+        }
+
+        if (!Info.isEmulator && Info.env.isActive && System.getenv("PATH")
+                ?.split(':')
+                ?.filterNot { File("$it/magisk").exists() }
+                ?.any { File("$it/su").exists() } == true) {
+            MagiskDialog(this).apply {
+                setTitle(CoreR.string.unsupport_general_title)
+                setMessage(CoreR.string.unsupport_other_su_msg)
+                setButton(MagiskDialog.ButtonType.POSITIVE) { text = android.R.string.ok }
+                setCancelable(false)
+            }.show()
+        }
+
+        if (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM != 0) {
+            MagiskDialog(this).apply {
+                setTitle(CoreR.string.unsupport_general_title)
+                setMessage(CoreR.string.unsupport_system_app_msg)
+                setButton(MagiskDialog.ButtonType.POSITIVE) { text = android.R.string.ok }
+                setCancelable(false)
+            }.show()
+        }
+
+        if (applicationInfo.flags and ApplicationInfo.FLAG_EXTERNAL_STORAGE != 0) {
+            MagiskDialog(this).apply {
+                setTitle(CoreR.string.unsupport_general_title)
+                setMessage(CoreR.string.unsupport_external_storage_msg)
+                setButton(MagiskDialog.ButtonType.POSITIVE) { text = android.R.string.ok }
+                setCancelable(false)
+            }.show()
+        }
+    }
+
+    private fun askForHomeShortcut() {
+        if (isRunningAsStub && !Config.askedHome &&
+            ShortcutManagerCompat.isRequestPinShortcutSupported(this)) {
+            // Ask and show dialog
+            Config.askedHome = true
+            MagiskDialog(this).apply {
+                setTitle(CoreR.string.add_shortcut_title)
+                setMessage(CoreR.string.add_shortcut_msg)
+                setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                    text = android.R.string.cancel
+                }
+                setButton(MagiskDialog.ButtonType.POSITIVE) {
+                    text = android.R.string.ok
+                    onClick {
+                        Shortcuts.addHomeIcon(this@MainActivity)
+                    }
+                }
+                setCancelable(true)
+            }.show()
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/deny/AppProcessInfo.kt

@@ -0,0 +1,118 @@
+package com.topjohnwu.magisk.ui.deny
+
+import android.annotation.SuppressLint
+import android.content.pm.ApplicationInfo
+import android.content.pm.ComponentInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.GET_ACTIVITIES
+import android.content.pm.PackageManager.GET_PROVIDERS
+import android.content.pm.PackageManager.GET_RECEIVERS
+import android.content.pm.PackageManager.GET_SERVICES
+import android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS
+import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
+import android.content.pm.ServiceInfo
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import androidx.core.os.ProcessCompat
+import com.topjohnwu.magisk.core.ktx.getLabel
+import java.util.Locale
+import java.util.TreeSet
+
+class CmdlineListItem(line: String) {
+    val packageName: String
+    val process: String
+
+    init {
+        val split = line.split(Regex("\\|"), 2)
+        packageName = split[0]
+        process = split.getOrElse(1) { packageName }
+    }
+}
+
+const val ISOLATED_MAGIC = "isolated"
+
+@SuppressLint("InlinedApi")
+class AppProcessInfo(
+    private val info: ApplicationInfo,
+    pm: PackageManager,
+    denyList: List<CmdlineListItem>
+) : Comparable<AppProcessInfo> {
+
+    private val denyList = denyList.filter {
+        it.packageName == info.packageName || it.packageName == ISOLATED_MAGIC
+    }
+
+    val label = info.getLabel(pm)
+    val iconImage: Drawable = runCatching { info.loadIcon(pm) }.getOrDefault(pm.defaultActivityIcon)
+    val packageName: String get() = info.packageName
+    val processes = fetchProcesses(pm)
+
+    override fun compareTo(other: AppProcessInfo) = comparator.compare(this, other)
+
+    fun isSystemApp() = info.flags and ApplicationInfo.FLAG_SYSTEM != 0
+
+    fun isApp() = ProcessCompat.isApplicationUid(info.uid)
+
+    private fun createProcess(name: String, pkg: String = info.packageName) =
+        ProcessInfo(name, pkg, denyList.any { it.process == name && it.packageName == pkg })
+
+    private fun ComponentInfo.getProcName(): String = processName
+        ?: applicationInfo.processName
+        ?: applicationInfo.packageName
+
+    private val ServiceInfo.isIsolated get() = (flags and ServiceInfo.FLAG_ISOLATED_PROCESS) != 0
+    private val ServiceInfo.useAppZygote get() = (flags and ServiceInfo.FLAG_USE_APP_ZYGOTE) != 0
+
+    private fun Array<out ComponentInfo>?.toProcessList() =
+        orEmpty().map { createProcess(it.getProcName()) }
+
+    private fun Array<ServiceInfo>?.toProcessList() = orEmpty().map {
+        if (it.isIsolated) {
+            if (it.useAppZygote) {
+                val proc = info.processName ?: info.packageName
+                createProcess("${proc}_zygote")
+            } else {
+                val proc = if (SDK_INT >= Build.VERSION_CODES.Q)
+                    "${it.getProcName()}:${it.name}" else it.getProcName()
+                createProcess(proc, ISOLATED_MAGIC)
+            }
+        } else {
+            createProcess(it.getProcName())
+        }
+    }
+
+    private fun fetchProcesses(pm: PackageManager): Collection<ProcessInfo> {
+        val flag = MATCH_DISABLED_COMPONENTS or MATCH_UNINSTALLED_PACKAGES or
+            GET_ACTIVITIES or GET_SERVICES or GET_RECEIVERS or GET_PROVIDERS
+        val packageInfo = try {
+            pm.getPackageInfo(info.packageName, flag)
+        } catch (e: Exception) {
+            // Exceed binder data transfer limit, parse the package locally
+            pm.getPackageArchiveInfo(info.sourceDir, flag) ?: return emptyList()
+        }
+
+        val processSet = TreeSet<ProcessInfo>(compareBy({ it.name }, { it.isIsolated }))
+        processSet += packageInfo.activities.toProcessList()
+        processSet += packageInfo.services.toProcessList()
+        processSet += packageInfo.receivers.toProcessList()
+        processSet += packageInfo.providers.toProcessList()
+        return processSet
+    }
+
+    companion object {
+        private val comparator = compareBy<AppProcessInfo>(
+            { it.label.lowercase(Locale.ROOT) },
+            { it.info.packageName }
+        )
+    }
+}
+
+data class ProcessInfo(
+    val name: String,
+    val packageName: String,
+    var isEnabled: Boolean
+) {
+    val isIsolated = packageName == ISOLATED_MAGIC
+    val isAppZygote = name.endsWith("_zygote")
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListFragment.kt

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk.ui.deny
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuProvider
+import androidx.recyclerview.widget.RecyclerView
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.ktx.hideKeyboard
+import com.topjohnwu.magisk.databinding.FragmentDenyMd2Binding
+import rikka.recyclerview.addEdgeSpacing
+import rikka.recyclerview.addItemSpacing
+import rikka.recyclerview.fixEdgeEffect
+import com.topjohnwu.magisk.core.R as CoreR
+
+class DenyListFragment : BaseFragment<FragmentDenyMd2Binding>(), MenuProvider {
+
+    override val layoutRes = R.layout.fragment_deny_md2
+    override val viewModel by viewModel<DenyListViewModel>()
+
+    private lateinit var searchView: SearchView
+
+    override fun onStart() {
+        super.onStart()
+        activity?.setTitle(CoreR.string.denylist)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.appList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                if (newState != RecyclerView.SCROLL_STATE_IDLE) activity?.hideKeyboard()
+            }
+        })
+
+        binding.appList.apply {
+            addEdgeSpacing(top = R.dimen.l_50, bottom = R.dimen.l1)
+            addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
+            fixEdgeEffect()
+        }
+    }
+
+    override fun onPreBind(binding: FragmentDenyMd2Binding) = Unit
+
+    override fun onBackPressed(): Boolean {
+        if (searchView.isIconfiedByDefault && !searchView.isIconified) {
+            searchView.isIconified = true
+            return true
+        }
+        return super.onBackPressed()
+    }
+
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_deny_md2, menu)
+        searchView = menu.findItem(R.id.action_search).actionView as SearchView
+        searchView.queryHint = searchView.context.getString(CoreR.string.hide_filter_hint)
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String?): Boolean {
+                viewModel.query = query ?: ""
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String?): Boolean {
+                viewModel.query = newText ?: ""
+                return true
+            }
+        })
+    }
+
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_show_system -> {
+                val check = !item.isChecked
+                viewModel.isShowSystem = check
+                item.isChecked = check
+                return true
+            }
+            R.id.action_show_OS -> {
+                val check = !item.isChecked
+                viewModel.isShowOS = check
+                item.isChecked = check
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onPrepareMenu(menu: Menu) {
+        val showSystem = menu.findItem(R.id.action_show_system)
+        val showOS = menu.findItem(R.id.action_show_OS)
+        showOS.isEnabled = showSystem.isChecked
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListRvItem.kt

@@ -0,0 +1,130 @@
+package com.topjohnwu.magisk.ui.deny
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.startAnimations
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.superuser.Shell
+import kotlin.math.roundToInt
+
+class DenyListRvItem(
+    val info: AppProcessInfo
+) : ObservableRvItem(), DiffItem<DenyListRvItem>, Comparable<DenyListRvItem> {
+
+    override val layoutRes get() = R.layout.item_hide_md2
+
+    val processes = info.processes.map { ProcessRvItem(it) }
+
+    @get:Bindable
+    var isExpanded = false
+        set(value) = set(value, field, { field = it }, BR.expanded)
+
+    var itemsChecked = 0
+        set(value) = set(value, field, { field = it }, BR.checkedPercent)
+
+    val isChecked get() = itemsChecked != 0
+
+    @get:Bindable
+    val checkedPercent get() = (itemsChecked.toFloat() / processes.size * 100).roundToInt()
+
+    private var _state: Boolean? = false
+        set(value) = set(value, field, { field = it }, BR.state)
+
+    @get:Bindable
+    var state: Boolean?
+        get() = _state
+        set(value) = set(value, _state, { _state = it }, BR.state) {
+            if (value == true) {
+                processes
+                    .filterNot { it.isEnabled }
+                    .filter { isExpanded || it.defaultSelection }
+                    .forEach { it.toggle() }
+            } else {
+                Shell.cmd("magisk --denylist rm ${info.packageName}").submit()
+                processes.filter { it.isEnabled }.forEach {
+                    if (it.process.isIsolated) {
+                        it.toggle()
+                    } else {
+                        it.isEnabled = !it.isEnabled
+                        notifyPropertyChanged(BR.enabled)
+                    }
+                }
+            }
+        }
+
+    init {
+        processes.forEach { it.addOnPropertyChangedCallback(BR.enabled) { recalculateChecked() } }
+        addOnPropertyChangedCallback(BR.expanded) { recalculateChecked() }
+        recalculateChecked()
+    }
+
+    fun toggleExpand(v: View) {
+        (v.parent as? ViewGroup)?.startAnimations()
+        isExpanded = !isExpanded
+    }
+
+    private fun recalculateChecked() {
+        itemsChecked = processes.count { it.isEnabled }
+        _state = if (isExpanded) {
+            when (itemsChecked) {
+                0 -> false
+                processes.size -> true
+                else -> null
+            }
+        } else {
+            val defaultProcesses = processes.filter { it.defaultSelection }
+            when (defaultProcesses.count { it.isEnabled }) {
+                0 -> false
+                defaultProcesses.size -> true
+                else -> null
+            }
+        }
+    }
+
+    override fun compareTo(other: DenyListRvItem) = comparator.compare(this, other)
+
+    companion object {
+        private val comparator = compareBy<DenyListRvItem>(
+            { it.itemsChecked == 0 },
+            { it.info }
+        )
+    }
+
+}
+
+class ProcessRvItem(
+    val process: ProcessInfo
+) : ObservableRvItem(), DiffItem<ProcessRvItem> {
+
+    override val layoutRes get() = R.layout.item_hide_process_md2
+
+    val displayName = if (process.isIsolated) "(isolated) ${process.name}" else process.name
+
+    @get:Bindable
+    var isEnabled
+        get() = process.isEnabled
+        set(value) = set(value, process.isEnabled, { process.isEnabled = it }, BR.enabled) {
+            val arg = if (it) "add" else "rm"
+            val (name, pkg) = process
+            Shell.cmd("magisk --denylist $arg $pkg \'$name\'").submit()
+        }
+
+    fun toggle() {
+        isEnabled = !isEnabled
+    }
+
+    val defaultSelection get() =
+        process.isIsolated || process.isAppZygote || process.name == process.packageName
+
+    override fun itemSameAs(other: ProcessRvItem) =
+        process.name == other.process.name && process.packageName == other.process.packageName
+
+    override fun contentSameAs(other: ProcessRvItem) =
+        process.isEnabled == other.process.isEnabled
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/deny/DenyListViewModel.kt

@@ -0,0 +1,89 @@
+package com.topjohnwu.magisk.ui.deny
+
+import android.annotation.SuppressLint
+import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
+import androidx.databinding.Bindable
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.ktx.concurrentMap
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.filterList
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.toCollection
+import kotlinx.coroutines.withContext
+
+class DenyListViewModel : AsyncLoadViewModel() {
+
+    var isShowSystem = false
+        set(value) {
+            field = value
+            doQuery(query)
+        }
+
+    var isShowOS = false
+        set(value) {
+            field = value
+            doQuery(query)
+        }
+
+    var query = ""
+        set(value) {
+            field = value
+            doQuery(value)
+        }
+
+    val items = filterList<DenyListRvItem>(viewModelScope)
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
+    }
+
+    @get:Bindable
+    var loading = true
+        private set(value) = set(value, field, { field = it }, BR.loading)
+
+    @SuppressLint("InlinedApi")
+    override suspend fun doLoadWork() {
+        loading = true
+        val apps = withContext(Dispatchers.Default) {
+            val pm = AppContext.packageManager
+            val denyList = Shell.cmd("magisk --denylist ls").exec().out
+                .map { CmdlineListItem(it) }
+            val apps = pm.getInstalledApplications(MATCH_UNINSTALLED_PACKAGES).run {
+                asFlow()
+                    .filter { AppContext.packageName != it.packageName }
+                    .concurrentMap { AppProcessInfo(it, pm, denyList) }
+                    .filter { it.processes.isNotEmpty() }
+                    .concurrentMap { DenyListRvItem(it) }
+                    .toCollection(ArrayList(size))
+            }
+            apps.sort()
+            apps
+        }
+        items.set(apps)
+        doQuery(query)
+    }
+
+    private fun doQuery(s: String) {
+        items.filter {
+            fun filterSystem() = isShowSystem || !it.info.isSystemApp()
+
+            fun filterOS() = (isShowSystem && isShowOS) || it.info.isApp()
+
+            fun filterQuery(): Boolean {
+                fun inName() = it.info.label.contains(s, true)
+                fun inPackage() = it.info.packageName.contains(s, true)
+                fun inProcesses() = it.processes.any { p -> p.process.name.contains(s, true) }
+                return inName() || inPackage() || inProcesses()
+            }
+
+            (it.isChecked || (filterSystem() && filterOS())) && filterQuery()
+        }
+        loading = false
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt

@@ -6,16 +6,20 @@ import androidx.core.view.updateLayoutParams
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.databinding.LenientRvItem
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.ViewAwareItem
 import kotlin.math.max
 
-class ConsoleItem(val item: String) : ComparableRvItem<ConsoleItem>(), LenientRvItem {
+class ConsoleItem(
+    override val item: String
+) : RvItem(), ViewAwareItem, DiffItem<ConsoleItem>, ItemWrapper<String> {
     override val layoutRes = R.layout.item_console_md2
 
     private var parentWidth = -1
 
-    override fun onBindingBound(binding: ViewDataBinding, recyclerView: RecyclerView) {
+    override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
         if (parentWidth < 0)
             parentWidth = (recyclerView.parent as View).width
 
@@ -31,7 +35,4 @@ class ConsoleItem(val item: String) : ComparableRvItem<ConsoleItem>(), LenientRv
             recyclerView.requestLayout()
         }
     }
-
-    override fun contentSameAs(other: ConsoleItem) = itemSameAs(other)
-    override fun itemSameAs(other: ConsoleItem) = item == other.item
 }

app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt

@@ -0,0 +1,149 @@
+package com.topjohnwu.magisk.ui.flash
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.net.Uri
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.view.MenuProvider
+import androidx.core.view.isVisible
+import androidx.navigation.NavDeepLinkBuilder
+import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.cmp
+import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
+import com.topjohnwu.magisk.ui.MainActivity
+import com.topjohnwu.magisk.core.R as CoreR
+
+class FlashFragment : BaseFragment<FragmentFlashMd2Binding>(), MenuProvider {
+
+    override val layoutRes = R.layout.fragment_flash_md2
+    override val viewModel by viewModel<FlashViewModel>()
+    override val snackbarView: View get() = binding.snackbarContainer
+    override val snackbarAnchorView: View?
+        get() = if (binding.restartBtn.isShown) binding.restartBtn else super.snackbarAnchorView
+
+    private var defaultOrientation = -1
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel.args = FlashFragmentArgs.fromBundle(requireArguments())
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activity?.setTitle(CoreR.string.flash_screen_title)
+
+        viewModel.state.observe(this) {
+            activity?.supportActionBar?.setSubtitle(
+                when (it) {
+                    FlashViewModel.State.FLASHING -> CoreR.string.flashing
+                    FlashViewModel.State.SUCCESS -> CoreR.string.done
+                    FlashViewModel.State.FAILED -> CoreR.string.failure
+                }
+            )
+            if (it == FlashViewModel.State.SUCCESS && viewModel.showReboot) {
+                binding.restartBtn.apply {
+                    if (!this.isVisible) this.show()
+                    if (!this.isFocused) this.requestFocus()
+                }
+            }
+        }
+    }
+
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_flash, menu)
+    }
+
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
+        return viewModel.onMenuItemClicked(item)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        defaultOrientation = activity?.requestedOrientation ?: -1
+        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
+        if (savedInstanceState == null) {
+            viewModel.startFlashing()
+        }
+    }
+
+    @SuppressLint("WrongConstant")
+    override fun onDestroyView() {
+        if (defaultOrientation != -1) {
+            activity?.requestedOrientation = defaultOrientation
+        }
+        super.onDestroyView()
+    }
+
+    override fun onKeyEvent(event: KeyEvent): Boolean {
+        return when (event.keyCode) {
+            KeyEvent.KEYCODE_VOLUME_UP,
+            KeyEvent.KEYCODE_VOLUME_DOWN -> true
+            else -> false
+        }
+    }
+
+    override fun onBackPressed(): Boolean {
+        if (viewModel.flashing.value == true)
+            return true
+        return super.onBackPressed()
+    }
+
+    override fun onPreBind(binding: FragmentFlashMd2Binding) = Unit
+
+    companion object {
+
+        private fun createIntent(context: Context, args: FlashFragmentArgs) =
+            NavDeepLinkBuilder(context)
+                .setGraph(R.navigation.main)
+                .setComponentName(MainActivity::class.java.cmp(context.packageName))
+                .setDestination(R.id.flashFragment)
+                .setArguments(args.toBundle())
+                .createPendingIntent()
+
+        private fun flashType(isSecondSlot: Boolean) =
+            if (isSecondSlot) Const.Value.FLASH_INACTIVE_SLOT else Const.Value.FLASH_MAGISK
+
+        /* Flashing is understood as installing / flashing magisk itself */
+
+        fun flash(isSecondSlot: Boolean) = MainDirections.actionFlashFragment(
+            action = flashType(isSecondSlot)
+        )
+
+        /* Patching is understood as injecting img files with magisk */
+
+        fun patch(uri: Uri) = MainDirections.actionFlashFragment(
+            action = Const.Value.PATCH_FILE,
+            additionalData = uri
+        )
+
+        /* Uninstalling is understood as removing magisk entirely */
+
+        fun uninstall() = MainDirections.actionFlashFragment(
+            action = Const.Value.UNINSTALL
+        )
+
+        /* Installing is understood as flashing modules / zips */
+
+        fun installIntent(context: Context, file: Uri) = FlashFragmentArgs(
+            action = Const.Value.FLASH_ZIP,
+            additionalData = file,
+        ).let { createIntent(context, it) }
+
+        fun install(file: Uri) = MainDirections.actionFlashFragment(
+            action = Const.Value.FLASH_ZIP,
+            additionalData = file,
+        )
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt

@@ -1,45 +1,47 @@
 package com.topjohnwu.magisk.ui.flash
 
-import android.net.Uri
 import android.view.MenuItem
 import androidx.databinding.Bindable
+import androidx.databinding.ObservableArrayList
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseViewModel
-import com.topjohnwu.magisk.arch.diffListOf
-import com.topjohnwu.magisk.arch.itemBindingOf
 import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.ktx.reboot
+import com.topjohnwu.magisk.core.ktx.synchronized
+import com.topjohnwu.magisk.core.ktx.timeFormatStandard
+import com.topjohnwu.magisk.core.ktx.toTime
 import com.topjohnwu.magisk.core.tasks.FlashZip
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
-import com.topjohnwu.magisk.databinding.RvBindingAdapter
+import com.topjohnwu.magisk.databinding.set
 import com.topjohnwu.magisk.events.SnackbarEvent
-import com.topjohnwu.magisk.ktx.*
-import com.topjohnwu.magisk.utils.set
-import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.superuser.CallbackList
-import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class FlashViewModel(
-    args: FlashFragmentArgs
-) : BaseViewModel() {
+class FlashViewModel : BaseViewModel() {
+
+    enum class State {
+        FLASHING, SUCCESS, FAILED
+    }
+
+    private val _state = MutableLiveData(State.FLASHING)
+    val state: LiveData<State> get() = _state
+    val flashing = state.map { it == State.FLASHING }
 
     @get:Bindable
-    var showReboot = Shell.rootAccess()
+    var showReboot = Info.isRooted
         set(value) = set(value, field, { field = it }, BR.showReboot)
 
-    private val _subtitle = MutableLiveData(R.string.flashing)
-    val subtitle get() = _subtitle as LiveData<Int>
-
-    val adapter = RvBindingAdapter<ConsoleItem>()
-    val items = diffListOf<ConsoleItem>()
-    val itemBinding = itemBindingOf<ConsoleItem>()
+    val items = ObservableArrayList<ConsoleItem>()
+    lateinit var args: FlashFragmentArgs
 
     private val logItems = mutableListOf<String>().synchronized()
     private val outItems = object : CallbackList<String>() {
@@ -50,34 +52,33 @@ class FlashViewModel(
         }
     }
 
-    init {
-        args.dismissId.takeIf { it != -1 }?.also {
-            Notifications.mgr.cancel(it)
-        }
-        val (installer, action, uri) = args
-        startFlashing(installer, uri, action)
-    }
+    fun startFlashing() {
+        val (action, uri) = args
 
-    private fun startFlashing(installer: Uri, uri: Uri?, action: String) {
         viewModelScope.launch {
             val result = when (action) {
                 Const.Value.FLASH_ZIP -> {
-                    FlashZip(installer, outItems, logItems).exec()
+                    uri ?: return@launch
+                    FlashZip(uri, outItems, logItems).exec()
                 }
                 Const.Value.UNINSTALL -> {
                     showReboot = false
-                    FlashZip.Uninstall(installer, outItems, logItems).exec()
+                    MagiskInstaller.Uninstall(outItems, logItems).exec()
                 }
                 Const.Value.FLASH_MAGISK -> {
-                    MagiskInstaller.Direct(installer, outItems, logItems).exec()
+                    if (Info.isEmulator)
+                        MagiskInstaller.Emulator(outItems, logItems).exec()
+                    else
+                        MagiskInstaller.Direct(outItems, logItems).exec()
                 }
                 Const.Value.FLASH_INACTIVE_SLOT -> {
-                    MagiskInstaller.SecondSlot(installer, outItems, logItems).exec()
+                    showReboot = false
+                    MagiskInstaller.SecondSlot(outItems, logItems).exec()
                 }
                 Const.Value.PATCH_FILE -> {
                     uri ?: return@launch
                     showReboot = false
-                    MagiskInstaller.Patch(installer, uri, outItems, logItems).exec()
+                    MagiskInstaller.Patch(uri, outItems, logItems).exec()
                 }
                 else -> {
                     back()
@@ -89,11 +90,7 @@ class FlashViewModel(
     }
 
     private fun onResult(success: Boolean) {
-        state = if (success) State.LOADED else State.LOADING_FAILED
-        when {
-            success -> _subtitle.postValue(R.string.done)
-            else -> _subtitle.postValue(R.string.failure)
-        }
+        _state.value = if (success) State.SUCCESS else State.FAILED
     }
 
     fun onMenuItemClicked(item: MenuItem): Boolean {
@@ -105,12 +102,16 @@ class FlashViewModel(
 
     private fun savePressed() = withExternalRW {
         viewModelScope.launch(Dispatchers.IO) {
-            val name = "magisk_install_log_%s.log".format(now.toTime(timeFormatStandard))
-            val file = MediaStoreUtils.getFile(name, true)
+            val name = "magisk_install_log_%s.log".format(
+                System.currentTimeMillis().toTime(timeFormatStandard)
+            )
+            val file = MediaStoreUtils.getFile(name)
             file.uri.outputStream().bufferedWriter().use { writer ->
-                logItems.forEach {
-                    writer.write(it)
-                    writer.newLine()
+                synchronized(logItems) {
+                    logItems.forEach {
+                        writer.write(it)
+                        writer.newLine()
+                    }
                 }
             }
             SnackbarEvent(file.toString()).publish()

app/apk/src/main/java/com/topjohnwu/magisk/ui/home/DeveloperItem.kt

@@ -0,0 +1,127 @@
+package com.topjohnwu.magisk.ui.home
+
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.core.R as CoreR
+
+interface Dev {
+    val name: String
+}
+
+private interface JohnImpl : Dev {
+    override val name get() = "topjohnwu"
+}
+
+private interface VvbImpl : Dev {
+    override val name get() = "vvb2060"
+}
+
+private interface YUImpl : Dev {
+    override val name get() = "yujincheng08"
+}
+
+private interface RikkaImpl : Dev {
+    override val name get() = "RikkaW"
+}
+
+private interface CanyieImpl : Dev {
+    override val name get() = "canyie"
+}
+
+sealed class DeveloperItem : Dev {
+
+    abstract val items: List<IconLink>
+    val handle get() = "@${name}"
+
+    object John : DeveloperItem(), JohnImpl {
+        override val items =
+            listOf(
+                object : IconLink.Twitter(), JohnImpl {},
+                IconLink.Github.Project
+            )
+    }
+
+    object Vvb : DeveloperItem(), VvbImpl {
+        override val items =
+            listOf<IconLink>(
+                object : IconLink.Twitter(), VvbImpl {},
+                object : IconLink.Github.User(), VvbImpl {}
+            )
+    }
+
+    object YU : DeveloperItem(), YUImpl {
+        override val items =
+            listOf<IconLink>(
+                object : IconLink.Twitter() { override val name = "shanasaimoe" },
+                object : IconLink.Github.User(), YUImpl {},
+                object : IconLink.Sponsor(), YUImpl {}
+            )
+    }
+
+    object Rikka : DeveloperItem(), RikkaImpl {
+        override val items =
+            listOf<IconLink>(
+                object : IconLink.Twitter() { override val name = "rikkawww" },
+                object : IconLink.Github.User(), RikkaImpl {}
+            )
+    }
+
+    object Canyie : DeveloperItem(), CanyieImpl {
+        override val items =
+            listOf<IconLink>(
+                object : IconLink.Twitter() { override val name = "canyie2977" },
+                object : IconLink.Github.User(), CanyieImpl {}
+            )
+    }
+}
+
+sealed class IconLink : RvItem() {
+
+    abstract val icon: Int
+    abstract val title: Int
+    abstract val link: String
+
+    override val layoutRes get() = R.layout.item_icon_link
+
+    abstract class PayPal : IconLink(), Dev {
+        override val icon get() = CoreR.drawable.ic_paypal
+        override val title get() = CoreR.string.paypal
+        override val link get() = "https://paypal.me/$name"
+
+        object Project : PayPal() {
+            override val name: String get() = "magiskdonate"
+        }
+    }
+
+    object Patreon : IconLink() {
+        override val icon get() = CoreR.drawable.ic_patreon
+        override val title get() = CoreR.string.patreon
+        override val link get() = Const.Url.PATREON_URL
+    }
+
+    abstract class Twitter : IconLink(), Dev {
+        override val icon get() = CoreR.drawable.ic_twitter
+        override val title get() = CoreR.string.twitter
+        override val link get() = "https://twitter.com/$name"
+    }
+
+    abstract class Github : IconLink() {
+        override val icon get() = CoreR.drawable.ic_github
+        override val title get() = CoreR.string.github
+
+        abstract class User : Github(), Dev {
+            override val link get() = "https://github.com/$name"
+        }
+
+        object Project : Github() {
+            override val link get() = Const.Url.SOURCE_CODE_URL
+        }
+    }
+
+    abstract class Sponsor : IconLink(), Dev {
+        override val icon get() = CoreR.drawable.ic_favorite
+        override val title get() = CoreR.string.github
+        override val link get() = "https://github.com/sponsors/$name"
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt

@@ -0,0 +1,82 @@
+package com.topjohnwu.magisk.ui.home
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.MenuProvider
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.download.DownloadEngine
+import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
+import com.topjohnwu.magisk.core.R as CoreR
+
+class HomeFragment : BaseFragment<FragmentHomeMd2Binding>(), MenuProvider {
+
+    override val layoutRes = R.layout.fragment_home_md2
+    override val viewModel by viewModel<HomeViewModel>()
+
+    override fun onStart() {
+        super.onStart()
+        activity?.setTitle(CoreR.string.section_home)
+        DownloadEngine.observeProgress(this, viewModel::onProgressUpdate)
+    }
+
+    private fun checkTitle(text: TextView, icon: ImageView) {
+        text.post {
+            if (text.layout?.getEllipsisCount(0) != 0) {
+                with (icon) {
+                    layoutParams.width = 0
+                    layoutParams.height = 0
+                    requestLayout()
+                }
+            }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        // If titles are squished, hide icons
+        with(binding.homeMagiskWrapper) {
+            checkTitle(homeMagiskTitle, homeMagiskIcon)
+        }
+        with(binding.homeManagerWrapper) {
+            checkTitle(homeManagerTitle, homeManagerIcon)
+        }
+
+        return binding.root
+    }
+
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_home_md2, menu)
+        if (!Info.isRooted)
+            menu.removeItem(R.id.action_reboot)
+    }
+
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_settings ->
+                HomeFragmentDirections.actionHomeFragmentToSettingsFragment().navigate()
+            R.id.action_reboot -> activity?.let { RebootMenu.inflate(it).show() }
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.stateManagerProgress = 0
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

@@ -0,0 +1,167 @@
+package com.topjohnwu.magisk.ui.home
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.widget.Toast
+import androidx.core.net.toUri
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.ActivityExecutor
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
+import com.topjohnwu.magisk.arch.ContextExecutor
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.arch.ViewEvent
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.download.Subject
+import com.topjohnwu.magisk.core.download.Subject.App
+import com.topjohnwu.magisk.core.ktx.await
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.repository.NetworkService
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.dialog.EnvFixDialog
+import com.topjohnwu.magisk.dialog.ManagerInstallDialog
+import com.topjohnwu.magisk.dialog.UninstallDialog
+import com.topjohnwu.magisk.events.SnackbarEvent
+import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.superuser.Shell
+import kotlin.math.roundToInt
+import com.topjohnwu.magisk.core.R as CoreR
+
+class HomeViewModel(
+    private val svc: NetworkService
+) : AsyncLoadViewModel() {
+
+    enum class State {
+        LOADING, INVALID, OUTDATED, UP_TO_DATE
+    }
+
+    val magiskTitleBarrierIds =
+        intArrayOf(R.id.home_magisk_icon, R.id.home_magisk_title, R.id.home_magisk_button)
+    val appTitleBarrierIds =
+        intArrayOf(R.id.home_manager_icon, R.id.home_manager_title, R.id.home_manager_button)
+
+    @get:Bindable
+    var isNoticeVisible = Config.safetyNotice
+        set(value) = set(value, field, { field = it }, BR.noticeVisible)
+
+    val magiskState
+        get() = when {
+            Info.isRooted && Info.env.isUnsupported -> State.OUTDATED
+            !Info.env.isActive -> State.INVALID
+            Info.env.versionCode < BuildConfig.APP_VERSION_CODE -> State.OUTDATED
+            else -> State.UP_TO_DATE
+        }
+
+    @get:Bindable
+    var appState = State.LOADING
+        set(value) = set(value, field, { field = it }, BR.appState)
+
+    val magiskInstalledVersion
+        get() = Info.env.run {
+            if (isActive)
+                ("$versionString ($versionCode)" + if (isDebug) " (D)" else "").asText()
+            else
+                CoreR.string.not_available.asText()
+        }
+
+    @get:Bindable
+    var managerRemoteVersion = CoreR.string.loading.asText()
+        set(value) = set(value, field, { field = it }, BR.managerRemoteVersion)
+
+    val managerInstalledVersion
+        get() = "${BuildConfig.APP_VERSION_NAME} (${BuildConfig.APP_VERSION_CODE})" +
+            if (BuildConfig.DEBUG) " (D)" else ""
+
+    @get:Bindable
+    var stateManagerProgress = 0
+        set(value) = set(value, field, { field = it }, BR.stateManagerProgress)
+
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
+    }
+
+    companion object {
+        private var checkedEnv = false
+    }
+
+    override suspend fun doLoadWork() {
+        appState = State.LOADING
+        Info.getRemote(svc)?.apply {
+            appState = when {
+                BuildConfig.APP_VERSION_CODE < magisk.versionCode -> State.OUTDATED
+                else -> State.UP_TO_DATE
+            }
+
+            val isDebug = Config.updateChannel == Config.Value.DEBUG_CHANNEL
+            managerRemoteVersion =
+                ("${magisk.version} (${magisk.versionCode})" +
+                    if (isDebug) " (D)" else "").asText()
+        } ?: run {
+            appState = State.INVALID
+            managerRemoteVersion = CoreR.string.not_available.asText()
+        }
+        ensureEnv()
+    }
+
+    override fun onNetworkChanged(network: Boolean) = startLoading()
+
+    fun onProgressUpdate(progress: Float, subject: Subject) {
+        if (subject is App)
+            stateManagerProgress = progress.times(100f).roundToInt()
+    }
+
+    fun onLinkPressed(link: String) = object : ViewEvent(), ContextExecutor {
+        override fun invoke(context: Context) {
+            val intent = Intent(Intent.ACTION_VIEW, link.toUri())
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            try {
+                context.startActivity(intent)
+            } catch (e: ActivityNotFoundException) {
+                context.toast(CoreR.string.open_link_failed_toast, Toast.LENGTH_SHORT)
+            }
+        }
+    }.publish()
+
+    fun onDeletePressed() = UninstallDialog().show()
+
+    fun onManagerPressed() = when (appState) {
+        State.LOADING -> SnackbarEvent(CoreR.string.loading).publish()
+        State.INVALID -> SnackbarEvent(CoreR.string.no_connection).publish()
+        else -> withExternalRW {
+            withInstallPermission {
+                ManagerInstallDialog().show()
+            }
+        }
+    }
+
+    fun onMagiskPressed() = withExternalRW {
+        HomeFragmentDirections.actionHomeFragmentToInstallFragment().navigate()
+    }
+
+    fun hideNotice() {
+        Config.safetyNotice = false
+        isNoticeVisible = false
+    }
+
+    private suspend fun ensureEnv() {
+        if (magiskState == State.INVALID || checkedEnv) return
+        val cmd = "env_check ${Info.env.versionString} ${Info.env.versionCode}"
+        val code = Shell.cmd(cmd).await().code
+        if (code != 0) {
+            EnvFixDialog(this, code).show()
+        }
+        checkedEnv = true
+    }
+
+    val showTest = false
+    fun onTestPressed() = object : ViewEvent(), ActivityExecutor {
+        override fun invoke(activity: UIActivity<*>) {
+            /* Entry point to trigger test events within the app */
+        }
+    }.publish()
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/home/RebootMenu.kt

@@ -1,5 +1,6 @@
-package com.topjohnwu.magisk.events
+package com.topjohnwu.magisk.ui.home
 
+import android.app.Activity
 import android.os.Build
 import android.os.PowerManager
 import android.view.ContextThemeWrapper
@@ -7,11 +8,11 @@ import android.view.MenuItem
 import android.widget.PopupMenu
 import androidx.core.content.getSystemService
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.magisk.ktx.reboot as systemReboot
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.ktx.reboot as systemReboot
 
-object RebootEvent {
+object RebootMenu {
 
     private fun reboot(item: MenuItem): Boolean {
         when (item.itemId) {
@@ -20,20 +21,31 @@ object RebootEvent {
             R.id.action_reboot_bootloader -> systemReboot("bootloader")
             R.id.action_reboot_download -> systemReboot("download")
             R.id.action_reboot_edl -> systemReboot("edl")
-            R.id.action_reboot_recovery -> Shell.su("/system/bin/reboot recovery").submit()
+            R.id.action_reboot_recovery -> systemReboot("recovery")
+            R.id.action_reboot_safe_mode -> {
+                val status = !item.isChecked
+                item.isChecked = status
+                Config.bootloop = if (status) 2 else 0
+            }
             else -> Unit
         }
         return true
     }
 
-    fun inflateMenu(activity: BaseActivity): PopupMenu {
+    fun inflate(activity: Activity): PopupMenu {
         val themeWrapper = ContextThemeWrapper(activity, R.style.Foundation_PopupMenu)
         val menu = PopupMenu(themeWrapper, activity.findViewById(R.id.action_reboot))
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
-            activity.getSystemService<PowerManager>()?.isRebootingUserspaceSupported == true)
-            menu.menu.getItem(R.id.action_reboot_userspace).isVisible = true
         activity.menuInflater.inflate(R.menu.menu_reboot, menu.menu)
-        menu.setOnMenuItemClickListener(::reboot)
+        menu.setOnMenuItemClickListener(RebootMenu::reboot)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            activity.getSystemService<PowerManager>()?.isRebootingUserspaceSupported == true) {
+            menu.menu.findItem(R.id.action_reboot_userspace).isVisible = true
+        }
+        if (Const.Version.isCanary()) {
+            menu.menu.findItem(R.id.action_reboot_safe_mode).isChecked = Config.bootloop >= 2
+        } else {
+            menu.menu.findItem(R.id.action_reboot_safe_mode).isVisible = false
+        }
         return menu
     }
 

app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt

@@ -0,0 +1,18 @@
+package com.topjohnwu.magisk.ui.install
+
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
+import com.topjohnwu.magisk.core.R as CoreR
+
+class InstallFragment : BaseFragment<FragmentInstallMd2Binding>() {
+
+    override val layoutRes = R.layout.fragment_install_md2
+    override val viewModel by viewModel<InstallViewModel>()
+
+    override fun onStart() {
+        super.onStart()
+        requireActivity().setTitle(CoreR.string.install)
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt

@@ -0,0 +1,145 @@
+package com.topjohnwu.magisk.ui.install
+
+import android.net.Uri
+import android.os.Bundle
+import android.os.Parcelable
+import android.text.Spanned
+import android.text.SpannedString
+import android.widget.Toast
+import androidx.databinding.Bindable
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.base.ContentResultCallback
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.repository.NetworkService
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.dialog.SecondSlotWarningDialog
+import com.topjohnwu.magisk.events.GetContentEvent
+import com.topjohnwu.magisk.ui.flash.FlashFragment
+import io.noties.markwon.Markwon
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import com.topjohnwu.magisk.core.R as CoreR
+
+class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() {
+
+    val isRooted get() = Info.isRooted
+    val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && Info.ramdisk)
+    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
+
+    @get:Bindable
+    var step = if (skipOptions) 1 else 0
+        set(value) = set(value, field, { field = it }, BR.step)
+
+    private var methodId = -1
+
+    @get:Bindable
+    var method
+        get() = methodId
+        set(value) = set(value, methodId, { methodId = it }, BR.method) {
+            when (it) {
+                R.id.method_patch -> {
+                    GetContentEvent("*/*", UriCallback()).publish()
+                }
+                R.id.method_inactive_slot -> {
+                    SecondSlotWarningDialog().show()
+                }
+            }
+        }
+
+    val data: LiveData<Uri?> get() = uri
+
+    @get:Bindable
+    var notes: Spanned = SpannedString("")
+        set(value) = set(value, field, { field = it }, BR.notes)
+
+    init {
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val file = File(AppContext.cacheDir, "${BuildConfig.APP_VERSION_CODE}.md")
+                val text = when {
+                    file.exists() -> file.readText()
+                    Const.Url.CHANGELOG_URL.isEmpty() -> ""
+                    else -> {
+                        val str = svc.fetchString(Const.Url.CHANGELOG_URL)
+                        file.writeText(str)
+                        str
+                    }
+                }
+                val spanned = markwon.toMarkdown(text)
+                withContext(Dispatchers.Main) {
+                    notes = spanned
+                }
+            } catch (e: IOException) {
+                Timber.e(e)
+            }
+        }
+    }
+
+    fun install() {
+        when (method) {
+            R.id.method_patch -> FlashFragment.patch(data.value!!).navigate(true)
+            R.id.method_direct -> FlashFragment.flash(false).navigate(true)
+            R.id.method_inactive_slot -> FlashFragment.flash(true).navigate(true)
+            else -> error("Unknown value")
+        }
+    }
+
+    override fun onSaveState(state: Bundle) {
+        state.putParcelable(INSTALL_STATE_KEY, InstallState(
+            methodId,
+            step,
+            Config.keepVerity,
+            Config.keepEnc,
+            Config.recovery
+        ))
+    }
+
+    override fun onRestoreState(state: Bundle) {
+        state.getParcelable<InstallState>(INSTALL_STATE_KEY)?.let {
+            methodId = it.method
+            step = it.step
+            Config.keepVerity = it.keepVerity
+            Config.keepEnc = it.keepEnc
+            Config.recovery = it.recovery
+        }
+    }
+
+    @Parcelize
+    class UriCallback : ContentResultCallback {
+        override fun onActivityLaunch() {
+            AppContext.toast(CoreR.string.patch_file_msg, Toast.LENGTH_LONG)
+        }
+        override fun onActivityResult(result: Uri) {
+            uri.value = result
+        }
+    }
+
+    @Parcelize
+    class InstallState(
+        val method: Int,
+        val step: Int,
+        val keepVerity: Boolean,
+        val keepEnc: Boolean,
+        val recovery: Boolean,
+    ) : Parcelable
+
+    companion object {
+        private const val INSTALL_STATE_KEY = "install_state"
+        private val uri = MutableLiveData<Uri?>()
+    }
+}

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

@@ -5,21 +5,27 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.arch.BaseUIFragment
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
 import com.topjohnwu.magisk.databinding.FragmentLogMd2Binding
-import com.topjohnwu.magisk.ktx.addSimpleItemDecoration
-import com.topjohnwu.magisk.ktx.addVerticalPadding
-import com.topjohnwu.magisk.ktx.fixEdgeEffect
 import com.topjohnwu.magisk.ui.MainActivity
 import com.topjohnwu.magisk.utils.MotionRevealHelper
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import rikka.recyclerview.addEdgeSpacing
+import rikka.recyclerview.addItemSpacing
+import rikka.recyclerview.fixEdgeEffect
+import com.topjohnwu.magisk.core.R as CoreR
 
-class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
+class LogFragment : BaseFragment<FragmentLogMd2Binding>(), MenuProvider {
 
     override val layoutRes = R.layout.fragment_log_md2
     override val viewModel by viewModel<LogViewModel>()
+    override val snackbarView: View?
+        get() = if (isMagiskLogVisible) binding.logFilterSuperuser.snackbarContainer
+                else super.snackbarView
+    override val snackbarAnchorView get() = binding.logFilterToggle
 
     private var actionSave: MenuItem? = null
     private var isMagiskLogVisible
@@ -36,8 +42,7 @@ class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
 
     override fun onStart() {
         super.onStart()
-        setHasOptionsMenu(true)
-        activity.title = resources.getString(R.string.logs)
+        activity?.setTitle(CoreR.string.logs)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -46,32 +51,22 @@ class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
             isMagiskLogVisible = true
         }
 
-        val resource = requireContext().resources
-        val l_50 = resource.getDimensionPixelSize(R.dimen.l_50)
-        val l1 = resource.getDimensionPixelSize(R.dimen.l1)
-        binding.logFilterSuperuser.logSuperuser.addVerticalPadding(
-            0,
-            l1
-        )
-        binding.logFilterSuperuser.logSuperuser.addSimpleItemDecoration(
-            left = l1,
-            top = l_50,
-            right = l1,
-            bottom = l_50,
-        )
-        binding.logFilterSuperuser.logSuperuser.fixEdgeEffect()
+        binding.logFilterSuperuser.logSuperuser.apply {
+            addEdgeSpacing(bottom = R.dimen.l1)
+            addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
+            fixEdgeEffect()
+        }
     }
 
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_log_md2, menu)
         actionSave = menu.findItem(R.id.action_save)?.also {
             it.isVisible = !isMagiskLogVisible
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_save -> viewModel.saveMagiskLog()
             R.id.action_clear ->

app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt

@@ -0,0 +1,28 @@
+package com.topjohnwu.magisk.ui.log
+
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.textview.MaterialTextView
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.ViewAwareItem
+
+class LogRvItem(
+    override val item: String
+) : ObservableRvItem(), DiffItem<LogRvItem>, ItemWrapper<String>, ViewAwareItem {
+
+    override val layoutRes = R.layout.item_log_textview
+
+    override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) {
+        val view = binding.root as MaterialTextView
+        view.measure(0, 0)
+        val desiredWidth = view.measuredWidth
+        val layoutParams = view.layoutParams
+        layoutParams.width = desiredWidth
+        if (recyclerView.width < desiredWidth) {
+            recyclerView.requestLayout()
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -0,0 +1,114 @@
+package com.topjohnwu.magisk.ui.log
+
+import android.system.Os
+import androidx.databinding.Bindable
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.ktx.timeFormatStandard
+import com.topjohnwu.magisk.core.ktx.toTime
+import com.topjohnwu.magisk.core.repository.LogRepository
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.diffList
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.events.SnackbarEvent
+import com.topjohnwu.magisk.view.TextItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.FileInputStream
+
+class LogViewModel(
+    private val repo: LogRepository
+) : AsyncLoadViewModel() {
+    @get:Bindable
+    var loading = true
+        private set(value) = set(value, field, { field = it }, BR.loading)
+
+    // --- empty view
+
+    val itemEmpty = TextItem(R.string.log_data_none)
+    val itemMagiskEmpty = TextItem(R.string.log_data_magisk_none)
+
+    // --- su log
+
+    val items = diffList<SuLogRvItem>()
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
+    }
+
+    // --- magisk log
+    val logs = diffList<LogRvItem>()
+    var magiskLogRaw = " "
+
+    override suspend fun doLoadWork() {
+        loading = true
+
+        val (suLogs, suDiff) = withContext(Dispatchers.Default) {
+            magiskLogRaw = repo.fetchMagiskLogs()
+            val newLogs = magiskLogRaw.split('\n').map { LogRvItem(it) }
+            logs.update(newLogs)
+            val suLogs = repo.fetchSuLogs().map { SuLogRvItem(it) }
+            suLogs to items.calculateDiff(suLogs)
+        }
+
+        items.firstOrNull()?.isTop = false
+        items.lastOrNull()?.isBottom = false
+        items.update(suLogs, suDiff)
+        items.firstOrNull()?.isTop = true
+        items.lastOrNull()?.isBottom = true
+        loading = false
+    }
+
+    fun saveMagiskLog() = withExternalRW {
+        viewModelScope.launch(Dispatchers.IO) {
+            val filename = "magisk_log_%s.log".format(
+                System.currentTimeMillis().toTime(timeFormatStandard))
+            val logFile = MediaStoreUtils.getFile(filename)
+            logFile.uri.outputStream().bufferedWriter().use { file ->
+                file.write("---Detected Device Info---\n\n")
+                file.write("isAB=${Info.isAB}\n")
+                file.write("isSAR=${Info.isSAR}\n")
+                file.write("ramdisk=${Info.ramdisk}\n")
+                val uname = Os.uname()
+                file.write("kernel=${uname.sysname} ${uname.machine} ${uname.release} ${uname.version}\n")
+
+                file.write("\n\n---System Properties---\n\n")
+                ProcessBuilder("getprop").start()
+                    .inputStream.reader().use { it.copyTo(file) }
+
+                file.write("\n\n---Environment Variables---\n\n")
+                System.getenv().forEach { (key, value) -> file.write("${key}=${value}\n") }
+
+                file.write("\n\n---System MountInfo---\n\n")
+                FileInputStream("/proc/self/mountinfo").reader().use { it.copyTo(file) }
+
+                file.write("\n---Magisk Logs---\n")
+                file.write("${Info.env.versionString} (${Info.env.versionCode})\n\n")
+                if (Info.env.isActive) file.write(magiskLogRaw)
+
+                file.write("\n---Manager Logs---\n")
+                file.write("${BuildConfig.APP_VERSION_NAME} (${BuildConfig.APP_VERSION_CODE})\n\n")
+                ProcessBuilder("logcat", "-d").start()
+                    .inputStream.reader().use { it.copyTo(file) }
+            }
+            SnackbarEvent(logFile.toString()).publish()
+        }
+    }
+
+    fun clearMagiskLog() = repo.clearMagiskLogs {
+        SnackbarEvent(R.string.logs_cleared).publish()
+        startLoading()
+    }
+
+    fun clearLog() = viewModelScope.launch {
+        repo.clearLogs()
+        SnackbarEvent(R.string.logs_cleared).publish()
+        startLoading()
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/log/SuLogRvItem.kt

@@ -0,0 +1,54 @@
+package com.topjohnwu.magisk.ui.log
+
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.ktx.timeDateFormat
+import com.topjohnwu.magisk.core.ktx.toTime
+import com.topjohnwu.magisk.core.model.su.SuLog
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.core.R as CoreR
+
+class SuLogRvItem(val log: SuLog) : ObservableRvItem(), DiffItem<SuLogRvItem> {
+
+    override val layoutRes = R.layout.item_log_access_md2
+
+    val info = genInfo()
+
+    @get:Bindable
+    var isTop = false
+        set(value) = set(value, field, { field = it }, BR.top)
+
+    @get:Bindable
+    var isBottom = false
+        set(value) = set(value, field, { field = it }, BR.bottom)
+
+    override fun itemSameAs(other: SuLogRvItem) = log.appName == other.log.appName
+
+    private fun genInfo(): String {
+        val res = AppContext.resources
+        val sb = StringBuilder()
+        val date = log.time.toTime(timeDateFormat)
+        val toUid = res.getString(CoreR.string.target_uid, log.toUid)
+        val fromPid = res.getString(CoreR.string.pid, log.fromPid)
+        sb.append("$date\n$toUid  $fromPid")
+        if (log.target != -1) {
+            val pid = if (log.target == 0) "magiskd" else log.target.toString()
+            val target = res.getString(CoreR.string.target_pid, pid)
+            sb.append("  $target")
+        }
+        if (log.context.isNotEmpty()) {
+            val context = res.getString(CoreR.string.selinux_context, log.context)
+            sb.append("\n$context")
+        }
+        if (log.gids.isNotEmpty()) {
+            val gids = res.getString(CoreR.string.supp_group, log.gids)
+            sb.append("\n$gids")
+        }
+        sb.append("\n${log.command}")
+        return sb.toString()
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/module/ActionFragment.kt

@@ -0,0 +1,108 @@
+package com.topjohnwu.magisk.ui.module
+
+import android.annotation.SuppressLint
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewTreeObserver
+import android.widget.Toast
+import androidx.core.view.MenuProvider
+import androidx.core.view.isVisible
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.databinding.FragmentActionMd2Binding
+import com.topjohnwu.magisk.core.R as CoreR
+
+class ActionFragment : BaseFragment<FragmentActionMd2Binding>(), MenuProvider {
+
+    override val layoutRes = R.layout.fragment_action_md2
+    override val viewModel by viewModel<ActionViewModel>()
+    override val snackbarView: View get() = binding.snackbarContainer
+
+    private var defaultOrientation = -1
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        viewModel.args = ActionFragmentArgs.fromBundle(requireArguments())
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activity?.setTitle(viewModel.args.name)
+        binding.closeBtn.setOnClickListener {
+            activity?.onBackPressed()
+        }
+
+        viewModel.state.observe(this) {
+            if (it != ActionViewModel.State.RUNNING) {
+                binding.closeBtn.apply {
+                    if (!this.isVisible) this.show()
+                    if (!this.isFocused) this.requestFocus()
+                }
+            }
+            if (it != ActionViewModel.State.SUCCESS) return@observe
+            view?.viewTreeObserver?.addOnWindowFocusChangeListener(
+                object : ViewTreeObserver.OnWindowFocusChangeListener {
+                    override fun onWindowFocusChanged(hasFocus: Boolean) {
+                        if (hasFocus) return
+                        view?.viewTreeObserver?.removeOnWindowFocusChangeListener(this)
+                        view?.context?.apply {
+                            toast(
+                                getString(CoreR.string.done_action, viewModel.args.name),
+                                Toast.LENGTH_SHORT
+                            )
+                        }
+                        viewModel.back()
+                    }
+                }
+            )
+        }
+    }
+
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_flash, menu)
+    }
+
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
+        return viewModel.onMenuItemClicked(item)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        defaultOrientation = activity?.requestedOrientation ?: -1
+        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
+        if (savedInstanceState == null) {
+            viewModel.startRunAction()
+        }
+    }
+
+    @SuppressLint("WrongConstant")
+    override fun onDestroyView() {
+        if (defaultOrientation != -1) {
+            activity?.requestedOrientation = defaultOrientation
+        }
+        super.onDestroyView()
+    }
+
+    override fun onKeyEvent(event: KeyEvent): Boolean {
+        return when (event.keyCode) {
+            KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN -> true
+
+            else -> false
+        }
+    }
+
+    override fun onBackPressed(): Boolean {
+        if (viewModel.state.value == ActionViewModel.State.RUNNING) return true
+        return super.onBackPressed()
+    }
+
+    override fun onPreBind(binding: FragmentActionMd2Binding) = Unit
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/module/ActionViewModel.kt

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.ui.module
+
+import android.view.MenuItem
+import androidx.databinding.ObservableArrayList
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.ktx.synchronized
+import com.topjohnwu.magisk.core.ktx.timeFormatStandard
+import com.topjohnwu.magisk.core.ktx.toTime
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
+import com.topjohnwu.magisk.events.SnackbarEvent
+import com.topjohnwu.magisk.ui.flash.ConsoleItem
+import com.topjohnwu.superuser.CallbackList
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.IOException
+
+class ActionViewModel : BaseViewModel() {
+
+    enum class State {
+        RUNNING, SUCCESS, FAILED
+    }
+
+    private val _state = MutableLiveData(State.RUNNING)
+    val state: LiveData<State> get() = _state
+
+    val items = ObservableArrayList<ConsoleItem>()
+    lateinit var args: ActionFragmentArgs
+
+    private val logItems = mutableListOf<String>().synchronized()
+    private val outItems = object : CallbackList<String>() {
+        override fun onAddElement(e: String?) {
+            e ?: return
+            items.add(ConsoleItem(e))
+            logItems.add(e)
+        }
+    }
+
+    fun startRunAction() = viewModelScope.launch {
+        onResult(withContext(Dispatchers.IO) {
+            try {
+                Shell.cmd("run_action \'${args.id}\'")
+                    .to(outItems, logItems)
+                    .exec().isSuccess
+            } catch (e: IOException) {
+                Timber.e(e)
+                false
+            }
+        })
+    }
+
+    private fun onResult(success: Boolean) {
+        _state.value = if (success) State.SUCCESS else State.FAILED
+    }
+
+    fun onMenuItemClicked(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_save -> savePressed()
+        }
+        return true
+    }
+
+    private fun savePressed() = withExternalRW {
+        viewModelScope.launch(Dispatchers.IO) {
+            val name = "%s_action_log_%s.log".format(
+                args.name,
+                System.currentTimeMillis().toTime(timeFormatStandard)
+            )
+            val file = MediaStoreUtils.getFile(name)
+            file.uri.outputStream().bufferedWriter().use { writer ->
+                synchronized(logItems) {
+                    logItems.forEach {
+                        writer.write(it)
+                        writer.newLine()
+                    }
+                }
+            }
+            SnackbarEvent(file.toString()).publish()
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt

@@ -0,0 +1,45 @@
+package com.topjohnwu.magisk.ui.module
+
+import android.os.Bundle
+import android.view.View
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
+import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
+import rikka.recyclerview.addEdgeSpacing
+import rikka.recyclerview.addInvalidateItemDecorationsObserver
+import rikka.recyclerview.addItemSpacing
+import rikka.recyclerview.fixEdgeEffect
+import com.topjohnwu.magisk.core.R as CoreR
+
+class ModuleFragment : BaseFragment<FragmentModuleMd2Binding>() {
+
+    override val layoutRes = R.layout.fragment_module_md2
+    override val viewModel by viewModel<ModuleViewModel>()
+
+    override fun onStart() {
+        super.onStart()
+        activity?.title = resources.getString(CoreR.string.modules)
+        viewModel.data.observe(this) {
+            it ?: return@observe
+            val displayName = runCatching { it.displayName }.getOrNull() ?: return@observe
+            viewModel.requestInstallLocalModule(it, displayName)
+            viewModel.data.value = null
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.moduleList.apply {
+            addEdgeSpacing(top = R.dimen.l_50, bottom = R.dimen.l1)
+            addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
+            fixEdgeEffect()
+            post { addInvalidateItemDecorationsObserver() }
+        }
+    }
+
+    override fun onPreBind(binding: FragmentModuleMd2Binding) = Unit
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/module/ModuleRvItem.kt

@@ -0,0 +1,78 @@
+package com.topjohnwu.magisk.ui.module
+
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.model.module.LocalModule
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.magisk.core.R as CoreR
+
+object InstallModule : RvItem(), DiffItem<InstallModule> {
+    override val layoutRes = R.layout.item_module_download
+}
+
+class LocalModuleRvItem(
+    override val item: LocalModule
+) : ObservableRvItem(), DiffItem<LocalModuleRvItem>, ItemWrapper<LocalModule> {
+
+    override val layoutRes = R.layout.item_module_md2
+
+    val showNotice: Boolean
+    val showAction: Boolean
+    val noticeText: TextHolder
+
+    init {
+        val isZygisk = item.isZygisk
+        val isRiru = item.isRiru
+        val zygiskUnloaded = isZygisk && item.zygiskUnloaded
+
+        showNotice = zygiskUnloaded ||
+            (Info.isZygiskEnabled && isRiru) ||
+            (!Info.isZygiskEnabled && isZygisk)
+        showAction = item.hasAction && !showNotice
+        noticeText =
+            when {
+                zygiskUnloaded -> CoreR.string.zygisk_module_unloaded.asText()
+                isRiru -> CoreR.string.suspend_text_riru.asText(CoreR.string.zygisk.asText())
+                else -> CoreR.string.suspend_text_zygisk.asText(CoreR.string.zygisk.asText())
+            }
+    }
+
+    @get:Bindable
+    var isEnabled = item.enable
+        set(value) = set(value, field, { field = it }, BR.enabled, BR.updateReady) {
+            item.enable = value
+        }
+
+    @get:Bindable
+    var isRemoved = item.remove
+        set(value) = set(value, field, { field = it }, BR.removed, BR.updateReady) {
+            item.remove = value
+        }
+
+    @get:Bindable
+    val showUpdate get() = item.updateInfo != null
+
+    @get:Bindable
+    val updateReady get() = item.outdated && !isRemoved && isEnabled
+
+    val isUpdated = item.updated
+
+    fun fetchedUpdateInfo() {
+        notifyPropertyChanged(BR.showUpdate)
+        notifyPropertyChanged(BR.updateReady)
+    }
+
+    fun delete() {
+        isRemoved = !isRemoved
+    }
+
+    override fun itemSameAs(other: LocalModuleRvItem): Boolean = item.id == other.item.id
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt

@@ -0,0 +1,108 @@
+package com.topjohnwu.magisk.ui.module
+
+import android.net.Uri
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.MainDirections
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.base.ContentResultCallback
+import com.topjohnwu.magisk.core.model.module.LocalModule
+import com.topjohnwu.magisk.core.model.module.OnlineModule
+import com.topjohnwu.magisk.databinding.MergeObservableList
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.diffList
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.dialog.LocalModuleInstallDialog
+import com.topjohnwu.magisk.dialog.OnlineModuleInstallDialog
+import com.topjohnwu.magisk.events.GetContentEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
+import com.topjohnwu.magisk.core.R as CoreR
+
+class ModuleViewModel : AsyncLoadViewModel() {
+
+    val bottomBarBarrierIds = intArrayOf(R.id.module_update, R.id.module_remove)
+
+    private val itemsInstalled = diffList<LocalModuleRvItem>()
+
+    val items = MergeObservableList<RvItem>()
+    val extraBindings = bindExtra {
+        it.put(BR.viewModel, this)
+    }
+
+    val data get() = uri
+
+    @get:Bindable
+    var loading = true
+        private set(value) = set(value, field, { field = it }, BR.loading)
+
+    override suspend fun doLoadWork() {
+        loading = true
+        val moduleLoaded = Info.env.isActive &&
+                withContext(Dispatchers.IO) { LocalModule.loaded() }
+        if (moduleLoaded) {
+            loadInstalled()
+            if (items.isEmpty()) {
+                items.insertItem(InstallModule)
+                    .insertList(itemsInstalled)
+            }
+        }
+        loading = false
+        loadUpdateInfo()
+    }
+
+    override fun onNetworkChanged(network: Boolean) = startLoading()
+
+    private suspend fun loadInstalled() {
+        withContext(Dispatchers.Default) {
+            val installed = LocalModule.installed().map { LocalModuleRvItem(it) }
+            itemsInstalled.update(installed)
+        }
+    }
+
+    private suspend fun loadUpdateInfo() {
+        withContext(Dispatchers.IO) {
+            itemsInstalled.forEach {
+                if (it.item.fetch())
+                    it.fetchedUpdateInfo()
+            }
+        }
+    }
+
+    fun downloadPressed(item: OnlineModule?) =
+        if (item != null && Info.isConnected.value == true) {
+            withExternalRW { OnlineModuleInstallDialog(item).show() }
+        } else {
+            SnackbarEvent(CoreR.string.no_connection).publish()
+        }
+
+    fun installPressed() = withExternalRW {
+        GetContentEvent("application/zip", UriCallback()).publish()
+    }
+
+    fun requestInstallLocalModule(uri: Uri, displayName: String) {
+        LocalModuleInstallDialog(this, uri, displayName).show()
+    }
+
+    @Parcelize
+    class UriCallback : ContentResultCallback {
+        override fun onActivityResult(result: Uri) {
+            uri.value = result
+        }
+    }
+
+    fun runAction(id: String, name: String) {
+        MainDirections.actionActionFragment(id, name).navigate()
+    }
+
+    companion object {
+        private val uri = MutableLiveData<Uri?>()
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt

@@ -0,0 +1,145 @@
+package com.topjohnwu.magisk.ui.settings
+
+import android.content.Context
+import android.content.res.Resources
+import android.view.View
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.ktx.activity
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.view.MagiskDialog
+
+sealed class BaseSettingsItem : ObservableRvItem() {
+
+    interface Handler {
+        fun onItemPressed(view: View, item: BaseSettingsItem, andThen: () -> Unit)
+        fun onItemAction(view: View, item: BaseSettingsItem)
+    }
+
+    override val layoutRes get() = R.layout.item_settings
+
+    open val icon: Int get() = 0
+    open val title: TextHolder get() = TextHolder.EMPTY
+    @get:Bindable
+    open val description: TextHolder get() = TextHolder.EMPTY
+    @get:Bindable
+    var isEnabled = true
+        set(value) = set(value, field, { field = it }, BR.enabled, BR.description)
+
+    open fun onPressed(view: View, handler: Handler) {
+        handler.onItemPressed(view, this) {
+            handler.onItemAction(view, this)
+        }
+    }
+    open fun refresh() {}
+
+    // Only for toggle
+    open val showSwitch get() = false
+    @get:Bindable
+    open val isChecked get() = false
+    fun onToggle(view: View, handler: Handler, checked: Boolean) =
+        set(checked, isChecked, { onPressed(view, handler) })
+
+    abstract class Value<T> : BaseSettingsItem() {
+
+        /**
+         * Represents last agreed-upon value by the validation process and the user for current
+         * child. Be very aware that this shouldn't be **set** unless both sides agreed that _that_
+         * is the new value.
+         * */
+        abstract var value: T
+            protected set
+    }
+
+    abstract class Toggle : Value<Boolean>() {
+
+        override val showSwitch get() = true
+        override val isChecked get() = value
+
+        override fun onPressed(view: View, handler: Handler) {
+            // Make sure the checked state is synced
+            notifyPropertyChanged(BR.checked)
+            handler.onItemPressed(view, this) {
+                value = !value
+                notifyPropertyChanged(BR.checked)
+                handler.onItemAction(view, this)
+            }
+        }
+    }
+
+    abstract class Input : Value<String>() {
+
+        @get:Bindable
+        abstract val inputResult: String?
+
+        override fun onPressed(view: View, handler: Handler) {
+            handler.onItemPressed(view, this) {
+                MagiskDialog(view.activity).apply {
+                    setTitle(title.getText(view.resources))
+                    setView(getView(view.context))
+                    setButton(MagiskDialog.ButtonType.POSITIVE) {
+                        text = android.R.string.ok
+                        onClick {
+                            inputResult?.let { result ->
+                                doNotDismiss = false
+                                value = result
+                                handler.onItemAction(view, this@Input)
+                                return@onClick
+                            }
+                            doNotDismiss = true
+                        }
+                    }
+                    setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                        text = android.R.string.cancel
+                    }
+                }.show()
+            }
+        }
+
+        abstract fun getView(context: Context): View
+    }
+
+    abstract class Selector : Value<Int>() {
+
+        open val entryRes get() = -1
+        open val descriptionRes get() = entryRes
+        open fun entries(res: Resources) = res.getArrayOrEmpty(entryRes)
+        open fun descriptions(res: Resources) = res.getArrayOrEmpty(descriptionRes)
+
+        override val description = object : TextHolder() {
+            override fun getText(resources: Resources): CharSequence {
+                return descriptions(resources).getOrElse(value) { "" }
+            }
+        }
+
+        private fun Resources.getArrayOrEmpty(id: Int): Array<String> =
+            runCatching { getStringArray(id) }.getOrDefault(emptyArray())
+
+        override fun onPressed(view: View, handler: Handler) {
+            handler.onItemPressed(view, this) {
+                MagiskDialog(view.activity).apply {
+                    setTitle(title.getText(view.resources))
+                    setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                        text = android.R.string.cancel
+                    }
+                    setListItems(entries(view.resources)) {
+                        if (value != it) {
+                            value = it
+                            notifyPropertyChanged(BR.description)
+                            handler.onItemAction(view, this@Selector)
+                        }
+                    }
+                }.show()
+            }
+        }
+    }
+
+    abstract class Blank : BaseSettingsItem()
+
+    abstract class Section : BaseSettingsItem() {
+        override val layoutRes = R.layout.item_settings_section
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.ui.settings
+
+import android.os.Bundle
+import android.view.View
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
+import rikka.recyclerview.addEdgeSpacing
+import rikka.recyclerview.addItemSpacing
+import rikka.recyclerview.fixEdgeEffect
+import com.topjohnwu.magisk.core.R as CoreR
+
+class SettingsFragment : BaseFragment<FragmentSettingsMd2Binding>() {
+
+    override val layoutRes = R.layout.fragment_settings_md2
+    override val viewModel by viewModel<SettingsViewModel>()
+    override val snackbarView: View get() = binding.snackbarContainer
+
+    override fun onStart() {
+        super.onStart()
+
+        activity?.title = resources.getString(CoreR.string.settings)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.settingsList.apply {
+            addEdgeSpacing(bottom = R.dimen.l1)
+            addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
+            fixEdgeEffect()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.items.forEach { it.refresh() }
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -0,0 +1,335 @@
+package com.topjohnwu.magisk.ui.settings
+
+import android.content.Context
+import android.content.res.Resources
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.ktx.activity
+import com.topjohnwu.magisk.core.tasks.AppMigration
+import com.topjohnwu.magisk.core.utils.LocaleSetting
+import com.topjohnwu.magisk.core.utils.MediaStoreUtils
+import com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
+import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
+import com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.utils.TextHolder
+import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.magisk.view.MagiskDialog
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.magisk.core.R as CoreR
+
+// --- Customization
+
+object Customization : BaseSettingsItem.Section() {
+    override val title = CoreR.string.settings_customization.asText()
+}
+
+object Language : BaseSettingsItem.Selector() {
+    private val names: Array<String> get() = LocaleSetting.available.names
+    private val tags: Array<String> get() = LocaleSetting.available.tags
+
+    override var value
+        get() = tags.indexOf(Config.locale)
+        set(value) {
+            Config.locale = tags[value]
+        }
+
+    override val title = CoreR.string.language.asText()
+
+    override fun entries(res: Resources) = names
+    override fun descriptions(res: Resources) = names
+}
+
+object LanguageSystem : BaseSettingsItem.Blank() {
+    override val title = CoreR.string.language.asText()
+    override val description: TextHolder
+        get() {
+            val locale = LocaleSetting.instance.appLocale
+            return locale?.getDisplayName(locale)?.asText() ?: CoreR.string.system_default.asText()
+        }
+}
+
+object Theme : BaseSettingsItem.Blank() {
+    override val icon = R.drawable.ic_paint
+    override val title = CoreR.string.section_theme.asText()
+}
+
+// --- App
+
+object AppSettings : BaseSettingsItem.Section() {
+    override val title = CoreR.string.home_app_title.asText()
+}
+
+object Hide : BaseSettingsItem.Input() {
+    override val title = CoreR.string.settings_hide_app_title.asText()
+    override val description = CoreR.string.settings_hide_app_summary.asText()
+    override var value = ""
+
+    override val inputResult
+        get() = if (isError) null else result
+
+    @get:Bindable
+    var result = "Settings"
+        set(value) = set(value, field, { field = it }, BR.result, BR.error)
+
+    val maxLength
+        get() = AppMigration.MAX_LABEL_LENGTH
+
+    @get:Bindable
+    val isError
+        get() = result.length > maxLength || result.isBlank()
+
+    override fun getView(context: Context) = DialogSettingsAppNameBinding
+        .inflate(LayoutInflater.from(context)).also { it.data = this }.root
+}
+
+object Restore : BaseSettingsItem.Blank() {
+    override val title = CoreR.string.settings_restore_app_title.asText()
+    override val description = CoreR.string.settings_restore_app_summary.asText()
+
+    override fun onPressed(view: View, handler: Handler) {
+        handler.onItemPressed(view, this) {
+            MagiskDialog(view.activity).apply {
+                setTitle(CoreR.string.settings_restore_app_title)
+                setMessage(CoreR.string.restore_app_confirmation)
+                setButton(MagiskDialog.ButtonType.POSITIVE) {
+                    text = android.R.string.ok
+                    onClick {
+                        handler.onItemAction(view, this@Restore)
+                    }
+                }
+                setButton(MagiskDialog.ButtonType.NEGATIVE) {
+                    text = android.R.string.cancel
+                }
+                setCancelable(true)
+                show()
+            }
+        }
+    }
+}
+
+object AddShortcut : BaseSettingsItem.Blank() {
+    override val title = CoreR.string.add_shortcut_title.asText()
+    override val description = CoreR.string.setting_add_shortcut_summary.asText()
+}
+
+object DownloadPath : BaseSettingsItem.Input() {
+    override var value
+        get() = Config.downloadDir
+        set(value) {
+            Config.downloadDir = value
+            notifyPropertyChanged(BR.description)
+        }
+
+    override val title = CoreR.string.settings_download_path_title.asText()
+    override val description get() = MediaStoreUtils.fullPath(value).asText()
+
+    override var inputResult: String = value
+        set(value) = set(value, field, { field = it }, BR.inputResult, BR.path)
+
+    @get:Bindable
+    val path get() = MediaStoreUtils.fullPath(inputResult)
+
+    override fun getView(context: Context) = DialogSettingsDownloadPathBinding
+        .inflate(LayoutInflater.from(context)).also { it.data = this }.root
+}
+
+object UpdateChannel : BaseSettingsItem.Selector() {
+    override var value
+        get() = Config.updateChannel
+        set(value) {
+            Config.updateChannel = value
+            Info.remote = Info.EMPTY_REMOTE
+        }
+
+    override val title = CoreR.string.settings_update_channel_title.asText()
+
+    override val entryRes = CoreR.array.update_channel
+    override fun entries(res: Resources): Array<String> {
+        return super.entries(res).let {
+            if (!Const.APP_IS_CANARY && !BuildConfig.DEBUG)
+                it.copyOfRange(0, Config.Value.CANARY_CHANNEL)
+            else it
+        }
+    }
+}
+
+object UpdateChannelUrl : BaseSettingsItem.Input() {
+    override val title = CoreR.string.settings_update_custom.asText()
+    override val description get() = value.asText()
+    override var value
+        get() = Config.customChannelUrl
+        set(value) {
+            Config.customChannelUrl = value
+            Info.remote = Info.EMPTY_REMOTE
+            notifyPropertyChanged(BR.description)
+        }
+
+    override var inputResult: String = value
+        set(value) = set(value, field, { field = it }, BR.inputResult)
+
+    override fun refresh() {
+        isEnabled = UpdateChannel.value == Config.Value.CUSTOM_CHANNEL
+    }
+
+    override fun getView(context: Context) = DialogSettingsUpdateChannelBinding
+        .inflate(LayoutInflater.from(context)).also { it.data = this }.root
+}
+
+object UpdateChecker : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_check_update_title.asText()
+    override val description = CoreR.string.settings_check_update_summary.asText()
+    override var value by Config::checkUpdate
+}
+
+object DoHToggle : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_doh_title.asText()
+    override val description = CoreR.string.settings_doh_description.asText()
+    override var value by Config::doh
+}
+
+object SystemlessHosts : BaseSettingsItem.Blank() {
+    override val title = CoreR.string.settings_hosts_title.asText()
+    override val description = CoreR.string.settings_hosts_summary.asText()
+}
+
+object RandNameToggle : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_random_name_title.asText()
+    override val description = CoreR.string.settings_random_name_description.asText()
+    override var value by Config::randName
+}
+
+// --- Magisk
+
+object Magisk : BaseSettingsItem.Section() {
+    override val title = CoreR.string.magisk.asText()
+}
+
+object Zygisk : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.zygisk.asText()
+    override val description get() =
+        if (mismatch) CoreR.string.reboot_apply_change.asText()
+        else CoreR.string.settings_zygisk_summary.asText()
+    override var value
+        get() = Config.zygisk
+        set(value) {
+            Config.zygisk = value
+            notifyPropertyChanged(BR.description)
+        }
+    val mismatch get() = value != Info.isZygiskEnabled
+}
+
+object DenyList : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_denylist_title.asText()
+    override val description get() = CoreR.string.settings_denylist_summary.asText()
+
+    override var value = Config.denyList
+        set(value) {
+            field = value
+            val cmd = if (value) "enable" else "disable"
+            Shell.cmd("magisk --denylist $cmd").submit { result ->
+                if (result.isSuccess) {
+                    Config.denyList = value
+                } else {
+                    field = !value
+                    notifyPropertyChanged(BR.checked)
+                }
+            }
+        }
+}
+
+object DenyListConfig : BaseSettingsItem.Blank() {
+    override val title = CoreR.string.settings_denylist_config_title.asText()
+    override val description = CoreR.string.settings_denylist_config_summary.asText()
+}
+
+// --- Superuser
+
+object Tapjack : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_su_tapjack_title.asText()
+    override val description = CoreR.string.settings_su_tapjack_summary.asText()
+    override var value by Config::suTapjack
+}
+
+object Authentication : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_su_auth_title.asText()
+    override var description = CoreR.string.settings_su_auth_summary.asText()
+    override var value by Config::suAuth
+
+    override fun refresh() {
+        isEnabled = Info.isDeviceSecure
+        if (!isEnabled) {
+            description = CoreR.string.settings_su_auth_insecure.asText()
+        }
+    }
+}
+
+object Superuser : BaseSettingsItem.Section() {
+    override val title = CoreR.string.superuser.asText()
+}
+
+object AccessMode : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.superuser_access.asText()
+    override val entryRes = CoreR.array.su_access
+    override var value by Config::rootMode
+}
+
+object MultiuserMode : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.multiuser_mode.asText()
+    override val entryRes = CoreR.array.multiuser_mode
+    override val descriptionRes = CoreR.array.multiuser_summary
+    override var value by Config::suMultiuserMode
+
+    override fun refresh() {
+        isEnabled = Const.USER_ID == 0
+    }
+}
+
+object MountNamespaceMode : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.mount_namespace_mode.asText()
+    override val entryRes = CoreR.array.namespace
+    override val descriptionRes = CoreR.array.namespace_summary
+    override var value by Config::suMntNamespaceMode
+}
+
+object AutomaticResponse : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.auto_response.asText()
+    override val entryRes = CoreR.array.auto_response
+    override var value by Config::suAutoResponse
+}
+
+object RequestTimeout : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.request_timeout.asText()
+    override val entryRes = CoreR.array.request_timeout
+
+    private val entryValues = listOf(10, 15, 20, 30, 45, 60)
+    override var value = entryValues.indexOfFirst { it == Config.suDefaultTimeout }
+        set(value) {
+            field = value
+            Config.suDefaultTimeout = entryValues[value]
+        }
+}
+
+object SUNotification : BaseSettingsItem.Selector() {
+    override val title = CoreR.string.superuser_notification.asText()
+    override val entryRes = CoreR.array.su_notification
+    override var value by Config::suNotification
+}
+
+object Reauthenticate : BaseSettingsItem.Toggle() {
+    override val title = CoreR.string.settings_su_reauth_title.asText()
+    override val description = CoreR.string.settings_su_reauth_summary.asText()
+    override var value by Config::suReAuth
+
+    override fun refresh() {
+        isEnabled = Build.VERSION.SDK_INT < Build.VERSION_CODES.O && Info.showSuperUser
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt

@@ -0,0 +1,133 @@
+package com.topjohnwu.magisk.ui.settings
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import android.view.View
+import android.widget.Toast
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.BuildConfig
+import com.topjohnwu.magisk.core.Const
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.isRunningAsStub
+import com.topjohnwu.magisk.core.ktx.activity
+import com.topjohnwu.magisk.core.ktx.toast
+import com.topjohnwu.magisk.core.tasks.AppMigration
+import com.topjohnwu.magisk.core.utils.LocaleSetting
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.events.AddHomeIconEvent
+import com.topjohnwu.magisk.events.AuthEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.launch
+
+class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Handler {
+
+    val items = createItems()
+    val extraBindings = bindExtra {
+        it.put(BR.handler, this)
+    }
+
+    private fun createItems(): List<BaseSettingsItem> {
+        val context = AppContext
+        val hidden = context.packageName != BuildConfig.APP_PACKAGE_NAME
+
+        // Customization
+        val list = mutableListOf(
+            Customization,
+            Theme, if (LocaleSetting.useLocaleManager) LanguageSystem else Language
+        )
+        if (isRunningAsStub && ShortcutManagerCompat.isRequestPinShortcutSupported(context))
+            list.add(AddShortcut)
+
+        // Manager
+        list.addAll(listOf(
+            AppSettings,
+            UpdateChannel, UpdateChannelUrl, DoHToggle, UpdateChecker, DownloadPath, RandNameToggle
+        ))
+        if (Info.env.isActive && Const.USER_ID == 0) {
+            if (hidden) list.add(Restore) else list.add(Hide)
+        }
+
+        // Magisk
+        if (Info.env.isActive) {
+            list.addAll(listOf(
+                Magisk,
+                SystemlessHosts
+            ))
+            if (Const.Version.atLeast_24_0()) {
+                list.addAll(listOf(Zygisk, DenyList, DenyListConfig))
+            }
+        }
+
+        // Superuser
+        if (Info.showSuperUser) {
+            list.addAll(listOf(
+                Superuser,
+                Tapjack, Authentication, AccessMode, MultiuserMode, MountNamespaceMode,
+                AutomaticResponse, RequestTimeout, SUNotification
+            ))
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                // Re-authenticate is not feasible on 8.0+
+                list.add(Reauthenticate)
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                // Can hide overlay windows on 12.0+
+                list.remove(Tapjack)
+            }
+        }
+
+        return list
+    }
+
+    override fun onItemPressed(view: View, item: BaseSettingsItem, doAction: () -> Unit) {
+        when (item) {
+            DownloadPath -> withExternalRW(doAction)
+            UpdateChecker -> withPostNotificationPermission(doAction)
+            Authentication -> AuthEvent(doAction).publish()
+            Hide, Restore -> withInstallPermission(doAction)
+            else -> doAction()
+        }
+    }
+
+    override fun onItemAction(view: View, item: BaseSettingsItem) {
+        when (item) {
+            Theme -> SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().navigate()
+            LanguageSystem -> launchAppLocaleSettings(view.activity)
+            AddShortcut -> AddHomeIconEvent().publish()
+            SystemlessHosts -> createHosts()
+            DenyListConfig -> SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
+            UpdateChannel -> openUrlIfNecessary(view)
+            is Hide -> viewModelScope.launch { AppMigration.hide(view.activity, item.value) }
+            Restore -> viewModelScope.launch { AppMigration.restore(view.activity) }
+            Zygisk -> if (Zygisk.mismatch) SnackbarEvent(R.string.reboot_apply_change).publish()
+            else -> Unit
+        }
+    }
+
+    private fun launchAppLocaleSettings(activity: Activity) {
+        val intent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS)
+        intent.data = Uri.fromParts("package", activity.packageName, null)
+        activity.startActivity(intent)
+    }
+
+    private fun openUrlIfNecessary(view: View) {
+        UpdateChannelUrl.refresh()
+        if (UpdateChannelUrl.isEnabled && UpdateChannelUrl.value.isBlank()) {
+            UpdateChannelUrl.onPressed(view, this)
+        }
+    }
+
+    private fun createHosts() {
+        Shell.cmd("add_hosts_module").submit {
+            AppContext.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT)
+        }
+    }
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/superuser/PolicyRvItem.kt

@@ -0,0 +1,80 @@
+package com.topjohnwu.magisk.ui.superuser
+
+import android.graphics.drawable.Drawable
+import androidx.databinding.Bindable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableRvItem
+import com.topjohnwu.magisk.databinding.set
+
+class PolicyRvItem(
+    private val viewModel: SuperuserViewModel,
+    override val item: SuPolicy,
+    val packageName: String,
+    private val isSharedUid: Boolean,
+    val icon: Drawable,
+    val appName: String
+) : ObservableRvItem(), DiffItem<PolicyRvItem>, ItemWrapper<SuPolicy> {
+
+    override val layoutRes = R.layout.item_policy_md2
+
+    val title get() = if (isSharedUid) "[SharedUID] $appName" else appName
+
+    private inline fun <reified T> setImpl(new: T, old: T, setter: (T) -> Unit) {
+        if (old != new) {
+            setter(new)
+        }
+    }
+
+    @get:Bindable
+    var isExpanded = false
+        set(value) = set(value, field, { field = it }, BR.expanded)
+
+    @get:Bindable
+    var isEnabled
+        get() = item.policy == SuPolicy.ALLOW
+        set(value) = setImpl(value, isEnabled) {
+            notifyPropertyChanged(BR.enabled)
+            viewModel.togglePolicy(this, value)
+        }
+
+    @get:Bindable
+    var shouldNotify
+        get() = item.notification
+        private set(value) = setImpl(value, shouldNotify) {
+            item.notification = it
+            viewModel.updateNotify(this)
+        }
+
+    @get:Bindable
+    var shouldLog
+        get() = item.logging
+        private set(value) = setImpl(value, shouldLog) {
+            item.logging = it
+            viewModel.updateLogging(this)
+        }
+
+    fun toggleExpand() {
+        isExpanded = !isExpanded
+    }
+
+    fun toggleNotify() {
+        shouldNotify = !shouldNotify
+    }
+
+    fun toggleLog() {
+        shouldLog = !shouldLog
+    }
+
+    fun revoke() {
+        viewModel.deletePressed(this)
+    }
+
+    override fun itemSameAs(other: PolicyRvItem) = packageName == other.packageName
+
+    override fun contentSameAs(other: PolicyRvItem) = item.policy == other.item.policy
+
+}

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

@@ -0,0 +1,36 @@
+package com.topjohnwu.magisk.ui.superuser
+
+import android.os.Bundle
+import android.view.View
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
+import rikka.recyclerview.addEdgeSpacing
+import rikka.recyclerview.addItemSpacing
+import rikka.recyclerview.fixEdgeEffect
+import com.topjohnwu.magisk.core.R as CoreR
+
+class SuperuserFragment : BaseFragment<FragmentSuperuserMd2Binding>() {
+
+    override val layoutRes = R.layout.fragment_superuser_md2
+    override val viewModel by viewModel<SuperuserViewModel>()
+
+    override fun onStart() {
+        super.onStart()
+        activity?.title = resources.getString(CoreR.string.superuser)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.superuserList.apply {
+            addEdgeSpacing(top = R.dimen.l_50, bottom = R.dimen.l1)
+            addItemSpacing(R.dimen.l1, R.dimen.l_50, R.dimen.l1)
+            fixEdgeEffect()
+        }
+    }
+
+    override fun onPreBind(binding: FragmentSuperuserMd2Binding) {}
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt

@@ -0,0 +1,179 @@
+package com.topjohnwu.magisk.ui.superuser
+
+import android.annotation.SuppressLint
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES
+import android.os.Process
+import androidx.databinding.Bindable
+import androidx.databinding.ObservableArrayList
+import androidx.lifecycle.viewModelScope
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.arch.AsyncLoadViewModel
+import com.topjohnwu.magisk.core.AppContext
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.core.Info
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.ktx.getLabel
+import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.databinding.MergeObservableList
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.diffList
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.dialog.SuperuserRevokeDialog
+import com.topjohnwu.magisk.events.AuthEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
+import com.topjohnwu.magisk.utils.asText
+import com.topjohnwu.magisk.view.TextItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.Locale
+
+class SuperuserViewModel(
+    private val db: PolicyDao
+) : AsyncLoadViewModel() {
+
+    private val itemNoData = TextItem(R.string.superuser_policy_none)
+
+    private val itemsHelpers = ObservableArrayList<TextItem>()
+    private val itemsPolicies = diffList<PolicyRvItem>()
+
+    val items = MergeObservableList<RvItem>()
+        .insertList(itemsHelpers)
+        .insertList(itemsPolicies)
+    val extraBindings = bindExtra {
+        it.put(BR.listener, this)
+    }
+
+    @get:Bindable
+    var loading = true
+        private set(value) = set(value, field, { field = it }, BR.loading)
+
+    @SuppressLint("InlinedApi")
+    override suspend fun doLoadWork() {
+        if (!Info.showSuperUser) {
+            loading = false
+            return
+        }
+        loading = true
+        withContext(Dispatchers.IO) {
+            db.deleteOutdated()
+            db.delete(AppContext.applicationInfo.uid)
+            val policies = ArrayList<PolicyRvItem>()
+            val pm = AppContext.packageManager
+            for (policy in db.fetchAll()) {
+                val pkgs =
+                    if (policy.uid == Process.SYSTEM_UID) arrayOf("android")
+                    else pm.getPackagesForUid(policy.uid)
+                if (pkgs == null) {
+                    db.delete(policy.uid)
+                    continue
+                }
+                val map = pkgs.mapNotNull { pkg ->
+                    try {
+                        val info = pm.getPackageInfo(pkg, MATCH_UNINSTALLED_PACKAGES)
+                        PolicyRvItem(
+                            this@SuperuserViewModel, policy,
+                            info.packageName,
+                            info.sharedUserId != null,
+                            info.applicationInfo?.loadIcon(pm) ?: pm.defaultActivityIcon,
+                            info.applicationInfo?.getLabel(pm) ?: info.packageName
+                        )
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        null
+                    }
+                }
+                if (map.isEmpty()) {
+                    db.delete(policy.uid)
+                    continue
+                }
+                policies.addAll(map)
+            }
+            policies.sortWith(compareBy(
+                { it.appName.lowercase(Locale.ROOT) },
+                { it.packageName }
+            ))
+            itemsPolicies.update(policies)
+        }
+        if (itemsPolicies.isNotEmpty())
+            itemsHelpers.clear()
+        else if (itemsHelpers.isEmpty())
+            itemsHelpers.add(itemNoData)
+        loading = false
+    }
+
+    // ---
+
+    fun deletePressed(item: PolicyRvItem) {
+        fun updateState() = viewModelScope.launch {
+            db.delete(item.item.uid)
+            val list = ArrayList(itemsPolicies)
+            list.removeAll { it.item.uid == item.item.uid }
+            itemsPolicies.update(list)
+            if (list.isEmpty() && itemsHelpers.isEmpty()) {
+                itemsHelpers.add(itemNoData)
+            }
+        }
+
+        if (Config.suAuth) {
+            AuthEvent { updateState() }.publish()
+        } else {
+            SuperuserRevokeDialog(item.title) { updateState() }.show()
+        }
+    }
+
+    fun updateNotify(item: PolicyRvItem) {
+        viewModelScope.launch {
+            db.update(item.item)
+            val res = when {
+                item.item.notification -> R.string.su_snack_notif_on
+                else -> R.string.su_snack_notif_off
+            }
+            itemsPolicies.forEach {
+                if (it.item.uid == item.item.uid) {
+                    it.notifyPropertyChanged(BR.shouldNotify)
+                }
+            }
+            SnackbarEvent(res.asText(item.appName)).publish()
+        }
+    }
+
+    fun updateLogging(item: PolicyRvItem) {
+        viewModelScope.launch {
+            db.update(item.item)
+            val res = when {
+                item.item.logging -> R.string.su_snack_log_on
+                else -> R.string.su_snack_log_off
+            }
+            itemsPolicies.forEach {
+                if (it.item.uid == item.item.uid) {
+                    it.notifyPropertyChanged(BR.shouldLog)
+                }
+            }
+            SnackbarEvent(res.asText(item.appName)).publish()
+        }
+    }
+
+    fun togglePolicy(item: PolicyRvItem, enable: Boolean) {
+        val items = itemsPolicies.filter { it.item.uid == item.item.uid }
+        fun updateState() {
+            viewModelScope.launch {
+                val res = if (enable) R.string.su_snack_grant else R.string.su_snack_deny
+                item.item.policy = if (enable) SuPolicy.ALLOW else SuPolicy.DENY
+                db.update(item.item)
+                items.forEach {
+                    it.notifyPropertyChanged(BR.enabled)
+                }
+                SnackbarEvent(res.asText(item.appName)).publish()
+            }
+        }
+
+        if (Config.suAuth) {
+            AuthEvent { updateState() }.publish()
+        } else {
+            updateState()
+        }
+    }
+}

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

@@ -7,51 +7,49 @@ import android.os.Build
 import android.os.Bundle
 import android.view.Window
 import android.view.WindowManager
-import androidx.navigation.NavController
+import androidx.lifecycle.lifecycleScope
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.arch.BaseUIActivity
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.arch.viewModel
+import com.topjohnwu.magisk.core.base.UntrackedActivity
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.core.su.SuCallbackHandler.REQUEST
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import com.topjohnwu.magisk.ui.theme.Theme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
-open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityRequestBinding>() {
+open class SuRequestActivity : UIActivity<ActivityRequestBinding>(), UntrackedActivity {
 
     override val layoutRes: Int = R.layout.activity_request
     override val viewModel: SuRequestViewModel by viewModel()
-    override val navigation: NavController? = null
-
-    override fun onBackPressed() {
-        viewModel.denyPressed()
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
-        lockOrientation()
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            window.setHideOverlayWindows(true)
+        }
+        setTheme(Theme.selected.themeRes)
         super.onCreate(savedInstanceState)
 
-        fun showRequest() {
-            viewModel.handleRequest(intent)
-        }
-
-        fun runHandler(action: String?) {
-            SuCallbackHandler(this, action, intent.extras)
-            finish()
-        }
-
         if (intent.action == Intent.ACTION_VIEW) {
             val action = intent.getStringExtra("action")
             if (action == REQUEST) {
-                showRequest()
+                viewModel.handleRequest(intent)
             } else {
-                runHandler(action)
+                lifecycleScope.launch {
+                    withContext(Dispatchers.IO) {
+                        SuCallbackHandler.run(this@SuRequestActivity, action, intent.extras)
+                    }
+                    finish()
+                }
             }
-        } else if (intent.action == REQUEST) {
-            showRequest()
         } else {
-            runHandler(intent.action)
+            finish()
         }
     }
 
@@ -61,10 +59,11 @@ open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityReques
         return theme
     }
 
-    private fun lockOrientation() {
-        requestedOrientation = if (Build.VERSION.SDK_INT < 18)
-            resources.configuration.orientation
-        else
-            ActivityInfo.SCREEN_ORIENTATION_LOCKED
+    override fun onBackPressed() {
+        viewModel.denyPressed()
+    }
+
+    override fun finish() {
+        super.finishAndRemoveTask()
     }
 }

app/apk/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.ui.surequest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
-import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.os.Bundle
@@ -18,31 +17,28 @@ import android.widget.Toast
 import androidx.databinding.Bindable
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.AppContext
 import com.topjohnwu.magisk.core.Config
-import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.model.su.SuPolicy
+import com.topjohnwu.magisk.core.R
+import com.topjohnwu.magisk.core.data.magiskdb.PolicyDao
+import com.topjohnwu.magisk.core.ktx.getLabel
+import com.topjohnwu.magisk.core.ktx.toast
 import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.ALLOW
 import com.topjohnwu.magisk.core.model.su.SuPolicy.Companion.DENY
 import com.topjohnwu.magisk.core.su.SuRequestHandler
-import com.topjohnwu.magisk.core.utils.BiometricHelper
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.events.AuthEvent
 import com.topjohnwu.magisk.events.DieEvent
 import com.topjohnwu.magisk.events.ShowUIEvent
-import com.topjohnwu.magisk.events.dialog.BiometricEvent
-import com.topjohnwu.magisk.ui.superuser.SpinnerRvItem
-import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.utils.set
+import com.topjohnwu.magisk.utils.TextHolder
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import me.tatarka.bindingcollectionadapter2.BindingListViewAdapter
-import me.tatarka.bindingcollectionadapter2.ItemBinding
 import java.util.concurrent.TimeUnit.SECONDS
 
 class SuRequestViewModel(
-    pm: PackageManager,
     policyDB: PolicyDao,
-    private val timeoutPrefs: SharedPreferences,
-    private val res: Resources
+    private val timeoutPrefs: SharedPreferences
 ) : BaseViewModel() {
 
     lateinit var icon: Drawable
@@ -50,8 +46,7 @@ class SuRequestViewModel(
     lateinit var packageName: String
 
     @get:Bindable
-    var denyText = res.getString(R.string.deny)
-        set(value) = set(value, field, { field = it }, BR.denyText)
+    val denyText = DenyText()
 
     @get:Bindable
     var selectedItemPosition = 0
@@ -67,32 +62,22 @@ class SuRequestViewModel(
         if (event.flags and MotionEvent.FLAG_WINDOW_IS_OBSCURED != 0
             || event.flags and MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED != 0) {
             if (event.action == MotionEvent.ACTION_UP) {
-                Utils.toast(R.string.touch_filtered_warning, Toast.LENGTH_SHORT)
+                AppContext.toast(R.string.touch_filtered_warning, Toast.LENGTH_SHORT)
             }
             return@OnTouchListener Config.suTapjack
         }
         false
     }
 
-    private val items = res.getStringArray(R.array.allow_timeout).map { SpinnerRvItem(it) }
-    val adapter = BindingListViewAdapter<SpinnerRvItem>(1).apply {
-        itemBinding = ItemBinding.of { binding, _, item ->
-            item.bind(binding)
-        }
-        setItems(items)
-    }
-
-    private val handler = SuRequestHandler(pm, policyDB)
-    private lateinit var timer: CountDownTimer
+    private val handler = SuRequestHandler(AppContext.packageManager, policyDB)
+    private val millis = SECONDS.toMillis(Config.suDefaultTimeout.toLong())
+    private var timer = SuTimer(millis, 1000)
+    private var initialized = false
 
     fun grantPressed() {
         cancelTimer()
-        if (BiometricHelper.isEnabled) {
-            BiometricEvent {
-                onSuccess {
-                    respond(ALLOW)
-                }
-            }.publish()
+        if (Config.suAuth) {
+            AuthEvent { respond(ALLOW) }.publish()
         } else {
             respond(ALLOW)
         }
@@ -108,42 +93,63 @@ class SuRequestViewModel(
     }
 
     fun handleRequest(intent: Intent) {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.Default) {
             if (handler.start(intent))
-                showDialog(handler.policy)
+                showDialog()
             else
                 DieEvent().publish()
         }
     }
 
-    private fun showDialog(policy: SuPolicy) {
-        icon = policy.icon
-        title = policy.appName
-        packageName = policy.packageName
-        selectedItemPosition = timeoutPrefs.getInt(policy.packageName, 0)
+    private fun showDialog() {
+        val pm = handler.pm
+        val info = handler.pkgInfo
+        val app = info.applicationInfo
+
+        if (app == null) {
+            // The request is not coming from an app process, and the UID is a
+            // shared UID. We have no way to know where this request comes from.
+            icon = pm.defaultActivityIcon
+            title = "[SharedUID] ${info.sharedUserId}"
+            packageName = info.sharedUserId.toString()
+        } else {
+            val prefix = if (info.sharedUserId == null) "" else "[SharedUID] "
+            icon = app.loadIcon(pm)
+            title = "$prefix${app.getLabel(pm)}"
+            packageName = info.packageName
+        }
+
+        selectedItemPosition = timeoutPrefs.getInt(packageName, 0)
 
         // Set timer
-        val millis = SECONDS.toMillis(Config.suDefaultTimeout.toLong())
-        timer = SuTimer(millis, 1000).apply { start() }
+        timer.start()
 
         // Actually show the UI
         ShowUIEvent(if (Config.suTapjack) EmptyAccessibilityDelegate else null).publish()
+        initialized = true
     }
 
     private fun respond(action: Int) {
+        if (!initialized) {
+            // ignore the response until showDialog done
+            return
+        }
+
         timer.cancel()
 
         val pos = selectedItemPosition
-        timeoutPrefs.edit().putInt(handler.policy.packageName, pos).apply()
-        handler.respond(action, Config.Value.TIMEOUT_LIST[pos])
+        timeoutPrefs.edit().putInt(packageName, pos).apply()
 
-        // Kill activity after response
-        DieEvent().publish()
+        viewModelScope.launch {
+            handler.respond(action, Config.Value.TIMEOUT_LIST[pos])
+            // Kill activity after response
+            DieEvent().publish()
+        }
     }
 
     private fun cancelTimer() {
         timer.cancel()
-        denyText = res.getString(R.string.deny)
+        denyText.seconds = 0
     }
 
     private inner class SuTimer(
@@ -155,27 +161,39 @@ class SuRequestViewModel(
             if (!grantEnabled && remains <= millis - 1000) {
                 grantEnabled = true
             }
-            denyText = "${res.getString(R.string.deny)} (${(remains / 1000) + 1})"
+            denyText.seconds = (remains / 1000).toInt() + 1
         }
 
         override fun onFinish() {
-            denyText = res.getString(R.string.deny)
+            denyText.seconds = 0
             respond(DENY)
         }
 
     }
 
+    inner class DenyText : TextHolder() {
+        var seconds = 0
+            set(value) = set(value, field, { field = it }, BR.denyText)
+
+        override fun getText(resources: Resources): CharSequence {
+            return if (seconds != 0)
+                "${resources.getString(R.string.deny)} ($seconds)"
+            else
+                resources.getString(R.string.deny)
+        }
+    }
+
     // Invisible for accessibility services
     object EmptyAccessibilityDelegate : View.AccessibilityDelegate() {
-        override fun sendAccessibilityEvent(host: View?, eventType: Int) {}
-        override fun performAccessibilityAction(host: View?, action: Int, args: Bundle?) = true
-        override fun sendAccessibilityEventUnchecked(host: View?, event: AccessibilityEvent?) {}
-        override fun dispatchPopulateAccessibilityEvent(host: View?, event: AccessibilityEvent?) = true
-        override fun onPopulateAccessibilityEvent(host: View?, event: AccessibilityEvent?) {}
-        override fun onInitializeAccessibilityEvent(host: View?, event: AccessibilityEvent?) {}
+        override fun sendAccessibilityEvent(host: View, eventType: Int) {}
+        override fun performAccessibilityAction(host: View, action: Int, args: Bundle?) = true
+        override fun sendAccessibilityEventUnchecked(host: View, event: AccessibilityEvent) {}
+        override fun dispatchPopulateAccessibilityEvent(host: View, event: AccessibilityEvent) = true
+        override fun onPopulateAccessibilityEvent(host: View, event: AccessibilityEvent) {}
+        override fun onInitializeAccessibilityEvent(host: View, event: AccessibilityEvent) {}
         override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfo) {}
         override fun addExtraDataToAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfo, extraDataKey: String, arguments: Bundle?) {}
-        override fun onRequestSendAccessibilityEvent(host: ViewGroup?, child: View?, event: AccessibilityEvent?): Boolean = false
-        override fun getAccessibilityNodeProvider(host: View?): AccessibilityNodeProvider? = null
+        override fun onRequestSendAccessibilityEvent(host: ViewGroup, child: View, event: AccessibilityEvent): Boolean = false
+        override fun getAccessibilityNodeProvider(host: View): AccessibilityNodeProvider? = null
     }
 }

app/apk/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeFragment.kt

@@ -8,12 +8,13 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.arch.BaseUIFragment
+import com.topjohnwu.magisk.arch.BaseFragment
+import com.topjohnwu.magisk.arch.viewModel
 import com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding
 import com.topjohnwu.magisk.databinding.ItemThemeBindingImpl
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import com.topjohnwu.magisk.core.R as CoreR
 
-class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>() {
+class ThemeFragment : BaseFragment<FragmentThemeMd2Binding>() {
 
     override val layoutRes = R.layout.fragment_theme_md2
     override val viewModel by viewModel<ThemeViewModel>()
@@ -34,7 +35,7 @@ class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>()
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         super.onCreateView(inflater, container, savedInstanceState)
 
         for ((a, b) in Theme.values().paired()) {
@@ -48,7 +49,7 @@ class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>()
                 ItemThemeBindingImpl.inflate(LayoutInflater.from(themed), view, true).also {
                     it.setVariable(BR.viewModel, viewModel)
                     it.setVariable(BR.theme, theme)
-                    it.lifecycleOwner = this
+                    it.lifecycleOwner = viewLifecycleOwner
                 }
             }
 
@@ -61,7 +62,7 @@ class ThemeFragment : BaseUIFragment<ThemeViewModel, FragmentThemeMd2Binding>()
     override fun onStart() {
         super.onStart()
 
-        activity.title = getString(R.string.section_theme)
+        activity?.title = getString(CoreR.string.section_theme)
     }
 
 }

app/apk/src/main/java/com/topjohnwu/magisk/ui/theme/ThemeViewModel.kt

@@ -1,8 +1,9 @@
 package com.topjohnwu.magisk.ui.theme
 
 import com.topjohnwu.magisk.arch.BaseViewModel
+import com.topjohnwu.magisk.core.Config
+import com.topjohnwu.magisk.dialog.DarkThemeDialog
 import com.topjohnwu.magisk.events.RecreateEvent
-import com.topjohnwu.magisk.events.dialog.DarkThemeDialog
 import com.topjohnwu.magisk.view.TappableHeadlineItem
 
 class ThemeViewModel : BaseViewModel(), TappableHeadlineItem.Listener {
@@ -10,15 +11,13 @@ class ThemeViewModel : BaseViewModel(), TappableHeadlineItem.Listener {
     val themeHeadline = TappableHeadlineItem.ThemeMode
 
     override fun onItemPressed(item: TappableHeadlineItem) = when (item) {
-        is TappableHeadlineItem.ThemeMode -> darkModePressed()
-        else -> Unit
+        is TappableHeadlineItem.ThemeMode -> DarkThemeDialog().show()
     }
 
     fun saveTheme(theme: Theme) {
-        theme.select()
-        RecreateEvent().publish()
+        if (!theme.isSelected) {
+            Config.themeOrdinal = theme.ordinal
+            RecreateEvent().publish()
+        }
     }
-
-    private fun darkModePressed() = DarkThemeDialog().publish()
-
 }

app/apk/src/main/java/com/topjohnwu/magisk/utils/MotionRevealHelper.kt

@@ -14,7 +14,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.google.android.material.circularreveal.CircularRevealCompat
 import com.google.android.material.circularreveal.CircularRevealWidget
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.topjohnwu.magisk.core.utils.currentLocale
+import com.topjohnwu.magisk.core.utils.LocaleSetting
 import kotlin.math.hypot
 
 object MotionRevealHelper {
@@ -63,7 +63,9 @@ object MotionRevealHelper {
         it.interpolator = FastOutSlowInInterpolator()
         it.addListener(onStart = { show() }, onEnd = { if (revealInfo.radius != 0f) hide() })
 
-        val rtlMod = if (currentLocale.layoutDirection == View.LAYOUT_DIRECTION_RTL) 1f else -1f
+        val rtlMod =
+            if (LocaleSetting.instance.currentLocale.layoutDirection == View.LAYOUT_DIRECTION_RTL)
+                1f else -1f
         val maxX = revealInfo.centerX - marginEnd - measuredWidth / 2f
         val targetX = if (revealInfo.radius == 0f) 0f else maxX * rtlMod
         val moveX = ObjectAnimator.ofFloat(this, View.TRANSLATION_X, targetX)

app/apk/src/main/java/com/topjohnwu/magisk/utils/TextHolder.kt

@@ -0,0 +1,46 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.res.Resources
+
+abstract class TextHolder {
+
+    open val isEmpty: Boolean get() = false
+    abstract fun getText(resources: Resources): CharSequence
+
+    // ---
+
+    class String(
+        private val value: CharSequence
+    ) : TextHolder() {
+        override val isEmpty get() = value.isEmpty()
+        override fun getText(resources: Resources) = value
+    }
+
+    open class Resource(
+        protected val value: Int
+    ) : TextHolder() {
+        override val isEmpty get() = value == 0
+        override fun getText(resources: Resources) = resources.getString(value)
+    }
+
+    class ResourceArgs(
+        value: Int,
+        private vararg val params: Any
+    ) : Resource(value) {
+        override fun getText(resources: Resources): kotlin.String {
+            // Replace TextHolder with strings
+            val args = params.map { if (it is TextHolder) it.getText(resources) else it }
+            return resources.getString(value, *args.toTypedArray())
+        }
+    }
+
+    // ---
+
+    companion object {
+        val EMPTY = String("")
+    }
+}
+
+fun Int.asText(): TextHolder = TextHolder.Resource(this)
+fun Int.asText(vararg params: Any): TextHolder = TextHolder.ResourceArgs(this, *params)
+fun CharSequence.asText(): TextHolder = TextHolder.String(this)

app/apk/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt

@@ -0,0 +1,232 @@
+package com.topjohnwu.magisk.view
+
+import android.app.Activity
+import android.content.DialogInterface
+import android.content.res.ColorStateList
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.InsetDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatDialog
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.databinding.Bindable
+import androidx.databinding.PropertyChangeRegistry
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.topjohnwu.magisk.BR
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.arch.UIActivity
+import com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.ObservableHost
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.databinding.bindExtra
+import com.topjohnwu.magisk.databinding.set
+import com.topjohnwu.magisk.databinding.setAdapter
+import com.topjohnwu.magisk.view.MagiskDialog.DialogClickListener
+
+typealias DialogButtonClickListener = (DialogInterface) -> Unit
+
+class MagiskDialog(
+    context: Activity, theme: Int = 0
+) : AppCompatDialog(context, theme) {
+
+    private val binding: DialogMagiskBaseBinding =
+        DialogMagiskBaseBinding.inflate(LayoutInflater.from(context))
+    private val data = Data()
+
+    val activity: UIActivity<*> get() = ownerActivity as UIActivity<*>
+
+    init {
+        binding.setVariable(BR.data, data)
+        setCancelable(true)
+        setOwnerActivity(context)
+    }
+
+    inner class Data : ObservableHost {
+        override var callbacks: PropertyChangeRegistry? = null
+
+        @get:Bindable
+        var icon: Drawable? = null
+            set(value) = set(value, field, { field = it }, BR.icon)
+
+        @get:Bindable
+        var title: CharSequence = ""
+            set(value) = set(value, field, { field = it }, BR.title)
+
+        @get:Bindable
+        var message: CharSequence = ""
+            set(value) = set(value, field, { field = it }, BR.message)
+
+        val buttonPositive = ButtonViewModel()
+        val buttonNeutral = ButtonViewModel()
+        val buttonNegative = ButtonViewModel()
+    }
+
+    enum class ButtonType {
+        POSITIVE, NEUTRAL, NEGATIVE
+    }
+
+    interface Button {
+        var icon: Int
+        var text: Any
+        var isEnabled: Boolean
+        var doNotDismiss: Boolean
+
+        fun onClick(listener: DialogButtonClickListener)
+    }
+
+    inner class ButtonViewModel : Button, ObservableHost {
+        override var callbacks: PropertyChangeRegistry? = null
+
+        @get:Bindable
+        override var icon = 0
+            set(value) = set(value, field, { field = it }, BR.icon, BR.gone)
+
+        @get:Bindable
+        var message: String = ""
+            set(value) = set(value, field, { field = it }, BR.message, BR.gone)
+
+        override var text: Any
+            get() = message
+            set(value) {
+                message = when (value) {
+                    is Int -> context.getText(value)
+                    else -> value
+                }.toString()
+            }
+
+        @get:Bindable
+        val gone get() = icon == 0 && message.isEmpty()
+
+        @get:Bindable
+        override var isEnabled = true
+            set(value) = set(value, field, { field = it }, BR.enabled)
+
+        override var doNotDismiss = false
+
+        private var onClickAction: DialogButtonClickListener = {}
+
+        override fun onClick(listener: DialogButtonClickListener) {
+            onClickAction = listener
+        }
+
+        fun clicked() {
+            onClickAction(this@MagiskDialog)
+            if (!doNotDismiss) {
+                dismiss()
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        super.setContentView(binding.root)
+
+        val default = MaterialColors.getColor(context, com.google.android.material.R.attr.colorSurface, javaClass.canonicalName)
+        val surfaceColor = MaterialColors.getColor(context, R.attr.colorSurfaceSurfaceVariant, default)
+        val materialShapeDrawable = MaterialShapeDrawable(context, null, androidx.appcompat.R.attr.alertDialogStyle, com.google.android.material.R.style.MaterialAlertDialog_MaterialComponents)
+        materialShapeDrawable.initializeElevationOverlay(context)
+        materialShapeDrawable.fillColor = ColorStateList.valueOf(surfaceColor)
+        materialShapeDrawable.elevation = context.resources.getDimension(R.dimen.margin_generic)
+        materialShapeDrawable.setCornerSize(context.resources.getDimension(R.dimen.l_50))
+
+        val inset = context.resources.getDimensionPixelSize(com.google.android.material.R.dimen.appcompat_dialog_background_inset)
+        window?.apply {
+            setBackgroundDrawable(InsetDrawable(materialShapeDrawable, inset, inset, inset, inset))
+            setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        }
+    }
+
+    override fun setTitle(@StringRes titleId: Int) { data.title = context.getString(titleId) }
+
+    override fun setTitle(title: CharSequence?) { data.title = title ?: "" }
+
+    fun setMessage(@StringRes msgId: Int, vararg args: Any) {
+        data.message = context.getString(msgId, *args)
+    }
+
+    fun setMessage(message: CharSequence) { data.message = message }
+
+    fun setIcon(@DrawableRes drawableRes: Int) {
+        data.icon = AppCompatResources.getDrawable(context, drawableRes)
+    }
+
+    fun setIcon(drawable: Drawable) { data.icon = drawable }
+
+    fun setButton(buttonType: ButtonType, builder: Button.() -> Unit) {
+        val button = when (buttonType) {
+            ButtonType.POSITIVE -> data.buttonPositive
+            ButtonType.NEUTRAL -> data.buttonNeutral
+            ButtonType.NEGATIVE -> data.buttonNegative
+        }
+        button.apply(builder)
+    }
+
+    class DialogItem(
+        override val item: CharSequence,
+        val position: Int
+    ) : RvItem(), DiffItem<DialogItem>, ItemWrapper<CharSequence> {
+        override val layoutRes = R.layout.item_list_single_line
+    }
+
+    fun interface DialogClickListener {
+        fun onClick(position: Int)
+    }
+
+    fun setListItems(
+        list: Array<out CharSequence>,
+        listener: DialogClickListener
+    ) = setView(
+        RecyclerView(context).also {
+            it.isNestedScrollingEnabled = false
+            it.layoutManager = LinearLayoutManager(context)
+
+            val items = list.mapIndexed { i, cs -> DialogItem(cs, i) }
+            val extraBindings = bindExtra { sa ->
+                sa.put(BR.listener, DialogClickListener { pos ->
+                    listener.onClick(pos)
+                    dismiss()
+                })
+            }
+            it.setAdapter(items, extraBindings)
+        }
+    )
+
+    fun setView(view: View) {
+        binding.dialogBaseContainer.removeAllViews()
+        binding.dialogBaseContainer.addView(
+            view,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+    }
+
+    fun resetButtons() {
+        ButtonType.values().forEach {
+            setButton(it) {
+                text = ""
+                icon = 0
+                isEnabled = true
+                doNotDismiss = false
+                onClick {}
+            }
+        }
+    }
+
+    // Prevent calling setContentView
+
+    @Deprecated("Please use setView(view)", level = DeprecationLevel.ERROR)
+    override fun setContentView(layoutResID: Int) {}
+    @Deprecated("Please use setView(view)", level = DeprecationLevel.ERROR)
+    override fun setContentView(view: View) {}
+    @Deprecated("Please use setView(view)", level = DeprecationLevel.ERROR)
+    override fun setContentView(view: View, params: ViewGroup.LayoutParams?) {}
+}

app/apk/src/main/java/com/topjohnwu/magisk/view/TappableHeadlineItem.kt

@@ -0,0 +1,30 @@
+package com.topjohnwu.magisk.view
+
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.RvItem
+import com.topjohnwu.magisk.core.R as CoreR
+
+sealed class TappableHeadlineItem : RvItem(), DiffItem<TappableHeadlineItem> {
+
+    abstract val title: Int
+    abstract val icon: Int
+
+    override val layoutRes = R.layout.item_tappable_headline
+
+    // --- listener
+
+    interface Listener {
+
+        fun onItemPressed(item: TappableHeadlineItem)
+
+    }
+
+    // --- objects
+
+    object ThemeMode : TappableHeadlineItem() {
+        override val title = CoreR.string.settings_dark_mode_title
+        override val icon = R.drawable.ic_day_night
+    }
+
+}

app/apk/src/main/java/com/topjohnwu/magisk/view/TextItem.kt

@@ -0,0 +1,10 @@
+package com.topjohnwu.magisk.view
+
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.DiffItem
+import com.topjohnwu.magisk.databinding.ItemWrapper
+import com.topjohnwu.magisk.databinding.RvItem
+
+class TextItem(override val item: Int) : RvItem(), DiffItem<TextItem>, ItemWrapper<Int> {
+    override val layoutRes = R.layout.item_text
+}

app/apk/src/main/java/com/topjohnwu/magisk/widget/ConcealableBottomNavigationView.java

@@ -0,0 +1,135 @@
+package com.topjohnwu.magisk.widget;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.animation.StateListAnimator;
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.customview.view.AbsSavedState;
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
+
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.topjohnwu.magisk.R;
+
+public class ConcealableBottomNavigationView extends BottomNavigationView {
+
+    private static final int[] STATE_SET = {
+            R.attr.state_hidden
+    };
+
+    private boolean isHidden;
+    public ConcealableBottomNavigationView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public ConcealableBottomNavigationView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, com.google.android.material.R.attr.bottomNavigationStyle);
+    }
+
+    public ConcealableBottomNavigationView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, com.google.android.material.R.style.Widget_Design_BottomNavigationView);
+    }
+
+    public ConcealableBottomNavigationView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void recreateAnimator(int height) {
+        Animator toHidden = ObjectAnimator.ofFloat(this, "translationY", height);
+        toHidden.setDuration(175);
+        toHidden.setInterpolator(new FastOutLinearInInterpolator());
+        Animator toUnhidden = ObjectAnimator.ofFloat(this, "translationY", 0);
+        toUnhidden.setDuration(225);
+        toUnhidden.setInterpolator(new FastOutLinearInInterpolator());
+
+        StateListAnimator animator = new StateListAnimator();
+
+        animator.addState(STATE_SET, toHidden);
+        animator.addState(new int[]{}, toUnhidden);
+
+        setStateListAnimator(animator);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        recreateAnimator(getMeasuredHeight());
+    }
+
+    @Override
+    protected int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+        if (isHidden()) {
+            mergeDrawableStates(drawableState, STATE_SET);
+        }
+        return drawableState;
+    }
+
+    public boolean isHidden() {
+        return isHidden;
+    }
+
+    public void setHidden(boolean raised) {
+        if (isHidden != raised) {
+            isHidden = raised;
+            refreshDrawableState();
+        }
+    }
+
+    @NonNull
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        SavedState state = new SavedState(super.onSaveInstanceState());
+        state.isHidden = isHidden();
+        return state;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        final SavedState ss = (SavedState) state;
+        super.onRestoreInstanceState(ss.getSuperState());
+
+        if (ss.isHidden) {
+            setHidden(isHidden);
+        }
+    }
+
+    static class SavedState extends AbsSavedState {
+
+        public boolean isHidden;
+
+        public SavedState(Parcel source) {
+            super(source, ConcealableBottomNavigationView.class.getClassLoader());
+            isHidden = source.readByte() != 0;
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeByte(isHidden ? (byte) 1 : (byte) 0);
+        }
+
+        public static final Creator<SavedState> CREATOR = new Creator<>() {
+
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                return new SavedState(source);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}

app/apk/src/main/res/color/color_card_background_color_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorSurfaceVariant" android:state_enabled="true" />
+    <item android:alpha="0.68" android:color="?colorSurfaceVariant" />
+</selector>

app/apk/src/main/res/drawable/avd_bug_from_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 20 8 L 20 8 L 17.19 8 C 16.74 7.22 16.12 6.55 15.37 6.04 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.49 5 12 5 C 11.51 5 11.04 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6.04 C 7.88 6.55 7.26 7.22 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.04 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.04 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 7.85 19.79 9.78 21 12 21 C 14.22 21 16.15 19.79 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.96 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.96 10.33 17.91 10 L 20 10 L 20 8 M 14 16 C 14 15.43 14 14.859 14 14.289 L 14 14 C 13.869 14 13.739 14 13.608 14 C 12.405 14 11.203 14 10 14 C 10 14.509 10 15.017 10 15.526 C 10 15.684 10 15.842 10 16 L 10.33 16 C 10.392 16 10.454 16 10.515 16 C 11.677 16 12.838 16 14 16 C 14 16 14 16 14 16 M 14 10 L 14 12 L 14 12 L 10 12 L 10 10 L 14 10 M 12 15 L 12 15 L 12 15 L 12 15 L 12 15 L 12 15"
                 android:valueTo="M 20 8 L 18.595 8 L 17.19 8 C 16.74 7.2 16.12 6.5 15.37 6 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.5 5 12 5 C 11.5 5 11.05 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6 C 7.87 6.5 7.26 7.21 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.03 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.03 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 8.47 20.87 12.14 21.84 15 20.18 C 15.91 19.66 16.67 18.9 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.97 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.97 10.33 17.91 10 L 20 10 L 20 8 M 14.828 17.828 C 15.578 17.079 16 16.06 16 15 L 16 11 C 16 9.94 15.578 8.921 14.828 8.172 C 14.079 7.422 13.06 7 12 7 C 10.94 7 9.921 7.422 9.172 8.172 C 8.422 8.921 8 9.94 8 11 L 8 15 C 8 16.06 8.422 17.079 9.172 17.828 C 9.921 18.578 10.94 19 12 19 C 13.06 19 14.079 18.578 14.828 17.828 M 14 10 L 14 11 L 14 12 L 10 12 L 10 10 L 14 10 M 10 14 L 14 14 L 14 16 L 10 16 L 10 14 L 10 14"

app/apk/src/main/res/drawable/avd_bug_to_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 20 8 L 18.595 8 L 17.19 8 C 16.74 7.2 16.12 6.5 15.37 6 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.5 5 12 5 C 11.5 5 11.05 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6 C 7.87 6.5 7.26 7.21 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.03 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.03 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 8.47 20.87 12.14 21.84 15 20.18 C 15.91 19.66 16.67 18.9 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.97 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.97 10.33 17.91 10 L 20 10 L 20 8 M 14.828 17.828 C 15.578 17.079 16 16.06 16 15 L 16 11 C 16 9.94 15.578 8.921 14.828 8.172 C 14.079 7.422 13.06 7 12 7 C 10.94 7 9.921 7.422 9.172 8.172 C 8.422 8.921 8 9.94 8 11 L 8 15 C 8 16.06 8.422 17.079 9.172 17.828 C 9.921 18.578 10.94 19 12 19 C 13.06 19 14.079 18.578 14.828 17.828 M 14 10 L 14 11 L 14 12 L 10 12 L 10 10 L 14 10 M 10 14 L 14 14 L 14 16 L 10 16 L 10 14 L 10 14"
                 android:valueTo="M 20 8 L 20 8 L 17.19 8 C 16.74 7.22 16.12 6.55 15.37 6.04 L 17 4.41 L 15.59 3 L 13.42 5.17 C 12.96 5.06 12.49 5 12 5 C 11.51 5 11.04 5.06 10.59 5.17 L 8.41 3 L 7 4.41 L 8.62 6.04 C 7.88 6.55 7.26 7.22 6.81 8 L 4 8 L 4 10 L 6.09 10 C 6.04 10.33 6 10.66 6 11 L 6 12 L 4 12 L 4 14 L 6 14 L 6 15 C 6 15.34 6.04 15.67 6.09 16 L 4 16 L 4 18 L 6.81 18 C 7.85 19.79 9.78 21 12 21 C 14.22 21 16.15 19.79 17.19 18 L 20 18 L 20 16 L 17.91 16 C 17.96 15.67 18 15.34 18 15 L 18 14 L 20 14 L 20 12 L 18 12 L 18 11 C 18 10.66 17.96 10.33 17.91 10 L 20 10 L 20 8 M 14 16 C 14 15.43 14 14.859 14 14.289 L 14 14 C 13.869 14 13.739 14 13.608 14 C 12.405 14 11.203 14 10 14 C 10 14.509 10 15.017 10 15.526 C 10 15.684 10 15.842 10 16 L 10.33 16 C 10.392 16 10.454 16 10.515 16 C 11.677 16 12.838 16 14 16 C 14 16 14 16 14 16 M 14 10 L 14 12 L 14 12 L 10 12 L 10 10 L 14 10 M 12 15 L 12 15 L 12 15 L 12 15 L 12 15 L 12 15"

app/apk/src/main/res/drawable/avd_circle_check_from_filled.xml

@@ -17,7 +17,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="500"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.744 3.12 17.24 4.927 19.052 C 6.74 20.87 9.244 22 12 22 C 13.911 22 15.701 21.457 17.224 20.517 C 18.628 19.651 19.804 18.448 20.638 17.024 C 21.503 15.545 22 13.828 22 12 C 22 10.2 21.518 8.507 20.677 7.044 C 19.755 5.441 18.402 4.114 16.779 3.224 C 15.357 2.444 13.728 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"
                 android:valueTo="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"

app/apk/src/main/res/drawable/avd_circle_check_to_filled.xml

@@ -17,7 +17,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="500"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 7 13 L 7 13 L 17 13 L 17 11 L 17 11 L 7 11 L 7 11 L 7 11"
                 android:valueTo="M 12 2 C 9.217 2 6.689 3.152 4.872 5.004 C 3.098 6.811 2 9.283 2 12 C 2 14.856 3.213 17.442 5.149 19.268 C 6.942 20.96 9.356 22 12 22 C 14.061 22 15.982 21.368 17.578 20.288 C 19.114 19.249 20.349 17.796 21.119 16.092 C 21.685 14.841 22 13.456 22 12 C 22 10.122 21.475 8.361 20.566 6.856 C 19.691 5.408 18.46 4.197 16.997 3.347 C 15.524 2.491 13.817 2 12 2 M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 M 6 13 L 10 17 L 18 9 L 16.59 7.58 L 16.59 7.58 L 10 14.17 L 7.41 11.59 L 6 13"

app/apk/src/main/res/drawable/avd_home_from_filled.xml

@@ -19,7 +19,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 9 14 L 9 21 L 4 21 L 4 9 L 12 3 L 12 3 L 20 9 L 20 21 L 15 21 L 15 14 L 9 14 M 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4"
                 android:valueTo="M 9 13 L 9 19 L 6 19 L 6 10 L 12 5.5 L 15 7.75 L 18 10 L 18 19 L 15 19 L 15 13 L 9 13 M 4 21 L 4 9 L 12 3 L 20 9 L 20 21 L 4 21 L 4 21"

app/apk/src/main/res/drawable/avd_home_to_filled.xml

@@ -19,7 +19,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 9 13 L 9 19 L 6 19 L 6 10 L 12 5.5 L 15 7.75 L 18 10 L 18 19 L 15 19 L 15 13 L 9 13 M 4 21 L 4 9 L 12 3 L 20 9 L 20 21 L 4 21 L 4 21"
                 android:valueTo="M 9 14 L 9 21 L 4 21 L 4 9 L 12 3 L 12 3 L 20 9 L 20 21 L 15 21 L 15 14 L 9 14 M 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4 L 12 13.4"

app/apk/src/main/res/drawable/avd_module_from_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 23 13.5 C 23 14.163 22.736 14.799 22.268 15.268 C 21.799 15.736 21.163 16 20.5 16 C 20 16 19.5 16 19 16 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 15.1 22 L 13.2 22 C 13.2 21.5 13.2 21 13.2 20.5 C 13.2 19 12 17.8 10.5 17.8 C 9 17.8 7.8 19 7.8 20.5 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 3.5 16.2 C 5 16.2 6.2 15 6.2 13.5 C 6.2 12 5 10.8 3.5 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 8 5 C 8 4.5 8 4 8 3.5 C 8 2.837 8.264 2.201 8.732 1.732 C 9.201 1.264 9.837 1 10.5 1 C 11.163 1 11.799 1.264 12.268 1.732 C 12.736 2.201 13 2.837 13 3.5 C 13 4 13 4.5 13 5 L 17 5 C 17.55 5 18.05 5.223 18.413 5.584 C 18.775 5.945 19 6.445 19 7 L 19 11 C 19.5 11 20 11 20.5 11 C 20.5 11 20.5 11 20.5 11 C 21.163 11 21.799 11.264 22.268 11.732 C 22.736 12.201 23 12.837 23 13.5 M 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12"
                 android:valueTo="M 22 13.5 C 22 14.087 21.856 14.64 21.6 15.126 C 21.344 15.612 20.978 16.03 20.533 16.347 C 20.089 16.664 19.567 16.88 19 16.96 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 13.2 22 L 13.2 21.7 C 13.2 20.984 12.915 20.297 12.409 19.791 C 11.903 19.285 11.216 19 10.5 19 C 9 19 7.8 20.21 7.8 21.7 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 2.3 16.2 C 3.79 16.2 5 15 5 13.5 C 5 12 3.79 10.8 2.3 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 7.04 5 C 7.12 4.433 7.336 3.911 7.653 3.467 C 7.97 3.022 8.388 2.656 8.874 2.4 C 9.36 2.144 9.913 2 10.5 2 C 11.087 2 11.64 2.144 12.126 2.4 C 12.612 2.656 13.03 3.022 13.347 3.467 C 13.664 3.911 13.88 4.433 13.96 5 L 17 5 C 17.53 5 18.039 5.211 18.414 5.586 C 18.789 5.961 19 6.47 19 7 L 19 10.04 C 19.425 10.1 19.825 10.236 20.186 10.434 C 20.547 10.633 20.869 10.893 21.137 11.2 C 21.406 11.508 21.622 11.863 21.77 12.251 C 21.919 12.639 22 13.06 22 13.5 M 17 12 L 18.5 12 C 18.898 12 19.279 12.158 19.561 12.439 C 19.842 12.721 20 13.102 20 13.5 C 20 13.898 19.842 14.279 19.561 14.561 C 19.279 14.842 18.898 15 18.5 15 L 17 15 L 17 15 L 17 20 L 14.88 20 C 14.2 18.25 12.5 17 10.5 17 C 8.5 17 6.8 18.25 6.12 20 L 4 20 L 4 17.88 C 5.75 17.2 7 15.5 7 13.5 C 7 11.5 5.76 9.8 4 9.12 L 4 7 L 9 7 L 9 5.5 C 9 5.102 9.158 4.721 9.439 4.439 C 9.721 4.158 10.102 4 10.5 4 C 10.898 4 11.279 4.158 11.561 4.439 C 11.842 4.721 12 5.102 12 5.5 L 12 7 L 17 7 L 17 12"

app/apk/src/main/res/drawable/avd_module_to_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 22 13.5 C 22 14.087 21.856 14.64 21.6 15.126 C 21.344 15.612 20.978 16.03 20.533 16.347 C 20.089 16.664 19.567 16.88 19 16.96 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 13.2 22 L 13.2 21.7 C 13.2 20.984 12.915 20.297 12.409 19.791 C 11.903 19.285 11.216 19 10.5 19 C 9 19 7.8 20.21 7.8 21.7 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 2.3 16.2 C 3.79 16.2 5 15 5 13.5 C 5 12 3.79 10.8 2.3 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 7.04 5 C 7.12 4.433 7.336 3.911 7.653 3.467 C 7.97 3.022 8.388 2.656 8.874 2.4 C 9.36 2.144 9.913 2 10.5 2 C 11.087 2 11.64 2.144 12.126 2.4 C 12.612 2.656 13.03 3.022 13.347 3.467 C 13.664 3.911 13.88 4.433 13.96 5 L 17 5 C 17.53 5 18.039 5.211 18.414 5.586 C 18.789 5.961 19 6.47 19 7 L 19 10.04 C 19.425 10.1 19.825 10.236 20.186 10.434 C 20.547 10.633 20.869 10.893 21.137 11.2 C 21.406 11.508 21.622 11.863 21.77 12.251 C 21.919 12.639 22 13.06 22 13.5 M 17 12 L 18.5 12 C 18.898 12 19.279 12.158 19.561 12.439 C 19.842 12.721 20 13.102 20 13.5 C 20 13.898 19.842 14.279 19.561 14.561 C 19.279 14.842 18.898 15 18.5 15 L 17 15 L 17 15 L 17 20 L 14.88 20 C 14.2 18.25 12.5 17 10.5 17 C 8.5 17 6.8 18.25 6.12 20 L 4 20 L 4 17.88 C 5.75 17.2 7 15.5 7 13.5 C 7 11.5 5.76 9.8 4 9.12 L 4 7 L 9 7 L 9 5.5 C 9 5.102 9.158 4.721 9.439 4.439 C 9.721 4.158 10.102 4 10.5 4 C 10.898 4 11.279 4.158 11.561 4.439 C 11.842 4.721 12 5.102 12 5.5 L 12 7 L 17 7 L 17 12"
                 android:valueTo="M 23 13.5 C 23 14.163 22.736 14.799 22.268 15.268 C 21.799 15.736 21.163 16 20.5 16 C 20 16 19.5 16 19 16 L 19 20 C 19 20.53 18.789 21.039 18.414 21.414 C 18.039 21.789 17.53 22 17 22 L 15.1 22 L 13.2 22 C 13.2 21.5 13.2 21 13.2 20.5 C 13.2 19 12 17.8 10.5 17.8 C 9 17.8 7.8 19 7.8 20.5 L 7.8 22 L 4 22 C 3.47 22 2.961 21.789 2.586 21.414 C 2.211 21.039 2 20.53 2 20 L 2 16.2 L 3.5 16.2 C 5 16.2 6.2 15 6.2 13.5 C 6.2 12 5 10.8 3.5 10.8 L 2 10.8 L 2 7 C 2 6.47 2.211 5.961 2.586 5.586 C 2.961 5.211 3.47 5 4 5 L 8 5 C 8 4.5 8 4 8 3.5 C 8 2.837 8.264 2.201 8.732 1.732 C 9.201 1.264 9.837 1 10.5 1 C 11.163 1 11.799 1.264 12.268 1.732 C 12.736 2.201 13 2.837 13 3.5 C 13 4 13 4.5 13 5 L 17 5 C 17.55 5 18.05 5.223 18.413 5.584 C 18.775 5.945 19 6.445 19 7 L 19 11 C 19.5 11 20 11 20.5 11 C 20.5 11 20.5 11 20.5 11 C 21.163 11 21.799 11.264 22.268 11.732 C 22.736 12.201 23 12.837 23 13.5 M 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12"

app/apk/src/main/res/drawable/avd_settings_from_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.53 11.34 4.5 11.67 4.5 12 C 4.5 12.33 4.53 12.65 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.67 16.04 18.34 16.56 17.94 L 19.05 18.95 C 19.27 19.03 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.78 15.05 21.73 14.78 21.54 14.63 L 19.43 12.97 L 19.43 12.97 C 19.47 12.65 19.5 12.33 19.5 12 C 19.5 11.67 19.47 11.34 19.43 11 L 21.54 9.37 C 21.73 9.22 21.78 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8.5 C 12.614 8.5 13.218 8.662 13.75 8.969 C 14.282 9.276 14.724 9.718 15.031 10.25 C 15.338 10.782 15.5 11.386 15.5 12 C 15.5 12.614 15.338 13.218 15.031 13.75 C 14.724 14.282 14.282 14.724 13.75 15.031 C 13.218 15.338 12.614 15.5 12 15.5 C 11.072 15.5 10.181 15.131 9.525 14.475 C 8.869 13.819 8.5 12.928 8.5 12 C 8.5 11.072 8.869 10.181 9.525 9.525 C 10.181 8.869 11.072 8.5 12 8.5 M 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 M 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12"
                 android:valueTo="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.547 11.333 4.523 11.667 4.5 12 C 4.523 12.323 4.547 12.647 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.68 16.04 18.34 16.56 17.95 L 19.05 18.95 C 19.27 19.04 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.79 15.05 21.73 14.78 21.54 14.63 L 19.43 13 L 19.465 12.499 C 19.477 12.333 19.488 12.166 19.5 12 C 19.477 11.667 19.453 11.333 19.43 11 L 21.54 9.37 C 21.73 9.22 21.79 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8 C 12.53 8 13.05 8.105 13.531 8.305 C 14.011 8.504 14.454 8.797 14.828 9.172 C 15.578 9.921 16 10.94 16 12 C 16 12.53 15.895 13.05 15.695 13.531 C 15.496 14.011 15.203 14.454 14.828 14.828 C 14.079 15.578 13.06 16 12 16 C 10.94 16 9.921 15.578 9.172 14.828 C 8.422 14.079 8 13.06 8 12 C 8 10.94 8.422 9.921 9.172 9.172 C 9.921 8.422 10.94 8 12 8 M 12 10 C 11.912 10 11.824 10.006 11.737 10.017 C 11.651 10.029 11.565 10.046 11.481 10.069 C 11.397 10.091 11.315 10.119 11.235 10.152 C 11.155 10.186 11.077 10.224 11.001 10.267 C 10.926 10.311 10.854 10.359 10.784 10.412 C 10.715 10.466 10.649 10.524 10.586 10.586 C 10.524 10.649 10.466 10.715 10.412 10.784 C 10.359 10.854 10.311 10.926 10.267 11.001 C 10.224 11.077 10.186 11.155 10.152 11.235 C 10.119 11.315 10.091 11.397 10.069 11.481 C 10.046 11.565 10.029 11.651 10.017 11.737 C 10.006 11.824 10 11.912 10 12 C 10 12.088 10.006 12.176 10.017 12.263 C 10.029 12.349 10.046 12.435 10.069 12.519 C 10.091 12.603 10.119 12.685 10.152 12.765 C 10.186 12.845 10.224 12.923 10.267 12.999 C 10.311 13.074 10.359 13.146 10.412 13.216 C 10.466 13.285 10.524 13.351 10.586 13.414 C 10.649 13.476 10.715 13.534 10.784 13.588 C 10.854 13.641 10.926 13.689 11.001 13.733 C 11.077 13.776 11.155 13.814 11.235 13.848 C 11.315 13.881 11.397 13.909 11.481 13.931 C 11.565 13.954 11.651 13.971 11.737 13.983 C 11.824 13.994 11.912 14 12 14 C 12.53 14 13.039 13.789 13.414 13.414 C 13.468 13.36 13.518 13.304 13.565 13.245 C 13.611 13.187 13.655 13.126 13.694 13.062 C 13.734 12.999 13.77 12.934 13.802 12.867 C 13.834 12.8 13.863 12.731 13.887 12.661 C 13.912 12.591 13.933 12.519 13.949 12.447 C 13.966 12.374 13.979 12.3 13.987 12.226 C 13.996 12.151 14 12.076 14 12 C 14 11.912 13.994 11.824 13.983 11.737 C 13.971 11.651 13.954 11.565 13.931 11.481 C 13.909 11.397 13.881 11.315 13.848 11.235 C 13.814 11.155 13.776 11.077 13.733 11.001 C 13.689 10.926 13.641 10.854 13.588 10.784 C 13.534 10.715 13.476 10.649 13.414 10.586 C 13.039 10.211 12.53 10 12 10 M 11.25 4 L 11.25 4 L 12.75 4 L 13.12 6.62 C 14.32 6.86 15.38 7.5 16.15 8.39 L 18.56 7.35 L 19.31 8.65 L 17.2 10.2 C 17.6 11.37 17.6 12.64 17.2 13.81 L 19.32 15.36 L 18.57 16.66 L 16.14 15.62 C 15.37 16.5 14.32 17.14 13.13 17.39 L 12.76 20 L 11.24 20 L 10.87 17.38 C 9.68 17.14 8.63 16.5 7.86 15.62 L 5.43 16.66 L 4.68 15.36 L 6.8 13.8 C 6.4 12.64 6.4 11.37 6.8 10.2 L 4.69 8.65 L 5.44 7.35 L 7.85 8.39 C 8.62 7.5 9.68 6.86 10.88 6.61 L 11.25 4"

app/apk/src/main/res/drawable/avd_settings_to_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.547 11.333 4.523 11.667 4.5 12 C 4.523 12.323 4.547 12.647 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.68 16.04 18.34 16.56 17.95 L 19.05 18.95 C 19.27 19.04 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.79 15.05 21.73 14.78 21.54 14.63 L 19.43 13 L 19.465 12.499 C 19.477 12.333 19.488 12.166 19.5 12 C 19.477 11.667 19.453 11.333 19.43 11 L 21.54 9.37 C 21.73 9.22 21.79 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8 C 12.53 8 13.05 8.105 13.531 8.305 C 14.011 8.504 14.454 8.797 14.828 9.172 C 15.578 9.921 16 10.94 16 12 C 16 12.53 15.895 13.05 15.695 13.531 C 15.496 14.011 15.203 14.454 14.828 14.828 C 14.079 15.578 13.06 16 12 16 C 10.94 16 9.921 15.578 9.172 14.828 C 8.422 14.079 8 13.06 8 12 C 8 10.94 8.422 9.921 9.172 9.172 C 9.921 8.422 10.94 8 12 8 M 12 10 C 11.912 10 11.824 10.006 11.737 10.017 C 11.651 10.029 11.565 10.046 11.481 10.069 C 11.397 10.091 11.315 10.119 11.235 10.152 C 11.155 10.186 11.077 10.224 11.001 10.267 C 10.926 10.311 10.854 10.359 10.784 10.412 C 10.715 10.466 10.649 10.524 10.586 10.586 C 10.524 10.649 10.466 10.715 10.412 10.784 C 10.359 10.854 10.311 10.926 10.267 11.001 C 10.224 11.077 10.186 11.155 10.152 11.235 C 10.119 11.315 10.091 11.397 10.069 11.481 C 10.046 11.565 10.029 11.651 10.017 11.737 C 10.006 11.824 10 11.912 10 12 C 10 12.088 10.006 12.176 10.017 12.263 C 10.029 12.349 10.046 12.435 10.069 12.519 C 10.091 12.603 10.119 12.685 10.152 12.765 C 10.186 12.845 10.224 12.923 10.267 12.999 C 10.311 13.074 10.359 13.146 10.412 13.216 C 10.466 13.285 10.524 13.351 10.586 13.414 C 10.649 13.476 10.715 13.534 10.784 13.588 C 10.854 13.641 10.926 13.689 11.001 13.733 C 11.077 13.776 11.155 13.814 11.235 13.848 C 11.315 13.881 11.397 13.909 11.481 13.931 C 11.565 13.954 11.651 13.971 11.737 13.983 C 11.824 13.994 11.912 14 12 14 C 12.53 14 13.039 13.789 13.414 13.414 C 13.468 13.36 13.518 13.304 13.565 13.245 C 13.611 13.187 13.655 13.126 13.694 13.062 C 13.734 12.999 13.77 12.934 13.802 12.867 C 13.834 12.8 13.863 12.731 13.887 12.661 C 13.912 12.591 13.933 12.519 13.949 12.447 C 13.966 12.374 13.979 12.3 13.987 12.226 C 13.996 12.151 14 12.076 14 12 C 14 11.912 13.994 11.824 13.983 11.737 C 13.971 11.651 13.954 11.565 13.931 11.481 C 13.909 11.397 13.881 11.315 13.848 11.235 C 13.814 11.155 13.776 11.077 13.733 11.001 C 13.689 10.926 13.641 10.854 13.588 10.784 C 13.534 10.715 13.476 10.649 13.414 10.586 C 13.039 10.211 12.53 10 12 10 M 11.25 4 L 11.25 4 L 12.75 4 L 13.12 6.62 C 14.32 6.86 15.38 7.5 16.15 8.39 L 18.56 7.35 L 19.31 8.65 L 17.2 10.2 C 17.6 11.37 17.6 12.64 17.2 13.81 L 19.32 15.36 L 18.57 16.66 L 16.14 15.62 C 15.37 16.5 14.32 17.14 13.13 17.39 L 12.76 20 L 11.24 20 L 10.87 17.38 C 9.68 17.14 8.63 16.5 7.86 15.62 L 5.43 16.66 L 4.68 15.36 L 6.8 13.8 C 6.4 12.64 6.4 11.37 6.8 10.2 L 4.69 8.65 L 5.44 7.35 L 7.85 8.39 C 8.62 7.5 9.68 6.86 10.88 6.61 L 11.25 4"
                 android:valueTo="M 14.87 5.07 L 14.5 2.42 C 14.46 2.18 14.25 2 14 2 L 10 2 C 9.75 2 9.54 2.18 9.5 2.42 L 9.13 5.07 C 8.5 5.32 7.96 5.66 7.44 6.05 L 4.95 5.05 C 4.73 4.96 4.46 5.05 4.34 5.27 L 2.34 8.73 C 2.21 8.95 2.27 9.22 2.46 9.37 L 4.57 11 C 4.53 11.34 4.5 11.67 4.5 12 C 4.5 12.33 4.53 12.65 4.57 12.97 L 2.46 14.63 C 2.27 14.78 2.21 15.05 2.34 15.27 L 4.34 18.73 C 4.46 18.95 4.73 19.03 4.95 18.95 L 7.44 17.94 C 7.96 18.34 8.5 18.68 9.13 18.93 L 9.5 21.58 C 9.54 21.82 9.75 22 10 22 L 14 22 C 14.25 22 14.46 21.82 14.5 21.58 L 14.87 18.93 C 15.5 18.67 16.04 18.34 16.56 17.94 L 19.05 18.95 C 19.27 19.03 19.54 18.95 19.66 18.73 L 21.66 15.27 C 21.78 15.05 21.73 14.78 21.54 14.63 L 19.43 12.97 L 19.43 12.97 C 19.47 12.65 19.5 12.33 19.5 12 C 19.5 11.67 19.47 11.34 19.43 11 L 21.54 9.37 C 21.73 9.22 21.78 8.95 21.66 8.73 L 19.66 5.27 C 19.54 5.05 19.27 4.96 19.05 5.05 L 16.56 6.05 C 16.04 5.66 15.5 5.32 14.87 5.07 M 12 8.5 C 12.614 8.5 13.218 8.662 13.75 8.969 C 14.282 9.276 14.724 9.718 15.031 10.25 C 15.338 10.782 15.5 11.386 15.5 12 C 15.5 12.614 15.338 13.218 15.031 13.75 C 14.724 14.282 14.282 14.724 13.75 15.031 C 13.218 15.338 12.614 15.5 12 15.5 C 11.072 15.5 10.181 15.131 9.525 14.475 C 8.869 13.819 8.5 12.928 8.5 12 C 8.5 11.072 8.869 10.181 9.525 9.525 C 10.181 8.869 11.072 8.5 12 8.5 M 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 C 11.982 12 11.982 12 11.982 12 M 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12 L 12 12 L 12 12 C 12 12 12 12 12 12 L 12 12"

app/apk/src/main/res/drawable/avd_superuser_from_filled.xml

@@ -18,7 +18,7 @@
         <aapt:attr name="android:animation">
             <objectAnimator
                 android:duration="300"
-                android:interpolator="@interpolator/fast_out_slow_in"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="pathData"
                 android:valueFrom="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 12 1 L 12 1 L 21 5 L 21 11 M 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 L 12 10.18 C 12 10.18 12 10.18 12 10.18"
                 android:valueTo="M 21 11 C 21 16.55 17.16 21.74 12 23 C 6.84 21.74 3 16.55 3 11 L 3 5 L 7.5 3 L 12 1 L 21 5 L 21 11 M 12 21 L 12 21 C 8.25 20 5 15.54 5 11.22 L 5 6.3 L 12 3.18 L 19 6.3 L 19 11.22 C 19 15.54 15.75 20 12 21"