From 9c612ea8bd9b69caac82343e42ba4d332f32f703 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Thu, 31 May 2018 11:07:21 +0800 Subject: [PATCH] fix(autojs): ui tablayout default to dark theme --- .../autojs/core/ui/inflater/DynamicLayoutInflater.java | 3 ++- .../core/ui/inflater/inflaters/TabLayoutInflater.java | 9 ++++++++- autojs/src/main/res/layout/js_tablayout.xml | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 autojs/src/main/res/layout/js_tablayout.xml diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java index faec11f8..47e2b6d9 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java @@ -38,6 +38,7 @@ import com.stardust.autojs.core.ui.inflater.inflaters.TimePickerInflater; import com.stardust.autojs.core.ui.inflater.inflaters.ToolbarInflater; import com.stardust.autojs.core.ui.inflater.inflaters.ViewGroupInflater; import com.stardust.autojs.core.ui.inflater.util.Res; +import com.stardust.autojs.core.ui.widget.JsTabLayout; import com.stardust.autojs.core.ui.widget.JsToolbar; import com.stardust.autojs.core.ui.xml.XmlConverter; @@ -128,7 +129,7 @@ public class DynamicLayoutInflater { registerViewAttrSetter(Spinner.class.getName(), new SpinnerInflater(mResourceParser)); registerViewAttrSetter(TimePicker.class.getName(), new TimePickerInflater(mResourceParser)); registerViewAttrSetter(AppBarLayout.class.getName(), new AppBarInflater<>(mResourceParser)); - registerViewAttrSetter(TabLayout.class.getName(), new TabLayoutInflater<>(mResourceParser)); + registerViewAttrSetter(JsTabLayout.class.getName(), new TabLayoutInflater<>(mResourceParser)); } public void registerViewAttrSetter(String fullName, ViewInflater inflater) { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java index b9b27950..164a8093 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java @@ -5,8 +5,10 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.support.annotation.Nullable; import android.support.design.widget.TabLayout; +import android.view.View; import android.view.ViewGroup; +import com.stardust.autojs.R; import com.stardust.autojs.core.ui.inflater.ResourceParser; import com.stardust.autojs.core.ui.inflater.ViewCreator; import com.stardust.autojs.core.ui.inflater.util.Colors; @@ -59,5 +61,10 @@ public class TabLayoutInflater extends BaseViewInflater return true; } - + @Nullable + @Override + @SuppressWarnings("unchecked") + public ViewCreator getCreator() { + return (ViewCreator) (context, attrs) -> (V) View.inflate(context, R.layout.js_tablayout, null); + } } diff --git a/autojs/src/main/res/layout/js_tablayout.xml b/autojs/src/main/res/layout/js_tablayout.xml new file mode 100644 index 00000000..7bdf5526 --- /dev/null +++ b/autojs/src/main/res/layout/js_tablayout.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file