Viktor De Pasquale
6ccbc272c6
Merge remote-tracking branch 'john/master' into feature/redesign
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
# app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt
# app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
# app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
# app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
# app/src/main/res/layout/dialog_magisk_base.xml