etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate to androidx

This commit is contained in:
Marvin W 2020-06-09 20:37:27 +02:00
parent 0dedff9746
commit 9aa4b857f1
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
22 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
microg-ui-tools/build.gradle
View File

@ -26,13 +26,13 @@ String getMyVersionName() {
} }
android { android {
compileSdkVersion androidCompileSdk() compileSdkVersion androidCompileSdk
buildToolsVersion "$androidBuildVersionTools" buildToolsVersion "$androidBuildVersionTools"
defaultConfig { defaultConfig {
versionName getMyVersionName() versionName version
minSdkVersion androidMinSdk() minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk() targetSdkVersion androidTargetSdk
} }
compileOptions { compileOptions {
@ -47,8 +47,7 @@ android {
} }
dependencies { dependencies {
implementation "com.android.support:support-v4:$supportLibraryVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion"
implementation "com.android.support:appcompat-v7:$supportLibraryVersion" implementation "androidx.preference:preference:$preferenceVersion"
implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
} }

3
microg-ui-tools/src/main/java/org/microg/tools/selfcheck/PermissionCheckGroup.java
View File

@ -21,9 +21,10 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
import android.support.v4.app.Fragment;
import android.util.Log; import android.util.Log;
import androidx.fragment.app.Fragment;
import org.microg.tools.ui.R; import org.microg.tools.ui.R;
import static android.os.Build.VERSION_CODES.M; import static android.os.Build.VERSION_CODES.M;

3
microg-ui-tools/src/main/java/org/microg/tools/selfcheck/SelfCheckGroup.java
View File

@ -17,7 +17,8 @@
package org.microg.tools.selfcheck; package org.microg.tools.selfcheck;
import android.content.Context; import android.content.Context;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
public interface SelfCheckGroup { public interface SelfCheckGroup {
String getGroupName(Context context); String getGroupName(Context context);

8
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java
View File

@ -20,8 +20,6 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -31,6 +29,9 @@ import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -103,9 +104,6 @@ public abstract class AbstractAboutFragment extends Fragment {
List<Library> libraries = new ArrayList<Library>(); List<Library> libraries = new ArrayList<Library>();
libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license))); 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); collectLibraries(libraries);
Collections.sort(libraries); Collections.sort(libraries);
((ListView) aboutRoot.findViewById(android.R.id.list)).setAdapter(new LibraryAdapter(getContext(), libraries.toArray(new Library[libraries.size()]))); ((ListView) aboutRoot.findViewById(android.R.id.list)).setAdapter(new LibraryAdapter(getContext(), libraries.toArray(new Library[libraries.size()])));

7
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractDashboardActivity.java
View File

@ -1,11 +1,12 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.os.Bundle; 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 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.ArrayList;
import java.util.List; import java.util.List;

5
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java
View File

@ -17,8 +17,6 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -27,6 +25,9 @@ import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import org.microg.tools.selfcheck.SelfCheckGroup; import org.microg.tools.selfcheck.SelfCheckGroup;
import java.util.ArrayList; import java.util.ArrayList;

9
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java
View File

@ -1,13 +1,14 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.os.Bundle; 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.MenuItem;
import android.view.ViewGroup; 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 { public abstract class AbstractSettingsActivity extends AppCompatActivity {
protected boolean showHomeAsUp = false; protected boolean showHomeAsUp = false;
protected int preferencesResource = 0; protected int preferencesResource = 0;

10
microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsFragment.java
View File

@ -16,16 +16,14 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v7.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
public abstract class AbstractSettingsFragment extends PreferenceFragmentCompat { public abstract class AbstractSettingsFragment extends PreferenceFragmentCompat {
private static final String TAG = AbstractSettingsFragment.class.getSimpleName(); private static final String TAG = AbstractSettingsFragment.class.getSimpleName();
private static final String DIALOG_FRAGMENT_TAG = private static final String DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG";
"android.support.v7.preference.PreferenceFragment.DIALOG";
@Override @Override
public void onDisplayPreferenceDialog(Preference preference) { public void onDisplayPreferenceDialog(Preference preference) {

9
microg-ui-tools/src/main/java/org/microg/tools/ui/Condition.java
View File

@ -18,10 +18,6 @@ package org.microg.tools.ui;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; 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.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -29,6 +25,11 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; 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 { public class Condition {
@DrawableRes @DrawableRes
private final int iconRes; private final int iconRes;

13
microg-ui-tools/src/main/java/org/microg/tools/ui/DialogPreference.java
View File

@ -19,17 +19,18 @@ package org.microg.tools.ui;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; 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.util.AttributeSet;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; 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 = private static final String DIALOG_FRAGMENT_TAG =
"android.support.v7.preference.PreferenceFragment.DIALOG"; "android.support.v7.preference.PreferenceFragment.DIALOG";

5
microg-ui-tools/src/main/java/org/microg/tools/ui/DimmableIconPreference.java
View File

@ -18,14 +18,15 @@ package org.microg.tools.ui;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; 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 * A preference item that can dim the icon when it's disabled, either directly or because its parent
* is disabled. * is disabled.

5
microg-ui-tools/src/main/java/org/microg/tools/ui/LongTextPreference.java
View File

@ -17,11 +17,12 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.TextView; import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
public class LongTextPreference extends Preference { public class LongTextPreference extends Preference {
public LongTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { public LongTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

5
microg-ui-tools/src/main/java/org/microg/tools/ui/RadioButtonPreference.java
View File

@ -18,10 +18,11 @@ package org.microg.tools.ui;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.CheckBoxPreference;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.CheckBoxPreference;
public class RadioButtonPreference extends CheckBoxPreference { public class RadioButtonPreference extends CheckBoxPreference {
public RadioButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) { public RadioButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {

5
microg-ui-tools/src/main/java/org/microg/tools/ui/ResourceSettingsFragment.java
View File

@ -17,7 +17,8 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class ResourceSettingsFragment extends AbstractSettingsFragment { public class ResourceSettingsFragment extends AbstractSettingsFragment {
@ -26,7 +27,7 @@ public class ResourceSettingsFragment extends AbstractSettingsFragment {
protected int preferencesResource; protected int preferencesResource;
@Override @Override
public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) { public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
Bundle b = getArguments(); Bundle b = getArguments();
if (b != null) { if (b != null) {
preferencesResource = b.getInt(EXTRA_PREFERENCE_RESOURCE, preferencesResource); preferencesResource = b.getInt(EXTRA_PREFERENCE_RESOURCE, preferencesResource);

5
microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
View File

@ -21,7 +21,6 @@ import android.content.Context;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.v7.widget.SwitchCompat;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.TextAppearanceSpan; import android.text.style.TextAppearanceSpan;
@ -32,6 +31,8 @@ import android.widget.CompoundButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.appcompat.widget.SwitchCompat;
import java.util.ArrayList; import java.util.ArrayList;
import static android.os.Build.VERSION.SDK_INT; 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); mTextView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
} }
mLabel = getResources().getString(R.string.abc_capital_off); 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(); updateText();
mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget); mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget);

3
microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBarResourceSettingsFragment.java
View File

@ -17,7 +17,8 @@
package org.microg.tools.ui; package org.microg.tools.ui;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.SwitchCompat;
import androidx.appcompat.widget.SwitchCompat;
public abstract class SwitchBarResourceSettingsFragment extends ResourceSettingsFragment implements SwitchBar.OnSwitchChangeListener { public abstract class SwitchBarResourceSettingsFragment extends ResourceSettingsFragment implements SwitchBar.OnSwitchChangeListener {
protected SwitchBar switchBar; protected SwitchBar switchBar;

5
microg-ui-tools/src/main/java/org/microg/tools/ui/TintIconPreference.java
View File

@ -2,11 +2,12 @@ package org.microg.tools.ui;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; 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.AttributeSet;
import android.util.TypedValue; 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.SDK_INT;
import static android.os.Build.VERSION_CODES.LOLLIPOP; import static android.os.Build.VERSION_CODES.LOLLIPOP;

3
microg-ui-tools/src/main/java/org/microg/tools/ui/ToggleSwitch.java
View File

@ -19,9 +19,10 @@ package org.microg.tools.ui;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.support.v7.widget.SwitchCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.appcompat.widget.SwitchCompat;
@SuppressLint("NewApi") @SuppressLint("NewApi")
public class ToggleSwitch extends SwitchCompat { public class ToggleSwitch extends SwitchCompat {

2
microg-ui-tools/src/main/res/layout-v21/preference_material.xml
View File

@ -40,7 +40,7 @@
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingTop="4dp"> android:paddingTop="4dp">
<android.support.v7.internal.widget.PreferenceImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
microg-ui-tools/src/main/res/layout/condition_card.xml
View File

@ -100,7 +100,7 @@
android:layout_height="0.25dp" android:layout_height="0.25dp"
android:background="@android:color/white"/> android:background="@android:color/white"/>
<android.support.v7.widget.ButtonBarLayout <androidx.appcompat.widget.ButtonBarLayout
android:id="@+id/buttonBar" android:id="@+id/buttonBar"
style="?attr/buttonBarStyle" style="?attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -130,7 +130,7 @@
android:visibility="gone" android:visibility="gone"
android:textColor="?android:attr/textColorPrimaryInverse"/> android:textColor="?android:attr/textColorPrimaryInverse"/>
</android.support.v7.widget.ButtonBarLayout> </androidx.appcompat.widget.ButtonBarLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

2
microg-ui-tools/src/main/res/layout/toolbar.xml
View File

@ -14,7 +14,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

2
microg-ui-tools/src/main/res/values/themes.xml
View File

@ -16,7 +16,7 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.AppCompat.Settings" parent="@style/PreferenceFixTheme.Light.NoActionBar"> <style name="Theme.AppCompat.Settings" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/settings_theme_primary</item> <item name="colorPrimary">@color/settings_theme_primary</item>
<item name="colorPrimaryDark">@color/settings_theme_primary_dark</item> <item name="colorPrimaryDark">@color/settings_theme_primary_dark</item>
<item name="colorAccent">@color/settings_theme_accent</item> <item name="colorAccent">@color/settings_theme_accent</item>