From 9aa4b857f1e4a556c8e0eb4de6cc9116a031fd29 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 9 Jun 2020 20:37:27 +0200 Subject: [PATCH] Migrate to androidx --- microg-ui-tools/build.gradle | 13 ++++++------- .../tools/selfcheck/PermissionCheckGroup.java | 3 ++- .../org/microg/tools/selfcheck/SelfCheckGroup.java | 3 ++- .../org/microg/tools/ui/AbstractAboutFragment.java | 8 +++----- .../microg/tools/ui/AbstractDashboardActivity.java | 7 ++++--- .../microg/tools/ui/AbstractSelfCheckFragment.java | 5 +++-- .../microg/tools/ui/AbstractSettingsActivity.java | 9 +++++---- .../microg/tools/ui/AbstractSettingsFragment.java | 10 ++++------ .../main/java/org/microg/tools/ui/Condition.java | 9 +++++---- .../java/org/microg/tools/ui/DialogPreference.java | 13 +++++++------ .../org/microg/tools/ui/DimmableIconPreference.java | 5 +++-- .../org/microg/tools/ui/LongTextPreference.java | 5 +++-- .../org/microg/tools/ui/RadioButtonPreference.java | 5 +++-- .../microg/tools/ui/ResourceSettingsFragment.java | 5 +++-- .../main/java/org/microg/tools/ui/SwitchBar.java | 5 +++-- .../tools/ui/SwitchBarResourceSettingsFragment.java | 3 ++- .../org/microg/tools/ui/TintIconPreference.java | 5 +++-- .../main/java/org/microg/tools/ui/ToggleSwitch.java | 3 ++- .../src/main/res/layout-v21/preference_material.xml | 2 +- .../src/main/res/layout/condition_card.xml | 4 ++-- microg-ui-tools/src/main/res/layout/toolbar.xml | 2 +- microg-ui-tools/src/main/res/values/themes.xml | 2 +- 22 files changed, 68 insertions(+), 58 deletions(-) diff --git a/microg-ui-tools/build.gradle b/microg-ui-tools/build.gradle index 19543d21..1fb652d4 100644 --- a/microg-ui-tools/build.gradle +++ b/microg-ui-tools/build.gradle @@ -26,13 +26,13 @@ String getMyVersionName() { } android { - compileSdkVersion androidCompileSdk() + compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" defaultConfig { - versionName getMyVersionName() - minSdkVersion androidMinSdk() - targetSdkVersion androidTargetSdk() + versionName version + minSdkVersion androidMinSdk + targetSdkVersion androidTargetSdk } compileOptions { @@ -47,8 +47,7 @@ android { } dependencies { - implementation "com.android.support:support-v4:$supportLibraryVersion" - implementation "com.android.support:appcompat-v7:$supportLibraryVersion" - implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0" + implementation "androidx.appcompat:appcompat:$appcompatVersion" + implementation "androidx.preference:preference:$preferenceVersion" } diff --git a/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/PermissionCheckGroup.java b/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/PermissionCheckGroup.java index 769d0948..22543802 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/PermissionCheckGroup.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/PermissionCheckGroup.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; -import android.support.v4.app.Fragment; import android.util.Log; +import androidx.fragment.app.Fragment; + import org.microg.tools.ui.R; import static android.os.Build.VERSION_CODES.M; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/SelfCheckGroup.java b/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/SelfCheckGroup.java index b9157a63..13828574 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/SelfCheckGroup.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/selfcheck/SelfCheckGroup.java @@ -17,7 +17,8 @@ package org.microg.tools.selfcheck; import android.content.Context; -import android.support.v4.app.Fragment; + +import androidx.fragment.app.Fragment; public interface SelfCheckGroup { String getGroupName(Context context); diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java index 5b42019f..b23a57e4 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java @@ -20,8 +20,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +29,9 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -103,9 +104,6 @@ public abstract class AbstractAboutFragment extends Fragment { List libraries = new ArrayList(); libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license))); - libraries.add(new Library("android.support.v4", getString(R.string.about_android_support_v4), getString(R.string.about_android_support_license))); - libraries.add(new Library("android.support.v7.appcompat", getString(R.string.about_android_support_v7_appcompat), getString(R.string.about_android_support_license))); - libraries.add(new Library("android.support.v7.preference#hide_version", getString(R.string.about_android_support_v7_preference), getString(R.string.about_android_support_license))); collectLibraries(libraries); Collections.sort(libraries); ((ListView) aboutRoot.findViewById(android.R.id.list)).setAdapter(new LibraryAdapter(getContext(), libraries.toArray(new Library[libraries.size()]))); diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractDashboardActivity.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractDashboardActivity.java index ee4e0e60..0bd9671c 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractDashboardActivity.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractDashboardActivity.java @@ -1,11 +1,12 @@ package org.microg.tools.ui; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.ViewGroup; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; + import java.util.ArrayList; import java.util.List; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java index 538704b2..ab05ab8f 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java @@ -17,8 +17,6 @@ package org.microg.tools.ui; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -27,6 +25,9 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import org.microg.tools.selfcheck.SelfCheckGroup; import java.util.ArrayList; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java index 9f81470e..b2a366f2 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java @@ -1,13 +1,14 @@ package org.microg.tools.ui; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.ViewGroup; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; + public abstract class AbstractSettingsActivity extends AppCompatActivity { protected boolean showHomeAsUp = false; protected int preferencesResource = 0; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsFragment.java index 75bc6d4a..0f1967a5 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsFragment.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsFragment.java @@ -16,16 +16,14 @@ package org.microg.tools.ui; -import android.support.v4.app.DialogFragment; -import android.support.v7.preference.Preference; - -import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat; +import androidx.fragment.app.DialogFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; public abstract class AbstractSettingsFragment extends PreferenceFragmentCompat { private static final String TAG = AbstractSettingsFragment.class.getSimpleName(); - private static final String DIALOG_FRAGMENT_TAG = - "android.support.v7.preference.PreferenceFragment.DIALOG"; + private static final String DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG"; @Override public void onDisplayPreferenceDialog(Preference preference) { diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/Condition.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/Condition.java index db8cf447..7ea35cd8 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/Condition.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/Condition.java @@ -18,10 +18,6 @@ package org.microg.tools.ui; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.PluralsRes; -import android.support.annotation.StringRes; -import android.support.v4.content.res.ResourcesCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -29,6 +25,11 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.DrawableRes; +import androidx.annotation.PluralsRes; +import androidx.annotation.StringRes; +import androidx.core.content.res.ResourcesCompat; + public class Condition { @DrawableRes private final int iconRes; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/DialogPreference.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/DialogPreference.java index ee45feea..af07a691 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/DialogPreference.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/DialogPreference.java @@ -19,17 +19,18 @@ package org.microg.tools.ui; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -public class DialogPreference extends android.support.v7.preference.DialogPreference implements PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback { +import androidx.fragment.app.DialogFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceViewHolder; + +public class DialogPreference extends androidx.preference.DialogPreference implements PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback { private static final String DIALOG_FRAGMENT_TAG = "android.support.v7.preference.PreferenceFragment.DIALOG"; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/DimmableIconPreference.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/DimmableIconPreference.java index c86f7813..791cbd02 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/DimmableIconPreference.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/DimmableIconPreference.java @@ -18,14 +18,15 @@ package org.microg.tools.ui; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A preference item that can dim the icon when it's disabled, either directly or because its parent * is disabled. diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/LongTextPreference.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/LongTextPreference.java index 99f57503..4c6edb8b 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/LongTextPreference.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/LongTextPreference.java @@ -17,11 +17,12 @@ package org.microg.tools.ui; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class LongTextPreference extends Preference { public LongTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java index 31eb84ba..e45d3812 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java @@ -18,10 +18,11 @@ package org.microg.tools.ui; import android.annotation.SuppressLint; import android.content.Context; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.CheckBoxPreference; import android.util.AttributeSet; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.CheckBoxPreference; + public class RadioButtonPreference extends CheckBoxPreference { public RadioButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) { diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/ResourceSettingsFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/ResourceSettingsFragment.java index afc05f1c..78abc781 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/ResourceSettingsFragment.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/ResourceSettingsFragment.java @@ -17,7 +17,8 @@ package org.microg.tools.ui; import android.os.Bundle; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; public class ResourceSettingsFragment extends AbstractSettingsFragment { @@ -26,7 +27,7 @@ public class ResourceSettingsFragment extends AbstractSettingsFragment { protected int preferencesResource; @Override - public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { Bundle b = getArguments(); if (b != null) { preferencesResource = b.getInt(EXTRA_PREFERENCE_RESOURCE, preferencesResource); diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java index 5a0b5a3d..ab282dd5 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java @@ -21,7 +21,6 @@ import android.content.Context; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.v7.widget.SwitchCompat; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.style.TextAppearanceSpan; @@ -32,6 +31,8 @@ import android.widget.CompoundButton; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.widget.SwitchCompat; + import java.util.ArrayList; import static android.os.Build.VERSION.SDK_INT; @@ -73,7 +74,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); } mLabel = getResources().getString(R.string.abc_capital_off); - mSummarySpan = new TextAppearanceSpan(context, android.support.v7.appcompat.R.style.TextAppearance_AppCompat_Widget_Switch); + mSummarySpan = new TextAppearanceSpan(context, androidx.appcompat.R.style.TextAppearance_AppCompat_Widget_Switch); updateText(); mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget); diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBarResourceSettingsFragment.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBarResourceSettingsFragment.java index e7eea341..950ac8b2 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBarResourceSettingsFragment.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBarResourceSettingsFragment.java @@ -17,7 +17,8 @@ package org.microg.tools.ui; import android.os.Bundle; -import android.support.v7.widget.SwitchCompat; + +import androidx.appcompat.widget.SwitchCompat; public abstract class SwitchBarResourceSettingsFragment extends ResourceSettingsFragment implements SwitchBar.OnSwitchChangeListener { protected SwitchBar switchBar; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/TintIconPreference.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/TintIconPreference.java index ae81350a..05486b9c 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/TintIconPreference.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/TintIconPreference.java @@ -2,11 +2,12 @@ package org.microg.tools.ui; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.TypedValue; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.preference.PreferenceViewHolder; + import static android.os.Build.VERSION.SDK_INT; import static android.os.Build.VERSION_CODES.LOLLIPOP; diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/ToggleSwitch.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/ToggleSwitch.java index 0e487fc9..96247305 100644 --- a/microg-ui-tools/src/main/java/org/microg/tools/ui/ToggleSwitch.java +++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/ToggleSwitch.java @@ -19,9 +19,10 @@ package org.microg.tools.ui; import android.annotation.SuppressLint; import android.content.Context; -import android.support.v7.widget.SwitchCompat; import android.util.AttributeSet; +import androidx.appcompat.widget.SwitchCompat; + @SuppressLint("NewApi") public class ToggleSwitch extends SwitchCompat { diff --git a/microg-ui-tools/src/main/res/layout-v21/preference_material.xml b/microg-ui-tools/src/main/res/layout-v21/preference_material.xml index 78261f37..3f7906ae 100644 --- a/microg-ui-tools/src/main/res/layout-v21/preference_material.xml +++ b/microg-ui-tools/src/main/res/layout-v21/preference_material.xml @@ -40,7 +40,7 @@ android:paddingEnd="12dp" android:paddingTop="4dp"> - - - + diff --git a/microg-ui-tools/src/main/res/layout/toolbar.xml b/microg-ui-tools/src/main/res/layout/toolbar.xml index 36dcb82f..768f2c35 100644 --- a/microg-ui-tools/src/main/res/layout/toolbar.xml +++ b/microg-ui-tools/src/main/res/layout/toolbar.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> - -