diff --git a/app/build.gradle b/app/build.gradle index 14c81d5f2..377e2c62d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -130,7 +130,7 @@ dependencies { implementation 'androidx.work:work-runtime:2.2.0' implementation 'androidx.transition:transition:1.3.0-rc02' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0-rc01' // DO NOT UPDATE, 1.2.x has bunch of things broken in functionality against 1.1.x implementation 'com.google.android.material:material:1.1.0-beta02' } diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt index d08fb6c8b..2f2606cf7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt @@ -1,11 +1,11 @@ package com.topjohnwu.magisk.redesign -import android.graphics.Insets import android.os.Bundle import android.view.MenuItem import android.view.View import android.view.ViewTreeObserver import androidx.coordinatorlayout.widget.CoordinatorLayout +import androidx.core.graphics.Insets import androidx.core.view.setPadding import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment @@ -155,4 +155,4 @@ open class MainActivity : CompatActivity( binding.mainToolbar.invalidate() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt index 69b8b50cf..d5e97b299 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.redesign.compat -import android.graphics.Insets import android.view.View +import androidx.core.graphics.Insets import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt index 941fadcc6..cfcf4d9f2 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatView.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.redesign.compat -import android.graphics.Insets import android.view.View +import androidx.core.graphics.Insets internal interface CompatView { @@ -12,4 +12,4 @@ internal interface CompatView { fun peekSystemWindowInsets(insets: Insets) = Unit fun consumeSystemWindowInsets(insets: Insets): Insets? = null -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt index ecdd19044..7868e6014 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.redesign.compat -import android.graphics.Insets import androidx.annotation.CallSuper +import androidx.core.graphics.Insets import androidx.databinding.Observable import com.topjohnwu.magisk.base.viewmodel.BaseViewModel import com.topjohnwu.magisk.utils.KObservableField @@ -42,4 +42,4 @@ abstract class CompatViewModel( super.onCleared() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt index 57fa96a17..da5efff9d 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideFragment.kt @@ -1,12 +1,12 @@ package com.topjohnwu.magisk.redesign.hide import android.content.Context -import android.graphics.Insets import android.os.Bundle import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import androidx.core.graphics.Insets import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -83,4 +83,4 @@ class HideFragment : CompatFragment() { return super.onOptionsItemSelected(item) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt index fa897882b..ca2ed1fba 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt @@ -1,9 +1,9 @@ package com.topjohnwu.magisk.redesign.home -import android.graphics.Insets import android.view.Menu import android.view.MenuInflater import android.view.MenuItem +import androidx.core.graphics.Insets import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding import com.topjohnwu.magisk.model.navigation.Navigation @@ -32,4 +32,4 @@ class HomeFragment : CompatFragment() { else -> null }?.let { true } ?: super.onOptionsItemSelected(item) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallFragment.kt index feff14bf4..34fd1e0c2 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/install/InstallFragment.kt @@ -1,7 +1,7 @@ package com.topjohnwu.magisk.redesign.install import android.content.Intent -import android.graphics.Insets +import androidx.core.graphics.Insets import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding import com.topjohnwu.magisk.model.events.RequestFileEvent @@ -25,4 +25,4 @@ class InstallFragment : CompatFragment() { return super.onBackPressed() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt index 0905e9b8e..cee00a054 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleFragment.kt @@ -1,12 +1,12 @@ package com.topjohnwu.magisk.redesign.module import android.content.Intent -import android.graphics.Insets import android.os.Bundle import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import androidx.core.graphics.Insets import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager @@ -140,4 +140,4 @@ class ModuleFragment : CompatFragment listeners.add(listener) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsFragment.kt index 2fdcef756..0f4f66d25 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsFragment.kt @@ -1,8 +1,8 @@ package com.topjohnwu.magisk.redesign.settings -import android.graphics.Insets import android.os.Bundle import android.view.View +import androidx.core.graphics.Insets import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding import com.topjohnwu.magisk.redesign.compat.CompatFragment @@ -37,4 +37,4 @@ class SettingsFragment : CompatFragment null }?.let { true } ?: super.onOptionsItemSelected(item) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeFragment.kt index 26cb5e4e2..e5e92a7a1 100644 --- a/app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/redesign/theme/ThemeFragment.kt @@ -1,6 +1,6 @@ package com.topjohnwu.magisk.redesign.theme -import android.graphics.Insets +import androidx.core.graphics.Insets import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.FragmentThemeMd2Binding import com.topjohnwu.magisk.redesign.compat.CompatFragment @@ -19,4 +19,4 @@ class ThemeFragment : CompatFragment() activity.title = getString(R.string.section_theme) } -} \ No newline at end of file +}