blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Remove conflicting appcompat dependency

master
Emily Kager 2019-04-03 13:39:22 -07:00 committed by Emily Kager
parent a737568936
commit c0a1d36b50
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -253,7 +253,6 @@ dependencies {
implementation Deps.rxKotlin
implementation Deps.anko_commons
implementation Deps.anko_sdk
implementation Deps.anko_appcompat
implementation Deps.anko_constraintlayout
implementation Deps.sentry

5
app/src/main/java/org/mozilla/fenix/settings/SitePermissionsFragment.kt
View File

@ -5,12 +5,12 @@
package org.mozilla.fenix.settings
import android.os.Bundle
import android.preference.PreferenceManager
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.Navigation
import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceClickListener
import androidx.preference.PreferenceFragmentCompat
import org.jetbrains.anko.support.v4.defaultSharedPreferences
import org.mozilla.fenix.R
import org.mozilla.fenix.settings.SitePermissionsManagePhoneFeature.PhoneFeature
import org.mozilla.fenix.settings.SitePermissionsManagePhoneFeature.PhoneFeature.NOTIFICATION
@ -79,7 +79,8 @@ class SitePermissionsFragment : PreferenceFragmentCompat() {
categoryPhoneFeatures = requireNotNull(findPreference(keyCategoryPhoneFeatures))
val isCategoryActivate = defaultSharedPreferences.getBoolean(radioCustomSettings.key, false)
val isCategoryActivate = PreferenceManager.getDefaultSharedPreferences(requireContext())
.getBoolean(radioCustomSettings.key, false)
if (isCategoryActivate) {
categoryPhoneFeatures.isVisible = true
}

1
buildSrc/src/main/java/Dependencies.kt
View File

@ -54,7 +54,6 @@ object Deps {
const val anko_commons = "org.jetbrains.anko:anko-commons:${Versions.anko}"
const val anko_sdk = "org.jetbrains.anko:anko-sdk25:${Versions.anko}"
const val anko_appcompat = "org.jetbrains.anko:anko-appcompat-v7:${Versions.anko}"
const val anko_constraintlayout = "org.jetbrains.anko:anko-constraint-layout:${Versions.anko}"
const val mozilla_concept_engine = "org.mozilla.components:concept-engine:${Versions.mozilla_android_components}"