colorprimary and prep for flashbang

app/build.gradle

@@ -34,8 +34,9 @@ android {
         applicationId "com.lagradost.cloudstream3"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 32
+
-        versionName "2.1.2"
+        versionCode 33
+        versionName "2.2.2"
 
         resValue "string", "app_version",
                 "${defaultConfig.versionName}${versionNameSuffix ?: ""}"

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -365,6 +365,30 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             R.style.LoadedStyle,
             true
         ) // THEME IS SET BEFORE VIEW IS CREATED TO APPLY THE THEME TO THE MAIN VIEW
+
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+
+        val currentTheme = when (settingsManager.getString("theme", "")) {
+            "Black" -> R.style.AppTheme
+            "Light" -> R.style.LightMode
+            else -> R.style.AppTheme
+        }
+
+        val currentOverlayTheme = when (settingsManager.getString(getString(R.string.primary_color_key), "Normal")) {
+            "Normal" -> R.style.OverlayPrimaryColorNormal
+            "Blue" -> R.style.OverlayPrimaryColorBlue
+            "Purple" -> R.style.OverlayPrimaryColorPurple
+            "Green" -> R.style.OverlayPrimaryColorGreen
+            "GreenApple" -> R.style.OverlayPrimaryColorGreenApple
+            "Red" -> R.style.OverlayPrimaryColorRed
+            "Banana" -> R.style.OverlayPrimaryColorBanana
+            "Party" -> R.style.OverlayPrimaryColorParty
+            else -> R.style.OverlayPrimaryColorNormal
+        }
+
+        //theme.applyStyle(currentTheme, true)
+        theme.applyStyle(currentOverlayTheme, true)
+
         updateLocale()
         initRequestClient()
         super.onCreate(savedInstanceState)

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt

@@ -89,6 +89,7 @@ import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setViewPos
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.getNavigationBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
@@ -869,11 +870,13 @@ class PlayerFragment : Fragment() {
 
     private fun updateLock() {
         video_locked_img?.setImageResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
-        val color = if (isLocked) ContextCompat.getColor(requireContext(), R.color.videoColorPrimary)
+        val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
         else Color.WHITE
 
-        video_locked_text?.setTextColor(color)
+        if(color != null) {
-        video_locked_img?.setColorFilter(color)
+            video_locked_text?.setTextColor(color)
+            video_locked_img?.setColorFilter(color)
+        }
 
         val isClick = !isLocked
 

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt

@@ -18,7 +18,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.text.color
 import androidx.core.view.isVisible
@@ -196,7 +195,7 @@ class ResultFragment : Fragment() {
         super.onDestroy()
         activity?.let {
             it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.darkBackground)
+                it.colorFromAttribute(R.attr.primaryGrayBackground)
         }
     }
 
@@ -959,20 +958,23 @@ class ResultFragment : Fragment() {
 
                         metadataInfoArray.add(Pair(R.string.site, d.apiName))
 
-                        if (metadataInfoArray.size > 0) {
+                        context?.let { ctx ->
-                            result_metadata.visibility = VISIBLE
+                            if (metadataInfoArray.size > 0) {
-                            val text = SpannableStringBuilder()
+                                result_metadata.visibility = VISIBLE
-                            val grayColor = ContextCompat.getColor(requireContext(), R.color.grayTextColor)
+                                val text = SpannableStringBuilder()
-                            val textColor = ContextCompat.getColor(requireContext(), R.color.textColor)
+                                val grayColor = ctx.colorFromAttribute(R.attr.grayTextColor) //ContextCompat.getColor(requireContext(), R.color.grayTextColor)
-                            for (meta in metadataInfoArray) {
+                                val textColor = ctx.colorFromAttribute(R.attr.textColor) //ContextCompat.getColor(requireContext(), R.color.textColor)
-                                text.color(grayColor) { append(getString(meta.first) + ": ") }
+                                for (meta in metadataInfoArray) {
-                                    .color(textColor) { append("${meta.second}\n") }
+                                    text.color(grayColor) { append(getString(meta.first) + ": ") }
+                                        .color(textColor) { append("${meta.second}\n") }
+                                }
+                                result_metadata.text = text
+                            } else {
+                                result_metadata.visibility = GONE
                             }
-                            result_metadata.text = text
-                        } else {
-                            result_metadata.visibility = GONE
                         }
 
+
                         result_poster?.setImage(d.posterUrl)
                         result_poster_holder?.visibility = if (d.posterUrl.isNullOrBlank()) GONE else VISIBLE
 

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt

@@ -81,6 +81,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val subdubPreference = findPreference<Preference>(getString(R.string.display_sub_key))!!
         val providerLangPreference = findPreference<Preference>(getString(R.string.provider_lang_key))!!
         val allLayoutPreference = findPreference<Preference>(getString(R.string.app_layout_key))!!
+        val colorPrimaryPreference = findPreference<Preference>(getString(R.string.primary_color_key))!!
 
         legalPreference.setOnPreferenceClickListener {
             val builder: AlertDialog.Builder = AlertDialog.Builder(it.context)
@@ -184,6 +185,28 @@ class SettingsFragment : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        colorPrimaryPreference.setOnPreferenceClickListener {
+            val prefNames = resources.getStringArray(R.array.themes_overlay_names)
+            val prefValues = resources.getStringArray(R.array.themes_overlay_names_values)
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
+
+            val currentLayout = settingsManager.getString( getString(R.string.primary_color_key),prefValues.first())
+            context?.showBottomDialog(
+                prefNames.toList(),
+                prefValues.indexOf(currentLayout),
+                getString(R.string.primary_color_settings),
+                true,
+                {}) {
+                try {
+                    settingsManager.edit().putString(getString(R.string.primary_color_key), prefValues[it]).apply()
+                    activity?.recreate()
+                } catch (e : Exception) {
+                    logError(e)
+                }
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         watchQualityPreference.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.quality_pref)
             val prefValues = resources.getIntArray(R.array.quality_pref_values)

app/src/main/res/drawable/ic_baseline_color_lens_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>

app/src/main/res/drawable/outline_card.xml

@@ -14,7 +14,7 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
-            <solid android:color="@color/iconGrayBackground" />
+            <solid android:color="?attr/iconGrayBackground" />
         </shape>
     </item>
 

app/src/main/res/drawable/tab_selector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimary"/>
+    <solid android:color="?attr/colorPrimary"/>
     <corners android:topLeftRadius="5dp" android:topRightRadius="5dp"/>
 </shape>

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

@@ -15,7 +15,7 @@
                 android:id="@+id/nav_view"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:background="?attr/darkBackground"
+                android:background="?attr/primaryGrayBackground"
 
                 app:labelVisibilityMode="labeled"
 
@@ -41,7 +41,7 @@
         >
             <!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
             <fragment
-                    app:customCastBackgroundColor="?attr/darkBackground"
+                    app:customCastBackgroundColor="?attr/primaryGrayBackground"
                     app:castControlButtons="@array/cast_mini_controller_control_buttons"
                     android:id="@+id/cast_mini_controller"
                     android:layout_width="match_parent"

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

@@ -15,7 +15,7 @@
                 android:id="@+id/nav_view"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:background="?attr/darkBackground"
+                android:background="?attr/primaryGrayBackground"
 
                 android:outlineSpotShadowColor="@color/transparent"
                 android:outlineAmbientShadowColor="@color/transparent"
@@ -45,7 +45,7 @@
         >
             <!--com.google.android.gms.cast.framework.media.widget.MiniControllerFragment-->
             <fragment
-                    app:customCastBackgroundColor="?attr/darkBackground"
+                    app:customCastBackgroundColor="?attr/primaryGrayBackground"
                     app:castControlButtons="@array/cast_mini_controller_control_buttons"
                     android:id="@+id/cast_mini_controller"
                     android:layout_width="match_parent"

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

@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
-              android:layout_height="match_parent" >
+              android:layout_height="match_parent">
-<!--
+    <!--
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-              android:text="Loading..." android:textColor="?attr/textColor" android:textSize="20sp"
+                  android:text="Loading..." android:textColor="?attr/textColor" android:textSize="20sp"
-              android:textStyle="bold" android:layout_margin="10dp"/>-->
+                  android:textStyle="bold" android:layout_margin="10dp"/>-->
     <!--            style="@android:style/Widget.Material.ProgressBar.Horizontal"
 -->
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+    <TextView
-              android:text="@string/loading_chromecast" android:layout_gravity="center" android:textColor="?attr/textColor" android:textSize="20sp"
+            android:layout_width="wrap_content"
-              android:textStyle="bold" android:layout_margin="10dp" />
+            android:layout_height="wrap_content"
+            android:text="@string/loading_chromecast"
+            android:layout_gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:layout_margin="10dp"/>
     <ProgressBar
-
             android:layout_margin="20dp"
 
             android:layout_gravity="center"

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

@@ -60,7 +60,7 @@
                     android:marqueeRepeatLimit="marquee_forever"
                     android:singleLine="true"
 
-                    android:textColor="@color/textColor"
+                    android:textColor="?attr/textColor"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
             </TextView>
@@ -71,7 +71,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     tools:text="128MB / 237MB"
-                    android:textColor="@color/grayTextColor"
+                    android:textColor="?attr/grayTextColor"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent">
             </TextView>
@@ -111,6 +111,7 @@
                     android:layout_width="30dp"
                     android:background="?selectableItemBackgroundBorderless"
                     android:src="@drawable/ic_baseline_play_arrow_24"
+                    android:tint="?attr/textColor"
                     android:contentDescription="@string/download"/>
         </FrameLayout>
     </GridLayout>

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

@@ -6,7 +6,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         app:cardCornerRadius="@dimen/roundedImageRadius"
-        app:cardBackgroundColor="@color/itemBackground"
+        app:cardBackgroundColor="?attr/boxItemBackground"
         android:id="@+id/episode_holder"
         android:foreground="@drawable/outline_drawable"
         android:layout_marginBottom="10dp"
@@ -41,14 +41,14 @@
                     android:id="@+id/download_header_title"
                     tools:text="Perfect Run"
                     android:textStyle="bold"
-                    android:textColor="@color/textColor"
+                    android:textColor="?attr/textColor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
             </TextView>
             <TextView
                     android:id="@+id/download_header_info"
                     tools:text="1 episode | 285MB"
-                    android:textColor="@color/grayTextColor"
+                    android:textColor="?attr/grayTextColor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
             </TextView>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:background="?attr/darkBackground"
+        android:background="?attr/primaryGrayBackground"
         android:id="@+id/download_child_root"
         android:orientation="vertical"
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -17,7 +17,7 @@
                 android:id="@+id/download_child_toolbar"
                 android:paddingTop="@dimen/navbarHeight"
                 tools:title="Overlord"
-                android:background="?attr/darkBackground"
+                android:background="?attr/primaryGrayBackground"
                 app:navigationIconTint="?attr/iconColor"
                 app:titleTextColor="?attr/textColor"
                 app:layout_scrollFlags="scroll|enterAlways"

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

@@ -7,11 +7,11 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/darkBackground"
+        android:background="?attr/primaryGrayBackground"
         tools:context=".ui.download.DownloadFragment">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:background="?attr/darkBackground"
+            android:background="?attr/primaryGrayBackground"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
         <!--
@@ -26,6 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
             <TextView
+                    android:textColor="?attr/textColor"
                     android:layout_marginBottom="5dp"
                     android:text="@string/download_storage_text"
                     android:layout_width="wrap_content"

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

@@ -95,13 +95,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
             <View
-                    android:background="?attr/darkBackground"
+                    android:background="?attr/primaryGrayBackground"
                     android:id="@+id/home_statusbar"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"/>
             <FrameLayout
                     android:id="@+id/home_settings_bar"
-                    android:background="?attr/darkBackground"
+                    android:background="?attr/primaryGrayBackground"
                     android:layout_width="match_parent"
                     android:layout_height="70dp">
                 <LinearLayout
@@ -194,12 +194,13 @@
                         android:textStyle="bold"
                         android:layout_margin="5dp"
                         android:textSize="15sp"
-                        android:textColor="@color/textColor"
+                        android:textColor="?attr/textColor"
                         android:layout_width="match_parent"
                         android:maxLines="2"
                         android:ellipsize="end"
                         android:layout_height="40sp"/>
                 <LinearLayout
+                        android:padding="5dp"
                         android:layout_gravity="center"
                         android:gravity="center"
                         android:orientation="horizontal"
@@ -268,6 +269,7 @@
                             android:text="@string/continue_watching"
                     />
                     <ImageView
+                            android:tint="?attr/textColor"
                             android:layout_marginEnd="5dp"
                             android:layout_gravity="end|center_vertical"
                             android:src="@drawable/ic_baseline_arrow_forward_24"
@@ -309,6 +311,8 @@
                     <ImageView
                             android:background="?android:attr/selectableItemBackgroundBorderless"
 
+                            android:tint="?attr/textColor"
+
                             android:id="@+id/home_bookmark_select"
                             android:src="@drawable/ic_baseline_filter_list_24"
                             android:layout_width="24dp"
@@ -323,6 +327,7 @@
                             tools:text="Bookmarked"
                     />
                     <ImageView
+                            android:tint="?attr/textColor"
                             android:layout_marginEnd="5dp"
                             android:layout_gravity="end|center_vertical"
                             android:src="@drawable/ic_baseline_arrow_forward_24"

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

@@ -83,7 +83,7 @@
                     android:scaleType="centerCrop"
                     android:alpha="0.7"
                     tools:src="@drawable/example_poster"
-                    android:background="@color/primaryGrayBackground"
+                    android:background="?attr/primaryGrayBackground"
                     tools:ignore="ContentDescription"/>
             <ImageView
                     android:src="@drawable/background_shadow"
@@ -208,6 +208,7 @@
                                 android:layout_height="50dp"
                                 android:mediaRouteTypes="user"
                                 android:visibility="gone"
+                                app:mediaRouteButtonTint="?attr/textColor"
                         />
                         <ImageView
                                 android:nextFocusUp="@id/result_back"
@@ -220,6 +221,9 @@
                                 android:layout_height="25dp"
                                 android:layout_marginRight="10dp"
                                 android:elevation="10dp"
+
+                                android:tint="?attr/textColor"
+
                                 android:background="?android:attr/selectableItemBackgroundBorderless"
                                 android:src="@drawable/ic_outline_share_24"
                                 android:layout_gravity="center" android:contentDescription="@string/result_share">
@@ -235,6 +239,9 @@
                                 android:layout_height="25dp"
                                 android:layout_margin="5dp"
                                 android:elevation="10dp"
+
+                                android:tint="?attr/textColor"
+
                                 android:background="?android:attr/selectableItemBackgroundBorderless"
                                 android:src="@drawable/ic_baseline_public_24"
                                 android:layout_gravity="center"
@@ -261,6 +268,7 @@
                 />
 
                 <TextView
+                        android:textColor="?attr/textColor"
                         android:padding="10dp"
                         android:foreground="@drawable/outline_drawable"
 
@@ -383,7 +391,7 @@
                             android:layout_gravity="center_vertical"
                             android:gravity="center_vertical"
                             tools:text="128MB / 237MB"
-                            android:textColor="@color/grayTextColor"
+                            android:textColor="?attr/grayTextColor"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent">
                     </TextView>

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

@@ -8,7 +8,7 @@
         android:id="@+id/searchRoot"
         tools:context=".ui.search.SearchFragment"
         android:orientation="vertical"
-        android:background="?attr/darkBackground"
+        android:background="?attr/primaryGrayBackground"
         android:layout_marginTop="@dimen/navbarHeight">
     <FrameLayout
             android:visibility="visible"
@@ -32,6 +32,7 @@
 
                     android:id="@+id/main_search"
                     app:queryBackground="@color/transparent"
+
                     app:searchIcon="@drawable/search_icon"
                     android:paddingStart="-10dp"
                     android:iconifiedByDefault="false"
@@ -42,7 +43,6 @@
                     app:iconifiedByDefault="false"
                     tools:ignore="RtlSymmetry">
 
-
                 <androidx.core.widget.ContentLoadingProgressBar
                         android:id="@+id/search_loading_bar"
                         android:layout_width="20dp" android:layout_height="20dp"

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

@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:background="?attr/darkBackground"
+        android:background="?attr/primaryGrayBackground"
         android:layout_height="wrap_content">
 
     <FrameLayout

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

@@ -11,7 +11,7 @@
         android:elevation="10dp"
         app:cardCornerRadius="@dimen/roundedImageRadius"
         android:id="@+id/backgroundCard"
-        app:cardBackgroundColor="@color/primaryGrayBackground"
+        app:cardBackgroundColor="?attr/primaryGrayBackground"
         xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
     <ImageView
@@ -32,7 +32,7 @@
         <TextView
                 android:text="@string/app_dubbed_text"
                 android:id="@+id/text_is_dub"
-                android:textColor="@color/textColor"
+                android:textColor="?attr/textColor"
                 android:paddingRight="10dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="4dp"
@@ -48,7 +48,7 @@
                 android:id="@+id/text_is_sub"
                 android:text="@string/app_subbed_text"
                 android:layout_gravity="end"
-                android:textColor="@color/textColor"
+                android:textColor="?attr/textColor"
                 android:paddingRight="10dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="4dp"

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

@@ -11,7 +11,7 @@
         android:elevation="10dp"
         app:cardCornerRadius="@dimen/roundedImageRadius"
         android:id="@+id/backgroundCard"
-        app:cardBackgroundColor="@color/primaryGrayBackground"
+        app:cardBackgroundColor="?attr/primaryGrayBackground"
         xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools">
     <ImageView

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

@@ -21,6 +21,7 @@
                 tools:text="Trending"
         />
         <ImageView
+                android:tint="?attr/textColor"
                 android:layout_marginEnd="5dp"
                 android:layout_gravity="end|center_vertical"
                 android:src="@drawable/ic_baseline_arrow_forward_24"

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

@@ -269,6 +269,7 @@
                         android:nextFocusUp="@id/video_go_back"
                         android:nextFocusDown="@id/lock_player"
                         android:nextFocusLeft="@id/exo_rew"
+                        android:tint="@color/white"
 
                         android:paddingLeft="100dp"
                         android:id="@id/exo_rew"
@@ -302,6 +303,8 @@
                         android:nextFocusLeft="@id/exo_rew"
                         android:nextFocusRight="@id/exo_ffwd"
 
+                        android:tint="@color/white"
+
                         android:id="@id/exo_play"
                         android:scaleType="fitCenter"
                         android:layout_height="70dp"
@@ -319,6 +322,8 @@
                         android:nextFocusRight="@id/exo_ffwd"
 
                         android:id="@id/exo_pause"
+                        android:tint="@color/white"
+
                         android:scaleType="fitCenter"
                         android:layout_height="70dp"
                         android:layout_width="70dp"
@@ -354,6 +359,7 @@
                         android:nextFocusUp="@id/video_go_back"
                         android:nextFocusDown="@id/lock_player"
                         android:nextFocusRight="@id/exo_rew"
+                        android:tint="@color/white"
 
                         android:layout_gravity="center"
                         android:id="@id/exo_ffwd"

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

@@ -55,6 +55,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <ImageView
+                android:tint="?attr/textColor"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
@@ -71,7 +72,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical" tools:text="Episode 1"
-                android:textColor="@color/textColor"
+                android:textColor="?attr/textColor"
 
                 android:scrollHorizontally="true"
                 android:ellipsize="marquee"

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="@dimen/roundedImageRadius"
-        app:cardBackgroundColor="@color/itemBackground"
+        app:cardBackgroundColor="?attr/boxItemBackground"
 
         android:foreground="@drawable/outline_drawable"
         android:layout_marginBottom="10dp"
@@ -75,14 +75,14 @@
                         android:id="@+id/episode_text"
                         tools:text="1. Jobless"
                         android:textStyle="bold"
-                        android:textColor="@color/textColor"
+                        android:textColor="?attr/textColor"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                 </TextView>
                 <TextView
                         android:id="@+id/episode_rating"
                         tools:text="Rated: 8.8"
-                        android:textColor="@color/grayTextColor"
+                        android:textColor="?attr/grayTextColor"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                 </TextView>
@@ -129,7 +129,7 @@
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:id="@+id/episode_descript"
-                android:textColor="@color/grayTextColor"
+                android:textColor="?attr/grayTextColor"
                 tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. "
                 android:layout_width="match_parent" android:layout_height="wrap_content">
         </TextView>

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

@@ -19,7 +19,7 @@
             android:elevation="10dp"
             app:cardCornerRadius="@dimen/roundedImageRadius"
             android:id="@+id/backgroundCard"
-            app:cardBackgroundColor="@color/primaryGrayBackground"
+            app:cardBackgroundColor="?attr/primaryGrayBackground"
     >
 
         <ImageView
@@ -80,7 +80,7 @@
 
            <!-- <TextView
                     android:text="Movie"
-                    android:textColor="@color/textColor"
+                    android:textColor="?attr/textColor"
                     android:paddingRight="10dp"
                     android:paddingLeft="10dp"
                     android:paddingTop="4dp"

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

@@ -16,7 +16,7 @@
             android:layout_marginBottom="10dp"
             android:elevation="0dp"
             app:cardCornerRadius="@dimen/roundedImageRadius"
-            app:cardBackgroundColor="@color/itemBackground"
+            app:cardBackgroundColor="?attr/boxItemBackground"
             android:clickable="true"
             android:focusable="true"
     >

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

@@ -80,4 +80,25 @@
         <item>0</item>
         <item>1</item>
     </array>
+
+    <string-array name="themes_overlay_names">
+        <item>Normal</item>
+        <item>Cool</item>
+        <item>Fire</item>
+        <item>Burple</item>
+        <item>Green</item>
+        <item>Apple</item>
+        <item>Banana</item>
+        <item>Party</item>
+    </string-array>
+    <string-array name="themes_overlay_names_values">
+        <item>Normal</item>
+        <item>Blue</item>
+        <item>Red</item>
+         <item>Purple</item>
+        <item>Green</item>
+        <item>GreenApple</item>
+        <item>Banana</item>
+        <item>Party</item>
+    </string-array>
 </resources>

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

@@ -16,9 +16,8 @@
         <attr name="colorSearch" format="color"/>
         <attr name="colorOngoing" format="color"/>
         <attr name="colorPrimaryDark" format="color"/>
-        <attr name="colorItemSeen" format="color"/>
 
-        <attr name="darkBackground" format="color"/>
+        <attr name="primaryGrayBackground" format="color"/>
         <attr name="primaryBlackBackground" format="color"/>
         <attr name="iconGrayBackground" format="color"/>
         <attr name="boxItemBackground" format="color"/>

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

@@ -3,7 +3,6 @@
     <color name="colorPrimary">#3d50fa</color>
     <color name="colorPrimarySecond">@color/colorPrimary</color>
     <color name="colorSearch">#303135</color> <!--#3444D1 @color/itemBackground-->
-    <color name="colorItemSeen">#1E1E32</color>
     <color name="colorOngoing">#F53B66</color> <!--FF8181-->
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#3b65f5</color> <!-- 818fff-->
@@ -11,12 +10,11 @@
     <color name="primaryGrayBackground">#2B2C30</color> <!--0f0f10 0E0E10 303135 2B2C30-->
     <color name="primaryBlackBackground">#111111</color> <!--1C1C20 191a1f 19181E 202125 1C1C20-->
     <color name="iconGrayBackground">#1C1C20</color> <!--141419 202125-->
-    <color name="itemBackground">#161616</color> <!-- 17171B 1B1B20-->
+    <color name="boxItemBackground">#161616</color> <!-- 17171B 1B1B20-->
 
     <color name="textColor">#e9eaee</color> <!--FFF-->
     <color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
 
-    <color name="searchColor">@color/textColor</color> <!--DADADA-->
     <color name="searchColorTransparent">#1AFFFFFF</color> <!--DADADA-->
     <color name="transparent">#00000000</color>
 
@@ -34,10 +32,27 @@
     <color name="darkBar">#121212</color>
     <color name="videoProgress">#66B5B5B5</color> <!--66B5B5B5-->
     <!--<color name="videoCache">#663D50FA</color>--> <!--66B5B5B5-->
-    <color name="videoColorPrimary">@color/colorPrimary</color> <!--0e09df 617EFF 3d50fa-->
 
     <color name="iconColor">#9ba0a6</color>
 
     <color name="usedStorageColor">#FFF</color>
     <color name="freeStorageColor">#676767</color>
+
+    <!--Light Mode -->
+    <color name="lightPrimaryGrayBackground">#fff</color>
+    <color name="lightBitDarkerGrayBackground">#EFEFEF</color>
+    <color name="lightGrayBackground">#FFF</color>
+    <color name="lightItemBackground">#EDEDED</color>
+    <color name="lightTextColor">#202125</color>
+    <color name="lightGrayTextColor">#5f6267</color>
+    <color name="lightIconColor">#5f6267</color>
+
+    <!--Other Colors -->
+    <color name="colorPrimaryBlue">#5664B7</color>
+    <color name="colorPrimaryRed">#D50000</color>
+    <color name="colorPrimaryPurple">#6200EA</color> <!-- Burple-->
+    <color name="colorPrimaryGreen">#00BFA5</color>
+    <color name="colorPrimaryGreenApple">#48E484</color>
+    <color name="colorPrimaryBanana">#E4D448</color>
+    <color name="colorPrimaryParty">#ea596e</color>
 </resources>

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

@@ -25,6 +25,7 @@
     <string name="provider_lang_key" translatable="false">provider_lang_key</string>
     <string name="dns_key" translatable="false">dns_key</string>
     <string name="app_layout_key" translatable="false">app_layout_key</string>
+    <string name="primary_color_key" translatable="false">primary_color_key</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
     <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
@@ -299,4 +300,6 @@
     <string name="automatic">Auto</string>
     <string name="tv_layout">Tv Layout</string>
     <string name="phone_layout">Phone Layout</string>
+
+    <string name="primary_color_settings">Primary Color</string>
 </resources>

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

@@ -8,8 +8,8 @@
         <!--<item name="android:navigationBarColor">@color/darkBackground</item>-->
         <item name="android:statusBarColor">?attr/iconGrayBackground</item>
 
-        <item name="android:textColorHint">@color/searchColor</item>
+        <item name="android:textColorHint">?attr/textColor</item>
-        <item name="android:editTextColor">@color/textColor</item>
+        <item name="android:editTextColor">?attr/textColor</item>
 
         <item name="android:scrollbarThumbVertical">@null</item>
         <item name="android:scrollbarThumbHorizontal">@null</item>
@@ -37,17 +37,102 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="textColor">@color/textColor</item>
-        <item name="colorItemSeen">@color/colorItemSeen</item>
         <item name="grayTextColor">@color/grayTextColor</item>
-        <item name="darkBackground">@color/primaryGrayBackground</item>
+        <item name="primaryGrayBackground">@color/primaryGrayBackground</item>
         <item name="primaryBlackBackground">@color/primaryBlackBackground</item>
         <item name="iconGrayBackground">@color/iconGrayBackground</item>
-        <item name="boxItemBackground">@color/itemBackground</item>
+        <item name="boxItemBackground">@color/boxItemBackground</item>
         <item name="iconColor">@color/iconColor</item>
         <item name="white">#FFF</item>
     </style>
+
+    <style name="LightMode">
+        <item name="primaryGrayBackground">@color/lightPrimaryGrayBackground</item>
+        <item name="primaryBlackBackground">@color/lightBitDarkerGrayBackground</item>
+        <item name="iconGrayBackground">@color/lightGrayBackground</item>
+        <item name="boxItemBackground">@color/lightItemBackground</item>
+        <item name="textColor">@color/lightTextColor</item>
+        <item name="grayTextColor">@color/lightGrayTextColor</item>
+        <item name="white">#000</item>
+    </style>
+
+    <style name="OverlayPrimaryColorNormal">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorOnPrimary">@color/colorAccent</item>
+        <!-- Needed for leanback fuckery -->
+        <item name="android:colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="OverlayPrimaryColorBlue">
+        <item name="colorPrimary">@color/colorPrimaryBlue</item>
+        <item name="android:colorPrimary">@color/colorPrimaryBlue</item>
+        <item name="colorPrimaryDark">#4855A2</item>
+        <item name="colorAccent">#5A6BCB</item>
+        <item name="colorOnPrimary">#5A6BCB</item>
+        <!-- Needed for leanback fuckery -->
+        <item name="android:colorAccent">@color/colorPrimaryBlue</item>
+    </style>
+
+    <style name="OverlayPrimaryColorPurple">
+        <item name="colorPrimary">@color/colorPrimaryPurple</item>
+        <item name="android:colorPrimary">@color/colorPrimaryPurple</item>
+        <item name="colorPrimaryDark">#4704A3</item>
+        <item name="colorAccent">#7125DB</item>
+        <item name="colorOnPrimary">#7125DB</item>
+        <item name="android:colorAccent">@color/colorPrimaryPurple</item>
+    </style>
+
+    <style name="OverlayPrimaryColorGreen">
+        <item name="colorPrimary">@color/colorPrimaryGreen</item>
+        <item name="android:colorPrimary">@color/colorPrimaryGreen</item>
+        <item name="colorPrimaryDark">#007363</item>
+        <item name="colorAccent">#39C1AE</item>
+        <item name="colorOnPrimary">#39C1AE</item>
+        <item name="android:colorAccent">@color/colorPrimaryGreen</item>
+    </style>
+
+    <style name="OverlayPrimaryColorGreenApple">
+        <item name="colorPrimary">@color/colorPrimaryGreenApple</item>
+        <item name="android:colorPrimary">@color/colorPrimaryGreenApple</item>
+        <item name="colorPrimaryDark">#319B5A</item>
+        <item name="colorAccent">#51C57E</item>
+        <item name="colorOnPrimary">#51C57E</item>
+        <item name="android:colorAccent">@color/colorPrimaryGreenApple</item>
+    </style>
+
+    <style name="OverlayPrimaryColorRed">
+        <item name="colorPrimary">@color/colorPrimaryRed</item>
+        <item name="android:colorPrimary">@color/colorPrimaryRed</item>
+        <item name="colorPrimaryDark">#D53333</item>
+        <item name="colorAccent">#F53B3B</item>
+        <item name="colorOnPrimary">#EC3838</item>
+        <!-- Needed for leanback fuckery -->
+        <item name="android:colorAccent">@color/colorPrimaryRed</item>
+    </style>
+
+    <style name="OverlayPrimaryColorBanana">
+        <item name="colorPrimary">@color/colorPrimaryBanana</item>
+        <item name="android:colorPrimary">@color/colorPrimaryBanana</item>
+        <item name="colorPrimaryDark">#9B7D31</item>
+        <item name="colorAccent">#C5B251</item>
+        <item name="colorOnPrimary">#C5A851</item>
+        <item name="android:colorAccent">@color/colorPrimaryBanana</item>
+    </style>
+
+    <style name="OverlayPrimaryColorParty">
+        <item name="colorPrimary">@color/colorPrimaryParty</item>
+        <item name="android:colorPrimary">@color/colorPrimaryParty</item>
+        <item name="colorPrimaryDark">#C1495B</item>
+        <item name="colorAccent">#FD798C</item>
+        <item name="colorOnPrimary">#BF5968</item>
+        <item name="android:colorAccent">@color/colorPrimaryParty</item>
+    </style>
+
     <style name="LoadedStyle">
-        <item name="android:navigationBarColor">?attr/darkBackground</item>
+        <item name="android:navigationBarColor">?attr/primaryGrayBackground</item>
         <item name="android:windowBackground">?attr/primaryBlackBackground</item>
     </style>
     <style name="AppSearchViewStyle"
@@ -161,6 +246,9 @@
     </style>
 
     <style name="NiceButton">
+        <!--removes shadow-->
+        <item name="android:stateListAnimator">@null</item>
+
         <item name="android:padding">5dp</item>
         <item name="android:layout_marginStart">5dp</item>
         <item name="android:layout_marginEnd">5dp</item>

app/src/main/res/xml/settings.xml

@@ -109,6 +109,11 @@
                 android:key="@string/app_layout_key"
                 android:title="@string/app_layout">
         </Preference>
+        <Preference
+                android:icon="@drawable/ic_baseline_color_lens_24"
+                android:key="@string/primary_color_key"
+                android:title="@string/primary_color_settings">
+        </Preference>
     </PreferenceCategory>
     <PreferenceCategory
             android:key="search"