app: OneUI 4 DetailedColorPicker, GoToTop, Preference text size (#62)

* app: OneUI 4 DetailedColorPicker, GoToTop, Preference text size

Signed-off-by: BlackMesa123 <[email protected]>

* app: fix SwipeRefreshLayout scale down anim, night mode DetailedColorPicker tabs

Signed-off-by: BlackMesa123 <[email protected]>

* app: OneUI 4 fast scroller

Signed-off-by: BlackMesa123 <[email protected]>

* app/SwipeRefreshLayout: fix crashes

Signed-off-by: BlackMesa123 <[email protected]>

* app/oneuiexample: there's a SwipeRefreshLayout test in case you didn't notice

Signed-off-by: BlackMesa123 <[email protected]>

Author: salvogiangri

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/NothingTab.java

@@ -40,13 +40,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         super.onViewCreated(view, savedInstanceState);
 
         SwipeRefreshLayout swipeRefreshLayout = mRootView.findViewById(R.id.swipe_refresh);
+        swipeRefreshLayout.seslSetRefreshOnce(true);
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                Toast.makeText(mContext, "Refresh", Toast.LENGTH_SHORT).show();
-                new Handler().postDelayed(() -> {
-                    swipeRefreshLayout.setRefreshing(false);
-                }, 700);
+                Toast.makeText(mContext, "onRefresh called", Toast.LENGTH_SHORT).show();
             }
         });
 

app/src/main/res/layout/fragment_nothing_tab.xml

@@ -26,8 +26,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/nothing"
-                android:textAlignment="viewStart"
-                android:textSize="18sp" />
+                android:textAlignment="viewStart" />
+
+            <com.google.android.material.textview.MaterialTextView
+                style="?android:textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/nothing_summary" />
 
         </LinearLayout>
 

app/src/main/res/layout/fragment_views_tab.xml

@@ -18,7 +18,7 @@
             android:layout_height="wrap_content" />
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/ListSeparatorStyle"
+            style="@style/OneUI4.ListSeparatorStyle"
             android:text="ProgressBar" />
 
 
@@ -77,7 +77,7 @@
         </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/ListSeparatorStyle"
+            style="@style/OneUI4.ListSeparatorStyle"
             android:text="SeekBar" />
 
         <com.google.android.material.card.MaterialCardView
@@ -117,7 +117,7 @@
 
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/ListSeparatorStyle"
+            style="@style/OneUI4.ListSeparatorStyle"
             android:text="Buttons" />
 
 
@@ -234,7 +234,7 @@
 
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/ListSeparatorStyle"
+            style="@style/OneUI4.ListSeparatorStyle"
             android:text="Others" />
 
 
@@ -266,7 +266,10 @@
                 <EditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="EditText" />
+                    android:layout_marginTop="14dp"
+                    android:hint="EditText"
+                    android:maxLines="1"
+                    android:inputType="text"/>
 
                 <androidx.appcompat.widget.SeslSpinner
                     android:id="@+id/spinner"
@@ -281,7 +284,7 @@
 
 
         <com.google.android.material.textview.MaterialTextView
-            style="@style/ListSeparatorStyle"
+            style="@style/OneUI4.ListSeparatorStyle"
             android:text="Color Pickers" />
 
 

app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name" translatable="false">OneUI Sample</string>
     <string name="nothing"><![CDATA[>Nothing<]]></string>
+    <string name="nothing_summary">Swipe down and see the magic :D</string>
 </resources>

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/dialog/DetailedColorPickerDialog.java

@@ -31,6 +31,7 @@
 
 @TargetApi(17)
 public class DetailedColorPickerDialog extends Dialog {
+    private boolean mIsOneUI4;
     public static final int VIEW_MODE_GRADIENT = 1;
     public static final int VIEW_MODE_SWATCH = 2;
     private static final int TYPE_CUSTOMIZE = 0;
@@ -97,7 +98,8 @@ public void onClick(View view) {
     };
 
     public DetailedColorPickerDialog(Context context, int mode, float[] fArr) {
-        super(context, R.style.ColorPickerPopupDialog);
+        super(context,
+                context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false) ? R.style.OneUI4_ColorPickerPopupDialog : R.style.ColorPickerPopupDialog);
         SpenSettingUtil.initDialogWindow(this, 5376, -1);
         getWindow().setFlags(256, 256);
         getWindow().setSoftInputMode(33);
@@ -106,14 +108,16 @@ public DetailedColorPickerDialog(Context context, int mode, float[] fArr) {
     }
 
     public DetailedColorPickerDialog(Context context, float[] fArr) {
-        super(context, R.style.ColorPickerPopupDialog);
+        super(context,
+                context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false) ? R.style.OneUI4_ColorPickerPopupDialog : R.style.ColorPickerPopupDialog);
         SpenSettingUtil.initDialogWindow(this, 4096, -1);
         this.mIsSupportRGBCode = false;
         construct(context, 2, fArr);
     }
 
     private void construct(Context context, int i, float[] fArr) {
         this.mContext = context;
+        mIsOneUI4 = context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false);
         this.mColorTheme = new SpenColorPickerTheme(context, fArr);
         this.mPickerControl = new SpenColorPickerControl(i, fArr);
     }
@@ -353,7 +357,7 @@ private void setListener() {
     private void initView() {
         SpenColorPickerViewInfo spenColorPickerViewInfo = new SpenColorPickerViewInfo();
 
-        spenColorPickerViewInfo.layoutId = R.layout.setting_color_picker_view_oneui30;
+        spenColorPickerViewInfo.layoutId = mIsOneUI4 ? R.layout.setting_color_picker_view_oneui40 : R.layout.setting_color_picker_view_oneui30;
         spenColorPickerViewInfo.modeType = 1;
         spenColorPickerViewInfo.itemLayoutId = R.layout.setting_color_swatch_item;
         spenColorPickerViewInfo.gradientCursorSizeDimen = R.dimen.color_picker_popup_content_point_size;
@@ -372,7 +376,7 @@ private void initView() {
 
         LayoutInflater mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         Resources mSdkResources = mContext.getResources();
-        this.mParentLayout = (RelativeLayout) mInflater.inflate(mSdkResources.getLayout(R.layout.setting_color_picker_layout), null);
+        this.mParentLayout = (RelativeLayout) mInflater.inflate(mSdkResources.getLayout(mIsOneUI4 ? R.layout.setting_color_picker_oui4_layout : R.layout.setting_color_picker_layout), null);
 
         FrameLayout frameLayout = this.mParentLayout.findViewById(R.id.popup_content_view);
         float[] fArr = new float[3];

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/SwipeRefreshLayout.java

@@ -373,7 +373,9 @@ public void setRefreshing(boolean refreshing) {
 
     private void startScaleUpAnimation(AnimationListener listener) {
         mCircleView.setVisibility(View.VISIBLE);
-        mOUI4Progress.setAlpha(MAX_ALPHA);
+        if (mIsOneUI4) {
+            mOUI4Progress.setAlpha(MAX_ALPHA);
+        }
         mScaleAnimation = new Animation() {
             @Override
             public void applyTransformation(float interpolatedTime, Transformation t) {
@@ -441,7 +443,7 @@ public void applyTransformation(float interpolatedTime, Transformation t) {
                     }
                 }
             };
-            mScaleDownAnimation.setDuration(SCALE_DOWN_DURATION);
+            mScaleDownAnimation.setDuration(END_SCALE_DOWN_DURATION);
             mScaleDownAnimation.setInterpolator(SINE_OUT_60);
         } else {
             mScaleDownAnimation = new Animation() {
@@ -450,7 +452,7 @@ public void applyTransformation(float interpolatedTime, Transformation t) {
                     setAnimationProgress((mStartingScale + ((-mStartingScale) * interpolatedTime)));
                 }
             };
-            mScaleDownAnimation.setDuration(SCALE_DOWN_DURATION);
+            mScaleDownAnimation.setDuration(END_SCALE_DOWN_DURATION);
             mScaleDownAnimation.setInterpolator(SINE_IN_80);
         }
         mCircleView.setAnimationListener(listener);

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/menu/PopupMenu.java

@@ -14,6 +14,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.MenuRes;
+import androidx.core.content.res.ResourcesCompat;
 
 import java.util.ArrayList;
 
@@ -161,7 +162,7 @@ private TextView createTitleView() {
                 context.getResources().getDimensionPixelSize(R.dimen.sesl_menu_popup_bottom_padding));
         titleView.setTextDirection(View.TEXT_DIRECTION_LOCALE);
         titleView.setTextColor(context.getResources().getColor(R.color.item_color));
-        titleView.setTypeface(Typeface.DEFAULT_BOLD);
+        titleView.setTypeface(ResourcesCompat.getFont(context, R.font.sesl_roboto), Typeface.BOLD);
         titleView.setEllipsize(TextUtils.TruncateAt.END);
         titleView.setMaxLines(1);
         titleView.setTextSize(16);

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/recyclerview/SeslRecyclerViewFastScroller.java

@@ -33,6 +33,7 @@
 import de.dlyt.yanndroid.oneui.view.RecyclerView;
 
 public class SeslRecyclerViewFastScroller {
+    private boolean mIsOneUI4;
     public static final int EFFECT_STATE_CLOSE = 0;
     public static final int EFFECT_STATE_OPEN = 1;
     private static final int DURATION_CROSS_FADE = 0;
@@ -104,6 +105,7 @@ public Integer get(View object) {
     private float mAdditionalTouchArea = 0.0f;
     private boolean mAlwaysShow;
     private int mColorPrimary = -1;
+    private int mThumbBackgroundColor = -1;
     private Context mContext;
     private int mCurrentSection = -1;
     private AnimatorSet mDecorAnimation;
@@ -169,6 +171,7 @@ public SeslRecyclerViewFastScroller(RecyclerView recyclerView, int styleResId) {
         mOldItemCount = recyclerView.getAdapter().getItemCount();
         mOldChildCount = recyclerView.getChildCount();
         mContext = recyclerView.getContext();
+        mIsOneUI4 = mContext.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false);
         mScaledTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();
         mScrollBarStyle = recyclerView.getScrollBarStyle();
         mScrollCompleted = true;
@@ -261,13 +264,15 @@ private void updateAppearance() {
         mContext.getTheme().resolveAttribute(R.attr.colorPrimary, outValue, true);
         mColorPrimary = outValue.data;
 
+        mThumbBackgroundColor = mContext.getResources().getColor(R.color.sesl_fast_scrollbar_bg_color);
+
         mTrackImage.setImageDrawable(mTrackDrawable);
         if (mTrackDrawable != null) {
             width = Math.max(0, mTrackDrawable.getIntrinsicWidth());
         }
 
         if (mThumbDrawable != null) {
-            mThumbDrawable.setTint(mColorPrimary);
+            mThumbDrawable.setTint(mIsOneUI4 ? mThumbBackgroundColor : mColorPrimary);
         }
         mThumbImage.setImageDrawable(mThumbDrawable);
         mThumbImage.setMinimumWidth(mThumbMinWidth);

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/OptionButton.java

@@ -14,6 +14,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.util.SeslMisc;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 
 import com.google.android.material.textview.MaterialTextView;
 
@@ -102,7 +103,7 @@ public void setIcon(Drawable icon) {
     public void setButtonSelected(Boolean selected) {
         this.mSelected = selected;
         setTextColor(mSelected);
-        textView.setTypeface(null, mSelected ? Typeface.BOLD : Typeface.NORMAL);
+        textView.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sesl_roboto), mSelected ? Typeface.BOLD : Typeface.NORMAL);
     }
 
     public void toggleButtonSelected() {

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/RecyclerView.java

@@ -279,7 +279,7 @@ public float getInterpolation(float var1) {
     private boolean mFastScrollerEnabled;
     private RecyclerView.SeslFastScrollerEventListener mFastScrollerEventListener;
     private int mGoToTopBottomPadding;
-    private int mGoToTopElevation;
+    private float mGoToTopElevation;
     private ValueAnimator mGoToTopFadeInAnimator;
     private ValueAnimator mGoToTopFadeOutAnimator;
     private Drawable mGoToTopImage;
@@ -6379,7 +6379,7 @@ public void seslInitConfigurations(Context var1) {
         this.mGoToTopBottomPadding = var3.getDimensionPixelSize(R.dimen.sesl_go_to_top_scrollable_view_gap);
         this.mGoToTopImmersiveBottomPadding = 0;
         this.mGoToTopSize = var3.getDimensionPixelSize(R.dimen.sesl_go_to_top_scrollable_view_size);
-        this.mGoToTopElevation = var3.getDimensionPixelSize(R.dimen.sesl_go_to_top_elevation);
+        this.mGoToTopElevation = var3.getDimension(R.dimen.sesl_go_to_top_elevation);
         this.mNavigationBarHeight = var3.getDimensionPixelSize(R.dimen.sesl_navigation_bar_height);
     }
 
@@ -6464,7 +6464,7 @@ public void seslSetGoToTopEnabled(boolean var1, boolean var2) {
                     if (VERSION.SDK_INT >= 26) {
                         var3 = this.mContext.getResources().getDrawable(R.drawable.sesl_go_to_top_background, (Resources.Theme) null);
                         this.mGoToTopView.setBackground(var3);
-                        this.mGoToTopView.setElevation((float) this.mGoToTopElevation);
+                        this.mGoToTopView.setElevation(this.mGoToTopElevation);
                     }
 
                     this.mGoToTopView.setImageDrawable(this.mGoToTopImage);