OneUI4: TabLayout/BNV, app info icon (#50)

Yanndroid · salvogiangri · web-flow · commit e4047fdd765a · 2021-11-23T22:23:59.000+01:00
Signed-off-by: BlackMesa123 &lt;giangrecosalvo9@gmail.com&gt;

Co-authored-by: BlackMesa123 &lt;giangrecosalvo9@gmail.com&gt;
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/info"
-        android:icon="@drawable/ic_samsung_info"
+        android:icon="@drawable/ic_samsung_info_2"
         android:title="@string/app_info"
         app:showAsAction="always" />
 
diff --git a/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/AboutPage.java b/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/AboutPage.java
@@ -29,6 +29,7 @@
 
 public class AboutPage extends LinearLayout {
 
+    private boolean mIsOneUI4;
     public static final int NOT_UPDATEABLE = -1;
     public static final int LOADING = 0;
     public static final int UPDATE_AVAILABLE = 1;
@@ -56,6 +57,8 @@ public class AboutPage extends LinearLayout {
     public AboutPage(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
 
+        mIsOneUI4 = context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false);
+
         TypedArray attr = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AboutPage, 0, 0);
         try {
             optional_text = attr.getString(R.styleable.AboutPage_optional_text);
@@ -89,6 +92,9 @@ public void onClick(View view) {
         });
 
         toolbarLayout.inflateToolbarMenu(R.menu.about_page);
+        if (mIsOneUI4) {
+            toolbarLayout.getToolbarMenuItemView(toolbarLayout.getToolbarMenu().findItem(R.id.app_info)).setImageDrawable(getResources().getDrawable(R.drawable.ic_samsung_info_2, context.getTheme()));
+        }
         toolbarLayout.setOnToolbarMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.app_info) {
                 try {
diff --git a/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/tabs/TabRoundRectIndicator.java b/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/tabs/TabRoundRectIndicator.java
@@ -17,6 +17,7 @@
 import de.dlyt.yanndroid.oneui.R;
 
 public class TabRoundRectIndicator extends AbsIndicatorView {
+    private boolean mIsOneUI4;
     private AnimationSet mPressAnimationSet;
 
     public TabRoundRectIndicator(Context context) {
@@ -33,7 +34,8 @@ public TabRoundRectIndicator(Context context, AttributeSet attrs, int defStyleAt
 
     public TabRoundRectIndicator(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        ViewCompat.setBackground(this, ContextCompat.getDrawable(context, R.drawable.sesl_tablayout_subtab_indicator_background));
+        mIsOneUI4 = context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false);
+        ViewCompat.setBackground(this, ContextCompat.getDrawable(context, mIsOneUI4 ? R.drawable.sesl4_tablayout_subtab_indicator_background : R.drawable.sesl_tablayout_subtab_indicator_background));
     }
 
     @Override
diff --git a/yanndroid/oneui/src/main/res/color/sesl4_tablayout_selected_indicator_color.xml b/yanndroid/oneui/src/main/res/color/sesl4_tablayout_selected_indicator_color.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/sesl4_tablayout_main_tab_indicator_color" />
+</selector>
diff --git a/yanndroid/oneui/src/main/res/color/sesl4_tablayout_selected_text_color.xml b/yanndroid/oneui/src/main/res/color/sesl4_tablayout_selected_text_color.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/sesl4_tablayout_text_color_selected" />
+</selector>
diff --git a/yanndroid/oneui/src/main/res/drawable/ic_samsung_info_2.xml b/yanndroid/oneui/src/main/res/drawable/ic_samsung_info_2.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24.0dip"
     android:height="24.0dip"
-    android:viewportWidth="19.0"
-    android:viewportHeight="19.0">
+    android:viewportWidth="72.0"
+    android:viewportHeight="72.0">
     <path
         android:fillColor="?actionMenuTextColor"
-        android:fillType="nonZero"
-        android:pathData="M9.5,2L9.7424,2.0039C13.7665,2.1323 17,5.4461 17,9.5C17,13.6358 13.6358,17 9.5,17C5.365,17 2,13.6358 2,9.5C2,5.365 5.365,2 9.5,2L9.5,2ZM9.5,3.25L9.2713,3.2541C5.9309,3.3749 3.25,6.1307 3.25,9.5C3.25,12.9467 6.0542,15.75 9.5,15.75L9.5,15.75L9.7288,15.7459C13.0699,15.6251 15.75,12.8701 15.75,9.5C15.75,6.0542 12.9467,3.25 9.5,3.25L9.5,3.25ZM10.4149,8.1349L10.4149,13.2091C10.4149,13.5541 10.1349,13.8341 9.7899,13.8341C9.4449,13.8341 9.1649,13.5541 9.1649,13.2091L9.1649,13.2091L9.1649,9.3849L8.3774,9.3849L8.3774,9.3849L8.2849,9.3781C7.9831,9.3335 7.7524,9.0736 7.7524,8.7599C7.7524,8.4149 8.0316,8.1349 8.3774,8.1349L8.3774,8.1349L10.4149,8.1349ZM9.4996,5.1198L9.6042,5.1262C10.0155,5.1776 10.3329,5.5277 10.3329,5.9531C10.3329,6.4131 9.9604,6.7864 9.4996,6.7864C9.0396,6.7864 8.6663,6.4131 8.6663,5.9531C8.6663,5.4922 9.0396,5.1198 9.4996,5.1198L9.4996,5.1198Z"
-        android:strokeWidth="1.0"
-        android:strokeColor="#00000000" />
-</vector>
+        android:pathData="M36,8.25c15.327,0 27.75,12.425 27.75,27.753C63.75,51.328 51.327,63.75 36,63.75c-15.325,0 -27.75,-12.423 -27.75,-27.747C8.25,20.676 20.675,8.25 36,8.25zM36,12.75c-12.84,0 -23.25,10.411 -23.25,23.253C12.75,48.842 23.16,59.25 36,59.25c12.842,0 23.25,-10.407 23.25,-23.247C59.25,23.16 48.842,12.75 36,12.75zM39,30.41v20.616c0,1.243 -1.008,2.25 -2.25,2.25c-1.139,0 -2.081,-0.847 -2.229,-1.944L34.5,51.026V34.908l-3.504,0.002c-1.139,0 -2.081,-0.846 -2.229,-1.944l-0.021,-0.306c0,-1.139 0.846,-2.08 1.945,-2.229l0.305,-0.021H39zM36.166,20.896c1.657,0 3,1.344 3,3c0,1.656 -1.344,3 -3,3c-1.656,0 -3,-1.344 -3,-3C33.166,22.24 34.51,20.896 36.166,20.896z" />
+</vector>
diff --git a/yanndroid/oneui/src/main/res/drawable/sesl4_tablayout_subtab_indicator_background.xml b/yanndroid/oneui/src/main/res/drawable/sesl4_tablayout_subtab_indicator_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/sesl_tablayout_subtab_indicator_ripple" />
+    <item android:drawable="@drawable/sesl4_tablayout_subtab_indicator_shape" />
+</layer-list>
diff --git a/yanndroid/oneui/src/main/res/drawable/sesl4_tablayout_subtab_indicator_shape.xml b/yanndroid/oneui/src/main/res/drawable/sesl4_tablayout_subtab_indicator_shape.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/sesl_tablayout_subtab_indicator_radius" />
+    <solid android:color="@color/sesl4_tablayout_subtab_indicator_background" />
+</shape>
diff --git a/yanndroid/oneui/src/main/res/values-night/colors.xml b/yanndroid/oneui/src/main/res/values-night/colors.xml
@@ -116,6 +116,9 @@
     <color name="sesl_tablayout_subtab_text_color_selected">#FFFFFF</color>
     <color name="sesl_tablayout_text_color_default">#A8A9A9</color>
     <color name="sesl_tablayout_text_color_disabled">#66A8A9A9</color>
+    <color name="sesl4_tablayout_subtab_indicator_background">#1AFFFFFF</color>
+    <color name="sesl4_tablayout_text_color_selected">#FAFAFA</color>
+    <color name="sesl4_tablayout_main_tab_indicator_color">#FAFAFA</color>
 
 
     <!--Dialog-->
diff --git a/yanndroid/oneui/src/main/res/values/colors.xml b/yanndroid/oneui/src/main/res/values/colors.xml
@@ -178,6 +178,9 @@
     <color name="sesl_tablayout_subtab_text_color_selected">#252525</color>
     <color name="sesl_tablayout_text_color_default">#858585</color>
     <color name="sesl_tablayout_text_color_disabled">#66858585</color>
+    <color name="sesl4_tablayout_subtab_indicator_background">#0D000000</color>
+    <color name="sesl4_tablayout_text_color_selected">#010101</color>
+    <color name="sesl4_tablayout_main_tab_indicator_color">#252525</color>
 
     <!--Dialog-->
     <color name="sesl_dialog_body_text_color">#ff505050</color>
diff --git a/yanndroid/oneui/src/main/res/values/styles.xml b/yanndroid/oneui/src/main/res/values/styles.xml
@@ -914,6 +914,7 @@
         <item name="toolbarTitleStyle">@style/OneUI4.CollapsedActionBarTitleTextStyle</item>
         <item name="toolbarSubtitleStyle">@style/OneUI4.CollapsedActionBarSubtitleTextStyle</item>
 
+        <item name="bottomNaviViewStyle">@style/OneUI4.BaseTabLayoutStyle</item>
     </style>
 
 
@@ -1009,25 +1010,23 @@
 
     <style name="OneUI4.CollapsedActionBarSubtitleTextStyle" parent="@style/CollapsedActionBarSubtitleTextStyle">
         <item name="android:textSize">@dimen/sesl4_toolbar_subtitle_text_size</item>
-        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="OneUI4.CollapsingToolbarExpandTitleStyle" parent="@style/OneUI4.CollapsedActionBarTitleTextStyle">
         <item name="android:textSize">@dimen/sesl4_appbar_extended_title_text_size</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:fontFamily">sec-roboto-regular</item>
-        <item name="fontFamily">sec-roboto-regular</item>
     </style>
 
     <style name="OneUI4.CollapsingToolbarExpandSubtitleStyle" parent="@style/OneUI4.CollapsedActionBarSubtitleTextStyle">
         <item name="android:textColor">@color/sesl_extended_appbar_subtitle</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:fontFamily">sec-roboto-regular</item>
-        <item name="fontFamily">sec-roboto-regular</item>
     </style>
 
 
-
-
+    <!-- TabLayout -->
+    <style name="OneUI4.BaseTabLayoutStyle" parent="@style/BaseTabLayoutStyle">
+        <item name="tabIndicatorColor">@color/sesl4_tablayout_selected_indicator_color</item>
+        <item name="tabSelectedTextColor">@color/sesl4_tablayout_selected_text_color</item>
+    </style>
 
 </resources>
