From 76ecf8ac2c87d987d2b48c41eb47386f548281fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=82=9C=E7=83=A8?= Date: Thu, 3 Sep 2020 13:59:07 +0800 Subject: [PATCH] =?UTF-8?q?module:skin-support-appcompat=20[feature]?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=94=AF=E6=8C=81androidx=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=8D=A2=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit module:skin-androidx-app demo [fix]first_fragment 控件均使用androidx控件 --- .../app/SkinAppCompatViewInflater.java | 22 ++++++++++++-- .../src/main/res-night/values/colors.xml | 2 ++ .../src/main/res/layout/fragment_first.xml | 29 ++++++++++--------- .../src/main/res/values/colors.xml | 2 ++ 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/androidx/skin-support-appcompat/src/main/java/skin/support/app/SkinAppCompatViewInflater.java b/androidx/skin-support-appcompat/src/main/java/skin/support/app/SkinAppCompatViewInflater.java index 5605d84e..60fcfebd 100644 --- a/androidx/skin-support-appcompat/src/main/java/skin/support/app/SkinAppCompatViewInflater.java +++ b/androidx/skin-support-appcompat/src/main/java/skin/support/app/SkinAppCompatViewInflater.java @@ -5,12 +5,14 @@ import android.content.res.TypedArray; import android.os.Build; +import androidx.appcompat.widget.AppCompatCheckedTextView; import androidx.core.view.ViewCompat; import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.widget.TintContextWrapper; import androidx.appcompat.widget.VectorEnabledTintResources; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.view.ViewParent; @@ -57,10 +59,11 @@ public View createView(Context context, String name, AttributeSet attrs) { } private View createViewFromFV(Context context, String name, AttributeSet attrs) { + View view = null; - if (name.contains(".")) { - return null; - } +// if (name.contains(".")) { +// return null; +// } switch (name) { case "View": view = new SkinCompatView(context, attrs); @@ -75,45 +78,58 @@ private View createViewFromFV(Context context, String name, AttributeSet attrs) view = new SkinCompatFrameLayout(context, attrs); break; case "TextView": + case "androidx.appcompat.widget.AppCompatTextView": view = new SkinCompatTextView(context, attrs); break; case "ImageView": + case "androidx.appcompat.widget.AppCompatImageView": view = new SkinCompatImageView(context, attrs); break; case "Button": + case "androidx.appcompat.widget.AppCompatButton": view = new SkinCompatButton(context, attrs); break; case "EditText": + case "androidx.appcompat.widget.AppCompatEditText": view = new SkinCompatEditText(context, attrs); break; case "Spinner": + case "androidx.appcompat.widget.AppCompatSpinner": view = new SkinCompatSpinner(context, attrs); break; case "ImageButton": + case "androidx.appcompat.widget.AppCompatImageButton": view = new SkinCompatImageButton(context, attrs); break; case "CheckBox": + case "androidx.appcompat.widget.AppCompatCheckBox": view = new SkinCompatCheckBox(context, attrs); break; case "RadioButton": + case "androidx.appcompat.widget.AppCompatRadioButton": view = new SkinCompatRadioButton(context, attrs); break; case "RadioGroup": view = new SkinCompatRadioGroup(context, attrs); break; case "CheckedTextView": + case "androidx.appcompat.widget.AppCompatCheckedTextView": view = new SkinCompatCheckedTextView(context, attrs); break; case "AutoCompleteTextView": + case "androidx.appcompat.widget.AppCompatAutoCompleteTextView": view = new SkinCompatAutoCompleteTextView(context, attrs); break; case "MultiAutoCompleteTextView": + case "androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView": view = new SkinCompatMultiAutoCompleteTextView(context, attrs); break; case "RatingBar": + case "androidx.appcompat.widget.AppCompatRatingBar": view = new SkinCompatRatingBar(context, attrs); break; case "SeekBar": + case "androidx.appcompat.widget.AppCompatSeekBar": view = new SkinCompatSeekBar(context, attrs); break; case "ProgressBar": diff --git a/demo/skin-androidx-app/src/main/res-night/values/colors.xml b/demo/skin-androidx-app/src/main/res-night/values/colors.xml index 16d6b047..dbace969 100644 --- a/demo/skin-androidx-app/src/main/res-night/values/colors.xml +++ b/demo/skin-androidx-app/src/main/res-night/values/colors.xml @@ -76,4 +76,6 @@ #dcd3a3 #ce2736 + + #0f0 diff --git a/demo/skin-androidx-app/src/main/res/layout/fragment_first.xml b/demo/skin-androidx-app/src/main/res/layout/fragment_first.xml index 4a03e925..cdb787a0 100644 --- a/demo/skin-androidx-app/src/main/res/layout/fragment_first.xml +++ b/demo/skin-androidx-app/src/main/res/layout/fragment_first.xml @@ -3,6 +3,7 @@ @@ -16,14 +17,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - -