app: OUI4 bg/fg colors (#65)

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

Author: salvogiangri

app/src/main/java/de/dlyt/yanndroid/oneuiexample/fragments/MainActivityFirstFragment.java

@@ -37,7 +37,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        getView().setBackgroundColor(getResources().getColor(R.color.background_color));
+        getView().setBackgroundColor(getResources().getColor(R.color.sesl4_round_and_bgcolor));
 
         // TabLayout and ViewPager
         TabLayout tabLayout = mRootView.findViewById(R.id.tabLayout);

app/src/main/res/layout-land/activity_switchbar.xml

@@ -9,7 +9,7 @@
     <de.dlyt.yanndroid.oneui.view.RoundNestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_color"
+        android:background="?roundedCornerColor"
         android:fillViewport="true"
         app:layout_behavior="@string/sesl_appbar_scrolling_view_behavior"
         app:roundedCorners="top_left|top_right">

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

@@ -9,7 +9,7 @@
     <de.dlyt.yanndroid.oneui.view.RoundNestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_color"
+        android:background="?roundedCornerColor"
         android:fillViewport="true"
         android:orientation="vertical"
         android:scrollbarStyle="outsideOverlay"

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

@@ -320,7 +320,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
                     android:layout_marginTop="10dp"
-                    android:background="@color/background_color"
+                    android:background="?roundedCornerColor"
                     android:orientation="horizontal">
 
                     <LinearLayout
@@ -369,7 +369,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:background="@color/background_color"
+                        android:background="?roundedCornerColor"
                         android:backgroundTint="@color/sesl_control_color_normal" />
 
                 </LinearLayout>
@@ -381,7 +381,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/sesl_list_subheader_min_height"
-            android:background="@color/background_color" />
+            android:background="?roundedCornerColor" />
 
     </LinearLayout>
 </de.dlyt.yanndroid.oneui.view.NestedScrollView>

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

@@ -2,4 +2,4 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="80.0dip"
-    android:background="@color/background_color" />
+    android:background="?roundedCornerColor" />

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

@@ -35,7 +35,7 @@
 
 public class DrawerLayout extends LinearLayout {
 
-
+    private boolean mIsOneUI4;
     public static final int N_BADGE = -1;
     private Context mContext;
     private AppCompatActivity mActivity;
@@ -58,6 +58,8 @@ public class DrawerLayout extends LinearLayout {
     public DrawerLayout(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
 
+        mIsOneUI4 = context.getTheme().obtainStyledAttributes(new int[]{R.attr.isOneUI4}).getBoolean(0, false);
+
         mContext = context;
         mActivity = getActivity();
 
@@ -140,7 +142,7 @@ public void onDrawerSlide(View drawerView, float slideOffset) {
                     content.setTranslationX(slideX);
 
                     float[] hsv = new float[3];
-                    Color.colorToHSV(ContextCompat.getColor(getContext(), R.color.background_color), hsv);
+                    Color.colorToHSV(ContextCompat.getColor(getContext(), mIsOneUI4 ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor), hsv);
                     hsv[2] *= 1f - (slideOffset * 0.2f);
                     window.setStatusBarColor(Color.HSVToColor(hsv));
                     window.setNavigationBarColor(Color.HSVToColor(hsv));

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/appbar/SamsungAppBarLayout.java

@@ -106,7 +106,7 @@ public SamsungAppBarLayout(Context var1, AttributeSet var2, int var3) {
             ViewCompat.setBackground(this, this.mBackground);
         } else {
             this.mBackground = null;
-            this.setBackgroundColor(this.getResources().getColor(R.color.sesl_action_bar_background_color, var1.getTheme()));
+            this.setBackgroundColor(this.getResources().getColor(mIsOneUI4 ? R.color.sesl4_action_bar_background_color : R.color.sesl_action_bar_background_color, var1.getTheme()));
         }
 
         if (var4.hasValue(R.styleable.SamsungAppBarLayout_expanded)) {
@@ -555,7 +555,7 @@ public void onConfigurationChanged(Configuration var1) {
             this.setBackground(this.mBackground);
         } else {
             this.mBackground = null;
-            this.setBackgroundColor(this.getResources().getColor(R.color.sesl_action_bar_background_color, getContext().getTheme()));
+            this.setBackgroundColor(this.getResources().getColor(mIsOneUI4 ? R.color.sesl4_action_bar_background_color : R.color.sesl_action_bar_background_color, getContext().getTheme()));
         }
 
         this.mBottomPadding = mIsOneUI4 ? 0 : this.getContext().getResources().getDimensionPixelSize(R.dimen.sesl_extended_appbar_bottom_padding);

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

@@ -826,7 +826,7 @@ public void run() {
             this.mGoToTopImageLight = var8.getDrawable(var11.resourceId, null);
         }
 
-        this.mRectColor = var8.getColor(R.color.background_color, null);
+        this.mRectColor = var8.getColor(mIsOneUI4 ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor, null);
 
         this.mRectPaint.setColor(this.mRectColor);
         this.mRectPaint.setStyle(Style.FILL_AND_STROKE);

yanndroid/oneui/src/main/res/drawable/bottomnavview_button_background.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center_vertical" android:id="@android:id/mask" android:height="43.0dip">
         <shape android:shape="rectangle">
-            <solid android:color="@color/background_color" />
+            <solid android:color="?roundedCornerColor" />
             <corners android:radius="26.0dip" />
         </shape>
     </item>

yanndroid/oneui/src/main/res/drawable/related_card_background.xml

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/background_color" />
+            <solid android:color="?roundedCornerColor" />
         </shape>
     </item>
     <item>