diff --git a/app/build.gradle b/app/build.gradle
index 59cc0854c0037b9bb1881c1fc7eae2d01c097eae..d63ee426414ce3a65f443432ea1900f5d41cc5de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,6 +44,9 @@ android {
lintOptions {
lintConfig file("lint.xml")
}
+ aaptOptions {
+ additionalParameters '-I', 'app/e-ui-sdk.jar'
+ }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -69,6 +72,9 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
+ // eOS
+ compileOnly files("e-ui-sdk.jar")
+
// Preference
implementation "androidx.preference:preference-ktx:1.1.1"
diff --git a/app/e-ui-sdk.jar b/app/e-ui-sdk.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5974432e9c6b33ca4a6473603e57cd3290d5bdaa
Binary files /dev/null and b/app/e-ui-sdk.jar differ
diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt
index f5dcb387433fa57485813cd57a3a0f29ced5abd0..f13a9ccbe19d1a7d3ad80bc316395ac0dcd0916d 100644
--- a/app/src/main/java/foundation/e/apps/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/MainActivity.kt
@@ -21,7 +21,6 @@ import android.annotation.SuppressLint
import android.content.*
import android.content.pm.PackageManager
import android.content.res.ColorStateList
-import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.Looper
@@ -151,7 +150,7 @@ class MainActivity :
intArrayOf(android.R.attr.state_checked)
),
intArrayOf(
- Color.parseColor("#C4CFD9"),
+ ContextCompat.getColor(this, R.color.colorDarkGray),
accentColorOS
)
)
@@ -159,7 +158,7 @@ class MainActivity :
val textColorStates = ColorStateList(
arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
intArrayOf(
- Color.parseColor("#C4CFD9"),
+ ContextCompat.getColor(this, R.color.colorDarkGray),
accentColorOS
)
diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt b/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
index d1da7229884d02b9b46adba18f35e87a7aa18c10..2b18518f27b9734fbce9927c21e00460492bb5ca 100644
--- a/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
+++ b/app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt
@@ -23,16 +23,12 @@ import android.content.DialogInterface
import android.content.Intent
import android.content.pm.PackageManager
import android.graphics.Bitmap
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Bundle
import android.os.CountDownTimer
import android.text.Html
-import android.text.SpannableString
-import android.text.SpannableStringBuilder
import android.text.method.LinkMovementMethod
-import android.text.style.ForegroundColorSpan
import android.util.DisplayMetrics
import android.util.TypedValue
import android.view.Menu
@@ -44,6 +40,7 @@ import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
import com.google.android.material.snackbar.Snackbar
import foundation.e.apps.MainActivity.Companion.sharedPreferences
import foundation.e.apps.R
@@ -200,15 +197,6 @@ class ApplicationActivity :
defaultElevation = Math.ceil(resources.getDimension(R.dimen.default_elevation) * logicalDensity.toDouble()).toFloat()
}
- @SuppressLint("ResourceAsColor")
- private fun textColorChange(text: String): SpannableStringBuilder {
- val builder = SpannableStringBuilder()
- val redSpannable = SpannableString(text)
- redSpannable.setSpan(ForegroundColorSpan(R.color.colorTextSecondary), 0, text.length, 0)
- builder.append(redSpannable)
- return builder
- }
-
private fun onApplicationInfoLoaded() {
initialiseElevation()
@@ -268,7 +256,8 @@ class ApplicationActivity :
if (basicData.ratings.rating != -1f) {
binding.appRating.text = basicData.ratings.rating.toString() + "/5"
} else {
- binding.appRating.text = textColorChange(getText(R.string.not_available).toString())
+ binding.appRating.text = getText(R.string.not_available)
+ binding.appRating.setTextColor(ContextCompat.getColor(this, R.color.colorTextSecondary))
}
setRatingBorder(basicData.ratings.rating)
@@ -283,7 +272,7 @@ class ApplicationActivity :
}
alertDialog.show()
var b = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
- b.setTextColor(Color.parseColor("#0088ED"))
+ b.setTextColor(ContextCompat.getColor(this, R.color.colorAccent))
}
// Load the app screenshots
@@ -313,7 +302,8 @@ class ApplicationActivity :
binding.appPrivacyScore.text = fullData.getLastVersion()!!.privacyRating.toString() + "/10"
setPrivacyRatingBorder(fullData.getLastVersion()!!.privacyRating!!)
} else {
- binding.appPrivacyScore.text = textColorChange(getText(R.string.not_available).toString())
+ binding.appPrivacyScore.text = getText(R.string.not_available)
+ binding.appPrivacyScore.setTextColor(ContextCompat.getColor(this, R.color.colorTextSecondary))
setPrivacyRatingBorder(-1)
}
binding.appPrivacyContainer.setOnClickListener {
@@ -322,7 +312,7 @@ class ApplicationActivity :
@Suppress("DEPRECATION")
message.setText((Html.fromHtml("Score out of 10. Computed using Exodus Privacy analyses, based on permissions and trackers used in the app")))
- message.setLinkTextColor(Color.parseColor("#0088ED"))
+ message.setLinkTextColor(ContextCompat.getColor(this, R.color.colorAccent))
message.setMovementMethod(LinkMovementMethod.getInstance())
message.movementMethod = (LinkMovementMethod.getInstance())
@@ -335,7 +325,7 @@ class ApplicationActivity :
}
alertDialog.show()
var b = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
- b.setTextColor(Color.parseColor("#0088ED"))
+ b.setTextColor(ContextCompat.getColor(this, R.color.colorAccent))
}
// Set app version
@@ -370,7 +360,8 @@ class ApplicationActivity :
binding.appSize.visibility = View.GONE
// Set app privacy rating
- binding.appPrivacyScore.text = textColorChange(getText(R.string.not_available).toString())
+ binding.appPrivacyScore.text = getText(R.string.not_available)
+ binding.appPrivacyScore.setTextColor(ContextCompat.getColor(this, R.color.colorTextSecondary))
setPrivacyRatingBorder(-1)
binding.appPrivacyContainer.setOnClickListener {
val alertDialog = AlertDialog.Builder(this).create()
@@ -382,7 +373,7 @@ class ApplicationActivity :
}
alertDialog.show()
var b = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
- b.setTextColor(Color.parseColor("#0088ED"))
+ b.setTextColor(ContextCompat.getColor(this, R.color.colorAccent))
}
// Set app version
@@ -427,7 +418,7 @@ class ApplicationActivity :
}
alertDialog.show()
var b = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
- b.setTextColor(Color.parseColor("#0088ED"))
+ b.setTextColor(ContextCompat.getColor(this, R.color.colorAccent))
layout.findViewById(R.id.privacy_message).movementMethod = LinkMovementMethod.getInstance()
}
@@ -439,7 +430,7 @@ class ApplicationActivity :
val linkMessage = layout.findViewById(R.id.privacy_message)
@Suppress("DEPRECATION")
linkMessage.setText((Html.fromHtml("Computed using Exodus Privacy analyses.")))
- linkMessage.setLinkTextColor(Color.parseColor("#0088ED"))
+ linkMessage.setLinkTextColor(ContextCompat.getColor(this, R.color.colorAccent))
linkMessage.setMovementMethod(LinkMovementMethod.getInstance())
val alertDialog = AlertDialog.Builder(this).create()
@@ -471,7 +462,7 @@ class ApplicationActivity :
}
alertDialog.show()
var b = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
- b.setTextColor(Color.parseColor("#0088ED"))
+ b.setTextColor(ContextCompat.getColor(this, R.color.colorAccent))
linkMessage.movementMethod = LinkMovementMethod.getInstance()
}
diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt b/app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt
index cb940e2ad3049b668e6a24be441ed9a8b4fba87e..af0d9caf028885506315d7b864835e13f4e4e266 100644
--- a/app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt
+++ b/app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt
@@ -20,7 +20,6 @@ package foundation.e.apps.application
import android.annotation.SuppressLint
import android.app.Activity
import android.graphics.Bitmap
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.graphics.drawable.GradientDrawable
@@ -28,6 +27,7 @@ import android.view.View
import android.view.animation.AlphaAnimation
import android.view.animation.Animation
import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar
import foundation.e.apps.R
@@ -187,7 +187,7 @@ class ApplicationViewHolder(private val activity: Activity, binding: Application
State.INSTALLED -> {
installButton.isEnabled =
Common.appHasLaunchActivity(activity, application!!.packageName)
- installButton.setTextColor(Color.parseColor("#FAFAFA"))
+ installButton.setTextColor(ContextCompat.getColor(activity, R.color.color_default_view_on_accent))
installButton.background.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
}
State.INSTALLING -> {
@@ -196,7 +196,7 @@ class ApplicationViewHolder(private val activity: Activity, binding: Application
}
State.NOT_UPDATED -> {
installButton.isEnabled = true
- installButton.setTextColor(Color.parseColor("#FAFAFA"))
+ installButton.setTextColor(ContextCompat.getColor(activity, R.color.color_default_view_on_accent))
installButton.background.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
}
}
diff --git a/app/src/main/java/foundation/e/apps/application/SmallApplicationViewHolder.kt b/app/src/main/java/foundation/e/apps/application/SmallApplicationViewHolder.kt
index ae51d4e77dc26c82a052cd01941d5d9125f36fc7..24fee79afbe70ba6bb7d37a3c113bbd4ec27c178 100644
--- a/app/src/main/java/foundation/e/apps/application/SmallApplicationViewHolder.kt
+++ b/app/src/main/java/foundation/e/apps/application/SmallApplicationViewHolder.kt
@@ -20,13 +20,13 @@ package foundation.e.apps.application
import android.annotation.SuppressLint
import android.app.Activity
import android.graphics.Bitmap
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.graphics.drawable.GradientDrawable
import android.view.animation.AlphaAnimation
import android.view.animation.Animation
import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar
import foundation.e.apps.R
@@ -135,7 +135,7 @@ class SmallApplicationViewHolder(private val activity: Activity, binding: SmallA
State.INSTALLED -> {
installButton.isEnabled =
Common.appHasLaunchActivity(activity, application!!.packageName)
- installButton.setTextColor(Color.parseColor("#FAFAFA"))
+ installButton.setTextColor(ContextCompat.getColor(activity, R.color.color_default_view_on_accent))
installButton.background.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
}
State.INSTALLING -> {
@@ -144,7 +144,7 @@ class SmallApplicationViewHolder(private val activity: Activity, binding: SmallA
}
State.NOT_UPDATED -> {
installButton.isEnabled = true
- installButton.setTextColor(Color.parseColor("#FAFAFA"))
+ installButton.setTextColor(ContextCompat.getColor(activity, R.color.color_default_view_on_accent))
installButton.background.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
}
}
diff --git a/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt b/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt
index 7b1b5d100b5ceeafc7eb0e0a2adb2f863e007cd9..0a51816cdc63ad82183eb18d01563ae1c36d17c0 100644
--- a/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt
@@ -17,7 +17,6 @@
package foundation.e.apps.categories
-import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -26,6 +25,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
+import foundation.e.apps.R
import foundation.e.apps.categories.model.Category
import foundation.e.apps.categories.viewmodel.CategoriesViewModel
import foundation.e.apps.databinding.FragmentApplicationCategoriesBinding
@@ -60,7 +60,7 @@ class ApplicationsFragment() : Fragment() {
categoriesViewModel.loadCategories(requireContext())
}
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(color)
// Bind to the list of applications categories
diff --git a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt
index f470416f76c5fec635e62440775b23368fc2a7f7..c5508088e2452d91ea3a8f983cba65a205e2738e 100644
--- a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt
@@ -17,7 +17,6 @@
package foundation.e.apps.categories
-import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -26,6 +25,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
+import foundation.e.apps.R
import foundation.e.apps.categories.viewmodel.CategoriesViewModel
import foundation.e.apps.databinding.FragmentGamesCategoriesBinding
@@ -58,7 +58,7 @@ class GamesFragment() : Fragment() {
progressBar.visibility = View.VISIBLE
categoriesViewModel.loadCategories(requireContext())
}
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(color)
// Bind to the list of games categories
diff --git a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
index 46ee2555558315314bd2f36517f7b51861d1812a..1420ca7e52079ae3dd9c72928581034993f6900d 100644
--- a/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
+++ b/app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt
@@ -18,7 +18,6 @@
package foundation.e.apps.categories.category
import android.content.pm.PackageManager
-import android.graphics.Color
import android.os.Bundle
import android.view.MenuItem
import android.view.View
@@ -79,7 +78,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio
val errorResolve = binding.errorLayout.errorResolve
// set accent color to Error button (Retry )
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(accentColorOS)
// Initialise UI elements
diff --git a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/home/HomeFragment.kt
index c874362433036d789dd230cb7ac10dfcd0d76695..b1b855c44927a16d4353e0ed6a07a9b75374af8a 100644
--- a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt
+++ b/app/src/main/java/foundation/e/apps/home/HomeFragment.kt
@@ -17,7 +17,6 @@
package foundation.e.apps.home
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Bundle
@@ -31,6 +30,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.viewpager.widget.ViewPager
+import foundation.e.apps.R
import foundation.e.apps.application.model.Application
import foundation.e.apps.applicationmanager.ApplicationManager
import foundation.e.apps.categories.model.Category
@@ -75,7 +75,7 @@ class HomeFragment : Fragment() {
// Set accent color
progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(accentColorOS)
// Initialise UI elements
diff --git a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
index 53ff46d58dfcf774e8943e59b11c98313f361a0b..9c6852defc0e8844e2e42c0f54fdb3b5ed8872b6 100644
--- a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
@@ -19,7 +19,6 @@ package foundation.e.apps.search
import android.app.Activity
import android.database.MatrixCursor
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Bundle
@@ -92,7 +91,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
// Set accent color
progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(accentColorOS)
errorResolve.visibility = View.GONE
diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt
index f9ce334a672dc24fa1bdbe726b7bddf2c2e7d42c..842ab4588b956895b39c79a1de6cb39494847aa5 100644
--- a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt
+++ b/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt
@@ -17,7 +17,6 @@
package foundation.e.apps.updates
-import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Bundle
@@ -32,6 +31,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import foundation.e.apps.R
import foundation.e.apps.application.model.Application
import foundation.e.apps.application.model.State
import foundation.e.apps.applicationmanager.ApplicationManager
@@ -79,7 +79,7 @@ class UpdatesFragment() : Fragment() {
reloadProgressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
// set accent color to Error button (Retry )
- errorResolve.setTextColor(Color.parseColor("#ffffff"))
+ errorResolve.setTextColor(resources.getColor(R.color.color_default_view_on_accent, null))
errorResolve.setBackgroundColor(accentColorOS)
// Initialise UI elements
diff --git a/app/src/main/res/drawable/ic_all_apps_updated.xml b/app/src/main/res/drawable/ic_all_apps_updated.xml
index 545f67faa9089c6375919c0864703b7b596f1179..b7ca7e8182105116362b887a5c0df9808fd417c5 100644
--- a/app/src/main/res/drawable/ic_all_apps_updated.xml
+++ b/app/src/main/res/drawable/ic_all_apps_updated.xml
@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_app_default.xml b/app/src/main/res/drawable/ic_app_default.xml
index 10d588746f0eea4bb3413c4453cc11b7e262e945..8fbee8a6c8bcee21acb5b8ad980afa742bb2dc8a 100644
--- a/app/src/main/res/drawable/ic_app_default.xml
+++ b/app/src/main/res/drawable/ic_app_default.xml
@@ -27,7 +27,7 @@
android:scaleX="0.5"
android:scaleY="0.5">
diff --git a/app/src/main/res/drawable/ic_app_description_expand.xml b/app/src/main/res/drawable/ic_app_description_expand.xml
index f2ec927fc81c9a16d4b5e4d20cd698355778af39..ae0ee7108cd7ecea9da1824c29ec89eb11cffbf2 100644
--- a/app/src/main/res/drawable/ic_app_description_expand.xml
+++ b/app/src/main/res/drawable/ic_app_description_expand.xml
@@ -21,6 +21,6 @@
android:viewportWidth="256"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_app_licence.xml b/app/src/main/res/drawable/ic_app_licence.xml
index cfd6c3f31ef96e2659001d4ca939eb59e1fc92a5..342f022d8c757c5bfd27f7d8677f11e59b1cd208 100644
--- a/app/src/main/res/drawable/ic_app_licence.xml
+++ b/app/src/main/res/drawable/ic_app_licence.xml
@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_app_min_android.xml b/app/src/main/res/drawable/ic_app_min_android.xml
index db142517e7dc307ee92c4de7d4d7837e4ac1a940..ec9b3e3e638acb9aec79eed3c182742b984757b4 100644
--- a/app/src/main/res/drawable/ic_app_min_android.xml
+++ b/app/src/main/res/drawable/ic_app_min_android.xml
@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_app_privacy.xml b/app/src/main/res/drawable/ic_app_privacy.xml
index 78aedac9efae87c49d33df15ec227bdc4c02952f..869a0fa9e8bf419fe200887ccceb4be6826ee944 100644
--- a/app/src/main/res/drawable/ic_app_privacy.xml
+++ b/app/src/main/res/drawable/ic_app_privacy.xml
@@ -22,10 +22,10 @@
android:viewportHeight="14">
diff --git a/app/src/main/res/drawable/ic_app_rating.xml b/app/src/main/res/drawable/ic_app_rating.xml
index 31571b091d5ec818671b3709ee9ca87f13f3ca6f..f5b72226c0d996f82ef92a8ecbb43d67611bb309 100644
--- a/app/src/main/res/drawable/ic_app_rating.xml
+++ b/app/src/main/res/drawable/ic_app_rating.xml
@@ -24,7 +24,7 @@
diff --git a/app/src/main/res/drawable/ic_app_updated_on.xml b/app/src/main/res/drawable/ic_app_updated_on.xml
index 7ba3eacf8b168259b636ba8704d937a744ab0462..5a1af8b80a1780071b33c94d3a938f2a98ac0f49 100644
--- a/app/src/main/res/drawable/ic_app_updated_on.xml
+++ b/app/src/main/res/drawable/ic_app_updated_on.xml
@@ -21,6 +21,6 @@
android:viewportWidth="640"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_app_version.xml b/app/src/main/res/drawable/ic_app_version.xml
index 3cc8b03ea6c9324995112fe57e51c5212a3a830b..97d1cdecb169c4b612b4158f14142b4ac5af4d2d 100644
--- a/app/src/main/res/drawable/ic_app_version.xml
+++ b/app/src/main/res/drawable/ic_app_version.xml
@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_auto_and_vehicles.xml b/app/src/main/res/drawable/ic_auto_and_vehicles.xml
index 95f80f1e1de651c9a54b69cb40fe31484c4d4a5a..1f60721683f1f4623427cc409783df70196d2b13 100644
--- a/app/src/main/res/drawable/ic_auto_and_vehicles.xml
+++ b/app/src/main/res/drawable/ic_auto_and_vehicles.xml
@@ -24,39 +24,39 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_beauty.xml b/app/src/main/res/drawable/ic_beauty.xml
index 15ef018fc33803ac46463fa2de06ad4af0f8401c..05d12648d5bc1bebf8fdc542c42d90feb3bc43f5 100644
--- a/app/src/main/res/drawable/ic_beauty.xml
+++ b/app/src/main/res/drawable/ic_beauty.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_books_and_reference.xml b/app/src/main/res/drawable/ic_books_and_reference.xml
index e4364416ea76c763e3c28ecea4c42663f9e8ad80..b4a2ecaddfae20483721fbd767415cfa2d4952bd 100644
--- a/app/src/main/res/drawable/ic_books_and_reference.xml
+++ b/app/src/main/res/drawable/ic_books_and_reference.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_business.xml b/app/src/main/res/drawable/ic_business.xml
index 9b760e0c001191ca263860fd3e6d8226d1a31563..8aaffaf570dd95ddbdd724c5e5770dc7e4013c15 100644
--- a/app/src/main/res/drawable/ic_business.xml
+++ b/app/src/main/res/drawable/ic_business.xml
@@ -24,18 +24,18 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_comics.xml b/app/src/main/res/drawable/ic_cat_comics.xml
index 0b86b35118281f4f0e11e56ee044b997a0352e59..86d230d710973529f83297ca4042f54f42e13703 100644
--- a/app/src/main/res/drawable/ic_cat_comics.xml
+++ b/app/src/main/res/drawable/ic_cat_comics.xml
@@ -24,33 +24,33 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_communication.xml b/app/src/main/res/drawable/ic_cat_communication.xml
index 86c8300718ada4be395acffc8822aeacdd388b3e..27ac53351ba42a3b432ece470a704b47d5e6f396 100644
--- a/app/src/main/res/drawable/ic_cat_communication.xml
+++ b/app/src/main/res/drawable/ic_cat_communication.xml
@@ -24,6 +24,6 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_dating.xml b/app/src/main/res/drawable/ic_cat_dating.xml
index b5d82bf92dbd8f9d28d22428fe817b5c70b5df85..2777636439602430a252b1a069b5d150af7b080a 100644
--- a/app/src/main/res/drawable/ic_cat_dating.xml
+++ b/app/src/main/res/drawable/ic_cat_dating.xml
@@ -24,6 +24,6 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_default.xml b/app/src/main/res/drawable/ic_cat_default.xml
index 136afe3c18ab6f444c36063a2fc6423c577ea781..ebfe044e0bee109bfd73d5ec23d3dd500712c9e9 100644
--- a/app/src/main/res/drawable/ic_cat_default.xml
+++ b/app/src/main/res/drawable/ic_cat_default.xml
@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_education.xml b/app/src/main/res/drawable/ic_cat_education.xml
index ec652ee078674ae6ac7c153c5425513a7dd6ac42..c42e70eccbe903f5b1159da5660f5790b3609a39 100644
--- a/app/src/main/res/drawable/ic_cat_education.xml
+++ b/app/src/main/res/drawable/ic_cat_education.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_entertainment.xml b/app/src/main/res/drawable/ic_cat_entertainment.xml
index c76e3ecb27334a0dbce2a62a06980a3d9bce1149..e503df65b7963fdf4c88c2d604f0cda21fa231e5 100644
--- a/app/src/main/res/drawable/ic_cat_entertainment.xml
+++ b/app/src/main/res/drawable/ic_cat_entertainment.xml
@@ -24,6 +24,6 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_events.xml b/app/src/main/res/drawable/ic_cat_events.xml
index c5c10de31dc3670dcfe94a18d8973bdd1ada5b57..5d8c1cacf80a9592a5a73cb2f11871e7e93e128e 100644
--- a/app/src/main/res/drawable/ic_cat_events.xml
+++ b/app/src/main/res/drawable/ic_cat_events.xml
@@ -24,48 +24,48 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_family.xml b/app/src/main/res/drawable/ic_cat_family.xml
index ae5bb04bd23582d94b3ff9a9643651b0c12f29a6..6ec83f4548de06c2cf65e5f94d5f5b2b3512c790 100644
--- a/app/src/main/res/drawable/ic_cat_family.xml
+++ b/app/src/main/res/drawable/ic_cat_family.xml
@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_finance.xml b/app/src/main/res/drawable/ic_cat_finance.xml
index bb670b89328276e91e19a2d02ff0f622fd14d5f7..3235ebfab55186c9736093ceb11dc44ce0305504 100644
--- a/app/src/main/res/drawable/ic_cat_finance.xml
+++ b/app/src/main/res/drawable/ic_cat_finance.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_food_and_drink.xml b/app/src/main/res/drawable/ic_cat_food_and_drink.xml
index 3f2e9d7e819b1b7d16fec143527ff091172250a1..e5133d4388f7b980cd5153bbcb65a8235d171c29 100644
--- a/app/src/main/res/drawable/ic_cat_food_and_drink.xml
+++ b/app/src/main/res/drawable/ic_cat_food_and_drink.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_food_nd_drink.xml b/app/src/main/res/drawable/ic_cat_food_nd_drink.xml
index 1af747843f935f98fe2faa9a073de1abf30c36a5..29a50930ee8776d2c1cff30ddb692d003b28e66d 100644
--- a/app/src/main/res/drawable/ic_cat_food_nd_drink.xml
+++ b/app/src/main/res/drawable/ic_cat_food_nd_drink.xml
@@ -21,6 +21,6 @@
android:viewportWidth="576"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_game_action.xml b/app/src/main/res/drawable/ic_cat_game_action.xml
index 68dd6f57c52ccdae6eb423673a263ae62009c6ae..bd6265bd45f856c940d4471899f872d2848b36a5 100644
--- a/app/src/main/res/drawable/ic_cat_game_action.xml
+++ b/app/src/main/res/drawable/ic_cat_game_action.xml
@@ -24,31 +24,31 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_adventure.xml b/app/src/main/res/drawable/ic_cat_game_adventure.xml
index 7f264e3083ddd8b3b402bcdb431197c74b12bf07..72c359d4d82476b42c79c783283d40d678518679 100644
--- a/app/src/main/res/drawable/ic_cat_game_adventure.xml
+++ b/app/src/main/res/drawable/ic_cat_game_adventure.xml
@@ -24,33 +24,33 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_arcade.xml b/app/src/main/res/drawable/ic_cat_game_arcade.xml
index 2f145c6571121a6cdf7844eb74b49473390f960d..c66ac32c7d4b7e03ca5d2224cb3ee13aef50d697 100644
--- a/app/src/main/res/drawable/ic_cat_game_arcade.xml
+++ b/app/src/main/res/drawable/ic_cat_game_arcade.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_board.xml b/app/src/main/res/drawable/ic_cat_game_board.xml
index d74309584cc567a3c6709e605f4daff6409e863c..90084abd83a985c83b091b12be27258da570bfd5 100644
--- a/app/src/main/res/drawable/ic_cat_game_board.xml
+++ b/app/src/main/res/drawable/ic_cat_game_board.xml
@@ -26,31 +26,31 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_card.xml b/app/src/main/res/drawable/ic_cat_game_card.xml
index d359bdc33e5067f080c39692be1a1c9b845d17cc..1a2db7214df7fc45750356d47e237b6a89f3f681 100644
--- a/app/src/main/res/drawable/ic_cat_game_card.xml
+++ b/app/src/main/res/drawable/ic_cat_game_card.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_casino.xml b/app/src/main/res/drawable/ic_cat_game_casino.xml
index c244a16f2e199289435a970759413fdf44df3723..bc1893f3c529dd85db1df289520c95d060abbefe 100644
--- a/app/src/main/res/drawable/ic_cat_game_casino.xml
+++ b/app/src/main/res/drawable/ic_cat_game_casino.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_casual.xml b/app/src/main/res/drawable/ic_cat_game_casual.xml
index 90f057ca4a26c2f8d40a5cb6afbb854fddb3f4d0..0e12caf7bebae4eb361628fd04dc99b52a852566 100644
--- a/app/src/main/res/drawable/ic_cat_game_casual.xml
+++ b/app/src/main/res/drawable/ic_cat_game_casual.xml
@@ -24,24 +24,24 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_educational.xml b/app/src/main/res/drawable/ic_cat_game_educational.xml
index af8d08c36abf970f89d865ecf12b9ae456484726..0d09b5997c9be87c6277cdee55b8abf3e60fe061 100644
--- a/app/src/main/res/drawable/ic_cat_game_educational.xml
+++ b/app/src/main/res/drawable/ic_cat_game_educational.xml
@@ -26,28 +26,28 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_music.xml b/app/src/main/res/drawable/ic_cat_game_music.xml
index 04971134399249ccc4ce512ef8f113bbb601a99a..d9b6527321a5ee4d3c5245dc7bbc404d3a1dd6e4 100644
--- a/app/src/main/res/drawable/ic_cat_game_music.xml
+++ b/app/src/main/res/drawable/ic_cat_game_music.xml
@@ -24,24 +24,24 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_puzzle.xml b/app/src/main/res/drawable/ic_cat_game_puzzle.xml
index 3215caadb213b0ec7c278b0cfadee729efe2a867..d4c82e64bca9152c1ca192fd9d8308a269a88f96 100644
--- a/app/src/main/res/drawable/ic_cat_game_puzzle.xml
+++ b/app/src/main/res/drawable/ic_cat_game_puzzle.xml
@@ -24,6 +24,6 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_racing.xml b/app/src/main/res/drawable/ic_cat_game_racing.xml
index fc151a06d4d98cd174854ce48eb8a8eff2f2613b..30e8d3142fae1a8ffe38624167b169eec9054e22 100644
--- a/app/src/main/res/drawable/ic_cat_game_racing.xml
+++ b/app/src/main/res/drawable/ic_cat_game_racing.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_role_playing.xml b/app/src/main/res/drawable/ic_cat_game_role_playing.xml
index a06049c5bfd2a17ff0c92dc16d8692326c59c98b..5ff91d53fff45073f5c2b649f58c23a130da753f 100644
--- a/app/src/main/res/drawable/ic_cat_game_role_playing.xml
+++ b/app/src/main/res/drawable/ic_cat_game_role_playing.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_simulation.xml b/app/src/main/res/drawable/ic_cat_game_simulation.xml
index df136eb195457bd763a7b20d0265fdc29bfb5dee..265ef35479c8511786e94a42e9070157adb7602a 100644
--- a/app/src/main/res/drawable/ic_cat_game_simulation.xml
+++ b/app/src/main/res/drawable/ic_cat_game_simulation.xml
@@ -24,6 +24,6 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_sports.xml b/app/src/main/res/drawable/ic_cat_game_sports.xml
index 65b80abb6a0dea1ea40c5164b9fa4ed50f1555d5..46d2d5ce9f17c8339a810c79da8405286902d7b8 100644
--- a/app/src/main/res/drawable/ic_cat_game_sports.xml
+++ b/app/src/main/res/drawable/ic_cat_game_sports.xml
@@ -24,24 +24,24 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_strategy.xml b/app/src/main/res/drawable/ic_cat_game_strategy.xml
index 5121ccb4e321fef70188d442790feb0211d1f0de..a8ecef91536778c134a1a306e5e3e2270af7db33 100644
--- a/app/src/main/res/drawable/ic_cat_game_strategy.xml
+++ b/app/src/main/res/drawable/ic_cat_game_strategy.xml
@@ -24,18 +24,18 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_trivia.xml b/app/src/main/res/drawable/ic_cat_game_trivia.xml
index 0a6cadcbee634210ec7d66ee0eee6e20b51e2d78..225825f770c917e3fd9b286990dd6af27cdbd4be 100644
--- a/app/src/main/res/drawable/ic_cat_game_trivia.xml
+++ b/app/src/main/res/drawable/ic_cat_game_trivia.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_game_word.xml b/app/src/main/res/drawable/ic_cat_game_word.xml
index c7d5f0d9d04e2a730d78755da3ea74417287331f..375b6af3247732d0dac72937ee454d17c32eceab 100644
--- a/app/src/main/res/drawable/ic_cat_game_word.xml
+++ b/app/src/main/res/drawable/ic_cat_game_word.xml
@@ -24,9 +24,9 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_green_ellipse.xml b/app/src/main/res/drawable/ic_cat_green_ellipse.xml
index 6389994b193905478096dc9ba60421ea49bffca1..123ccb1b6f1129e5cec74bddaf95614b1fbb5fee 100644
--- a/app/src/main/res/drawable/ic_cat_green_ellipse.xml
+++ b/app/src/main/res/drawable/ic_cat_green_ellipse.xml
@@ -22,5 +22,5 @@
android:viewportHeight="11">
+ android:fillColor="@color/colorGreen"/>
diff --git a/app/src/main/res/drawable/ic_cat_health_and_fitness.xml b/app/src/main/res/drawable/ic_cat_health_and_fitness.xml
index b4bc0ce619fc06bbd8149e413e48323ce8719893..af0a875104333d00c7c35bc5bb4b816e86092552 100644
--- a/app/src/main/res/drawable/ic_cat_health_and_fitness.xml
+++ b/app/src/main/res/drawable/ic_cat_health_and_fitness.xml
@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_house_and_home.xml b/app/src/main/res/drawable/ic_cat_house_and_home.xml
index 19c37adb86cd01fd7d2ab62f538b4b755819186d..55cfc2eee2e5ca02899a7ff2275ce6fbbe4e520c 100644
--- a/app/src/main/res/drawable/ic_cat_house_and_home.xml
+++ b/app/src/main/res/drawable/ic_cat_house_and_home.xml
@@ -21,6 +21,6 @@
android:viewportWidth="640"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_libraries_and_demo.xml b/app/src/main/res/drawable/ic_cat_libraries_and_demo.xml
index 5fd1972326b8aa72ba1cbaa77fce1bdd1c5e2077..e513d074b2979cf6146c4d5cf46a09acd7c8ae55 100644
--- a/app/src/main/res/drawable/ic_cat_libraries_and_demo.xml
+++ b/app/src/main/res/drawable/ic_cat_libraries_and_demo.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_lifestyle.xml b/app/src/main/res/drawable/ic_cat_lifestyle.xml
index fa1c55da93cf084ba546b1ea6be66ae751cfb456..692fdb0635215dcf2b35ac7c2dda64d0115078be 100644
--- a/app/src/main/res/drawable/ic_cat_lifestyle.xml
+++ b/app/src/main/res/drawable/ic_cat_lifestyle.xml
@@ -24,9 +24,9 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_maps_and_navigation.xml b/app/src/main/res/drawable/ic_cat_maps_and_navigation.xml
index d1f369593e104abafaf3e57fa939dae8a6ec9217..f1066344db1da0710ccb193c18fb9d74e1a8fd5b 100644
--- a/app/src/main/res/drawable/ic_cat_maps_and_navigation.xml
+++ b/app/src/main/res/drawable/ic_cat_maps_and_navigation.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_medical.xml b/app/src/main/res/drawable/ic_cat_medical.xml
index 42f0acc309769c2e358a9781cc63aa4f99c42822..77efcdd393eaaf4e49fcecca016fab0267fc168b 100644
--- a/app/src/main/res/drawable/ic_cat_medical.xml
+++ b/app/src/main/res/drawable/ic_cat_medical.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_music_and_audio.xml b/app/src/main/res/drawable/ic_cat_music_and_audio.xml
index b6f87e4fb290654c7a6f0b8474bb4275b2327ebb..79bc8b9265c296214038a88207ff372be0fceb3a 100644
--- a/app/src/main/res/drawable/ic_cat_music_and_audio.xml
+++ b/app/src/main/res/drawable/ic_cat_music_and_audio.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_news.xml b/app/src/main/res/drawable/ic_cat_news.xml
index d3f9a4795c52b47fd6e856f9a28485e5eb2091e9..30bc7e8c7d1b39c6074e1a53d21dcd83146f4f87 100644
--- a/app/src/main/res/drawable/ic_cat_news.xml
+++ b/app/src/main/res/drawable/ic_cat_news.xml
@@ -21,6 +21,6 @@
android:viewportWidth="576"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_news_and_magazine.xml b/app/src/main/res/drawable/ic_cat_news_and_magazine.xml
index 6376e4481c2c0a785ac5c64149379a711fd9df26..993b6dd4a2bb19db6293a9c9efd8d6ad96fa4e48 100644
--- a/app/src/main/res/drawable/ic_cat_news_and_magazine.xml
+++ b/app/src/main/res/drawable/ic_cat_news_and_magazine.xml
@@ -24,33 +24,33 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_parenting.xml b/app/src/main/res/drawable/ic_cat_parenting.xml
index 54865a75f49e6a04aad8f81f9310e1e08d85edaa..0a01883533e9f3696a8c1dc070dbd23593cbd8d6 100644
--- a/app/src/main/res/drawable/ic_cat_parenting.xml
+++ b/app/src/main/res/drawable/ic_cat_parenting.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_personalization.xml b/app/src/main/res/drawable/ic_cat_personalization.xml
index 8fb43cd211d02068f47a4146f6153fac9ce896b1..4e0748dda3aa6498d8041265c95a267db1156f64 100644
--- a/app/src/main/res/drawable/ic_cat_personalization.xml
+++ b/app/src/main/res/drawable/ic_cat_personalization.xml
@@ -24,9 +24,9 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_photography.xml b/app/src/main/res/drawable/ic_cat_photography.xml
index 1a4d77bc03c8c0756f7a65cf3f8cc7c070fab990..0a801ce12362e9b8023e71c589bfdbb9cacf811b 100644
--- a/app/src/main/res/drawable/ic_cat_photography.xml
+++ b/app/src/main/res/drawable/ic_cat_photography.xml
@@ -24,24 +24,24 @@
+ android:fillColor="@color/color_default_view_on_accent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_productivity.xml b/app/src/main/res/drawable/ic_cat_productivity.xml
index 79860a18948f7b7cb6018e61084951e4ad7b77d2..934c5f97e4ddebb23d755a8a7fe5a7e54b6c434e 100644
--- a/app/src/main/res/drawable/ic_cat_productivity.xml
+++ b/app/src/main/res/drawable/ic_cat_productivity.xml
@@ -24,36 +24,36 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_reference.xml b/app/src/main/res/drawable/ic_cat_reference.xml
index a4d9168b7bd2fb07d15429a29a4bc2f4d17ea129..28a38b0de2f9940440987590341193a5ca0f7eaa 100644
--- a/app/src/main/res/drawable/ic_cat_reference.xml
+++ b/app/src/main/res/drawable/ic_cat_reference.xml
@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_shopping.xml b/app/src/main/res/drawable/ic_cat_shopping.xml
index f18c1881f4333f5d69bf32ed6c88301cee1d9093..2cc3855f7f73bd595e5fcf3e0aa6bc20e90328c2 100644
--- a/app/src/main/res/drawable/ic_cat_shopping.xml
+++ b/app/src/main/res/drawable/ic_cat_shopping.xml
@@ -24,24 +24,24 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_social.xml b/app/src/main/res/drawable/ic_cat_social.xml
index 546c02480c398dc3a8c56854ece001cc61c4ae7a..d80bde216c842fb69e0c23d8d0968ce8f092e35f 100644
--- a/app/src/main/res/drawable/ic_cat_social.xml
+++ b/app/src/main/res/drawable/ic_cat_social.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_sports.xml b/app/src/main/res/drawable/ic_cat_sports.xml
index 651c534071af2e10613a9cddc36d46a13576a2fc..00c39ad3abbc3392c66d0474424b150e46d6f3b5 100644
--- a/app/src/main/res/drawable/ic_cat_sports.xml
+++ b/app/src/main/res/drawable/ic_cat_sports.xml
@@ -24,21 +24,21 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_tools.xml b/app/src/main/res/drawable/ic_cat_tools.xml
index 385eaeb6c9bd9fa22bdfae2e5a737f738b73fd9e..14b927ed816fbf3506259eb16754b2ce0eb3509e 100644
--- a/app/src/main/res/drawable/ic_cat_tools.xml
+++ b/app/src/main/res/drawable/ic_cat_tools.xml
@@ -24,12 +24,12 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_travel.xml b/app/src/main/res/drawable/ic_cat_travel.xml
index 8aedad3134472eb472573fa92522410d3911892f..49c396ca1ae067be5cdad41e7558cd5d2c38ad95 100644
--- a/app/src/main/res/drawable/ic_cat_travel.xml
+++ b/app/src/main/res/drawable/ic_cat_travel.xml
@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_cat_travel_and_local.xml b/app/src/main/res/drawable/ic_cat_travel_and_local.xml
index 643c0b4d747da0a70b5486f4146836560dfb186a..d6f8c20ef1a6560825d3ee128ffd0815058ffe95 100644
--- a/app/src/main/res/drawable/ic_cat_travel_and_local.xml
+++ b/app/src/main/res/drawable/ic_cat_travel_and_local.xml
@@ -24,15 +24,15 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_video_players.xml b/app/src/main/res/drawable/ic_cat_video_players.xml
index 7ae6b97c6c3e0135916856acb472e8a4e08bae5d..8ac0af3d61449906308ad3a171fa8df40cd97ecd 100644
--- a/app/src/main/res/drawable/ic_cat_video_players.xml
+++ b/app/src/main/res/drawable/ic_cat_video_players.xml
@@ -24,27 +24,27 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_cat_weather.xml b/app/src/main/res/drawable/ic_cat_weather.xml
index fcaafe1c003b659488937a6c650299358471397d..388d54fff6c3ac71f082a692c3a012cfe6aa0777 100644
--- a/app/src/main/res/drawable/ic_cat_weather.xml
+++ b/app/src/main/res/drawable/ic_cat_weather.xml
@@ -26,28 +26,28 @@
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_dialog_info.xml b/app/src/main/res/drawable/ic_dialog_info.xml
index 81c4c0b13bcdeed86b1bfd7d5ed46922020c3bfc..e0b1e064ac6ba88e52859b32b249bb7506f5ddd1 100644
--- a/app/src/main/res/drawable/ic_dialog_info.xml
+++ b/app/src/main/res/drawable/ic_dialog_info.xml
@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
index c06910320afc10c8fc8db88c43ec8fd64fe6bdb3..384e72776652d9b807df05cf97e5f3fd80787edc 100644
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
diff --git a/app/src/main/res/drawable/ic_package_icon.xml b/app/src/main/res/drawable/ic_package_icon.xml
index 80a90bb913a5d60b815ce22f0fe3ece2392aafc0..97591eb73417b4c018e8920282d48f2d395c90d2 100644
--- a/app/src/main/res/drawable/ic_package_icon.xml
+++ b/app/src/main/res/drawable/ic_package_icon.xml
@@ -22,6 +22,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_red_ellipse.xml b/app/src/main/res/drawable/ic_red_ellipse.xml
index a17430c045fc9234d8fc03f17c385084525848e9..804c34a5e7914a8f2df78c5dc1514ef54bc328f2 100644
--- a/app/src/main/res/drawable/ic_red_ellipse.xml
+++ b/app/src/main/res/drawable/ic_red_ellipse.xml
@@ -22,5 +22,5 @@
android:viewportHeight="11">
+ android:fillColor="@color/colorRed"/>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 4c9d7965388d4f41b951d0e49c6aa2f1406ef509..4bc9b1e442cf2ec6b0c77fadb022b0bc6bfc8708 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,10 +1,9 @@
+ android:fillColor="@color/colorAccent"/>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index fa1de35c51184bff98fd6c83ea3637c0c2600e4e..458e194a95a3bc33866a3e8721e26e3b1e87980b 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,31 +1,30 @@
diff --git a/app/src/main/res/drawable/ic_yellow_ellipse.xml b/app/src/main/res/drawable/ic_yellow_ellipse.xml
index 641f9f1818bff04bd0a3d013d5da23051350cfb8..6133d7c26eb6f371305ce563212f2c50d5e70a2d 100644
--- a/app/src/main/res/drawable/ic_yellow_ellipse.xml
+++ b/app/src/main/res/drawable/ic_yellow_ellipse.xml
@@ -22,5 +22,5 @@
android:viewportHeight="11">
+ android:fillColor="@color/colorYellow"/>
diff --git a/app/src/main/res/layout/activity_app_request.xml b/app/src/main/res/layout/activity_app_request.xml
index b47bfebc4ac2ef4bad722768ce903c58effbed93..226fe76406546350a696a995dc20a90b3eb81e3f 100644
--- a/app/src/main/res/layout/activity_app_request.xml
+++ b/app/src/main/res/layout/activity_app_request.xml
@@ -94,7 +94,7 @@
android:enabled="false"
android:foreground="?android:selectableItemBackground"
android:text="@string/submit_button_text"
- android:textColor="@android:color/white"
+ android:textColor="@color/color_default_view_on_accent"
app:layout_constraintTop_toBottomOf="@id/package_name_edit_text" />
+ android:src="@drawable/ic_app_rating" />
+ android:src="@drawable/ic_app_privacy" />
+ android:contentDescription="@string/error_incident" />
+ android:contentDescription="@string/menu_search" />
+ android:contentDescription="@string/menu_updates" />
- #FFFFFF
- #FFFFFF
- #007FFF
+ @lineageos.platform:color/color_default_primary
+ @lineageos.platform:color/color_default_primary_dark
+ @lineageos.platform:color/color_default_accent
- #CFD8DC
+ @lineageos.platform:color/color_default_divider
@color/colorAccent
- #C8CED0
- #848484
+ @lineageos.platform:color/color_default_gray1
+ @lineageos.platform:color/color_default_gray2
+
+ @lineageos.platform:color/color_default_green1
+ @lineageos.platform:color/color_default_red1
+ #FFEB3B
- #4CAF50
- #FFEB3B
- #F44336
+ @color/colorGreen
+ @color/colorYellow
+ @color/colorRed
@color/colorPrimaryDark
- #FFFFFF
- #FAFAFA
- #CC000000
- #8C000000
+ @lineageos.platform:color/color_default_foreground
+ @lineageos.platform:color/color_default_background
+ @lineageos.platform:color/color_default_primary_text
+ @lineageos.platform:color/color_default_secondary_text
+
+ @lineageos.platform:color/color_default_view_on_accent