diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index d647d6f7..d5e969d8 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -42,8 +42,14 @@ dependencies { implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.mediarouter:mediarouter:$mediarouterVersion" implementation "androidx.preference:preference:$preferenceVersion" + implementation "androidx.navigation:navigation-fragment:$navigationVersion" implementation "androidx.navigation:navigation-ui:$navigationVersion" + implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" + implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" + + implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" } android { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt b/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt old mode 100644 new mode 100755 diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt old mode 100644 new mode 100755 diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationFragment.kt old mode 100644 new mode 100755 index 5cece629..74c4eb9b --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationFragment.kt @@ -11,8 +11,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope -import com.google.android.gms.R -import com.google.android.gms.databinding.DeviceRegistrationFragmentBinding +import com.mgoogle.android.gms.R +import com.mgoogle.android.gms.databinding.DeviceRegistrationFragmentBinding import org.microg.gms.checkin.CheckinPrefs class DeviceRegistrationFragment : Fragment(R.layout.device_registration_fragment) { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationPreferencesFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationPreferencesFragment.kt old mode 100644 new mode 100755 index b1f53234..64a486ae --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationPreferencesFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/DeviceRegistrationPreferencesFragment.kt @@ -11,7 +11,7 @@ import android.text.format.DateUtils import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat -import com.google.android.gms.R +import com.mgoogle.android.gms.R import org.microg.gms.checkin.CheckinPrefs import org.microg.gms.checkin.LastCheckinInfo diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBarCallback.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PreferenceSwitchBarCallback.kt old mode 100644 new mode 100755 diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAllAppsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAllAppsFragment.kt old mode 100644 new mode 100755 index a55b007d..712ea417 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAllAppsFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAllAppsFragment.kt @@ -14,7 +14,7 @@ import androidx.navigation.fragment.findNavController import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat -import com.google.android.gms.R +import com.mgoogle.android.gms.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.microg.gms.gcm.GcmDatabase diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppFragment.kt old mode 100644 new mode 100755 index 5699ec07..818ed177 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppFragment.kt @@ -17,8 +17,8 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.fragment.app.Fragment import androidx.fragment.app.findFragment import androidx.lifecycle.lifecycleScope -import com.google.android.gms.R -import com.google.android.gms.databinding.PushNotificationAppFragmentBinding +import com.mgoogle.android.gms.R +import com.mgoogle.android.gms.databinding.PushNotificationAppFragmentBinding class PushNotificationAppFragment : Fragment(R.layout.push_notification_fragment) { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppPreferencesFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppPreferencesFragment.kt old mode 100644 new mode 100755 index b327349e..1c9ad6c0 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppPreferencesFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAppPreferencesFragment.kt @@ -13,7 +13,7 @@ import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import androidx.preference.TwoStatePreference -import com.google.android.gms.R +import com.mgoogle.android.gms.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.microg.gms.gcm.GcmDatabase diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt old mode 100644 new mode 100755 index 6345c62b..d89f7d58 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt @@ -9,8 +9,8 @@ import android.view.* import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController -import com.google.android.gms.R -import com.google.android.gms.databinding.PushNotificationFragmentBinding +import com.mgoogle.android.gms.R +import com.mgoogle.android.gms.databinding.PushNotificationFragmentBinding import org.microg.gms.checkin.CheckinPrefs import org.microg.gms.gcm.GcmPrefs diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationPreferencesFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationPreferencesFragment.kt old mode 100644 new mode 100755 index 9021ffb5..a28c28bf --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationPreferencesFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationPreferencesFragment.kt @@ -14,7 +14,7 @@ import androidx.navigation.fragment.findNavController import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat -import com.google.android.gms.R +import com.mgoogle.android.gms.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.microg.gms.gcm.GcmDatabase diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetFragment.kt deleted file mode 100644 index b611a1ac..00000000 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetFragment.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2020, microG Project Team - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.microg.gms.ui - -import android.os.Bundle -import android.view.* -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.findNavController -import com.google.android.gms.R -import com.google.android.gms.databinding.SafetyNetFragmentBinding -import org.microg.gms.checkin.CheckinPrefs -import org.microg.gms.snet.SafetyNetPrefs - -class SafetyNetFragment : Fragment(R.layout.safety_net_fragment) { - - private lateinit var binding: SafetyNetFragmentBinding - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - binding = SafetyNetFragmentBinding.inflate(inflater, container, false) - binding.switchBarCallback = object : PreferenceSwitchBarCallback { - override fun onChecked(newStatus: Boolean) { - SafetyNetPrefs.get(requireContext()).isEnabled = newStatus - binding.safetynetEnabled = newStatus - } - } - return binding.root - } - - override fun onResume() { - super.onResume() - binding.checkinEnabled = CheckinPrefs.get(requireContext()).isEnabled - binding.safetynetEnabled = SafetyNetPrefs.get(requireContext()).isEnabled - } - - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - setHasOptionsMenu(true) - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - menu.add(0, MENU_ADVANCED, 0, R.string.menu_advanced) - super.onCreateOptionsMenu(menu, inflater) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - MENU_ADVANCED -> { - findNavController().navigate(R.id.openSafetyNetAdvancedSettings) - true - } - else -> super.onOptionsItemSelected(item) - } - } - - companion object { - private const val MENU_ADVANCED = Menu.FIRST - } -} diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetPreferencesFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetPreferencesFragment.kt deleted file mode 100644 index 2a4b4ab2..00000000 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetPreferencesFragment.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2020, microG Project Team - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.microg.gms.ui - -import android.os.Bundle -import androidx.preference.PreferenceFragmentCompat -import com.google.android.gms.R - -class SafetyNetPreferencesFragment : PreferenceFragmentCompat() { - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - addPreferencesFromResource(R.xml.preferences_safetynet) - } -}