From 2f2fb535c9c750151033eced70ffb48e9ee1ca88 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Wed, 13 May 2020 22:31:13 +0400
Subject: [PATCH] moved everything to styles

---
 .../manager/ui/fragments/SettingsFragment.kt  |   4 +-
 .../main/res/drawable/ic_microg_settings.xml  |  10 ++
 .../fragment_vanced_language_selection.xml    |  28 +---
 .../fragment_vanced_theme_selection.xml       |  28 +---
 .../fragment_vanced_variant_selection.xml     |  28 +---
 .../res/layout/include_about_app_devs.xml     |  21 +--
 .../main/res/layout/include_about_sources.xml |  48 ++-----
 .../res/layout/include_about_vanced_devs.xml  |  23 +---
 .../main/res/layout/include_changelogs.xml    |  18 +--
 app/src/main/res/layout/include_microg.xml    | 100 +++++----------
 .../main/res/layout/include_network_error.xml |   9 +-
 .../main/res/layout/include_useful_links.xml  |  37 +-----
 app/src/main/res/layout/include_vanced.xml    |  72 ++---------
 .../main/res/layout/include_vanced_medias.xml |  45 +------
 app/src/main/res/values/styles.xml            | 121 +++++++++++++++++-
 15 files changed, 227 insertions(+), 365 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_microg_settings.xml

diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index 1d0e86e1..08011ab6 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -16,11 +16,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
         //Fuck Android 6 android 5 users! Because theme is not working
         //we can't display preference for them.
         //They should've upgraded to something newer
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+        /*if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             val prefScreen: PreferenceScreen? = findPreference("prefScreen")
             val prefCategory: PreferenceCategory? = findPreference("interface_category")
             prefScreen?.removePreference(prefCategory)
-        }
+        }*/
 
         activity?.title = getString(R.string.title_settings)
         setHasOptionsMenu(true)
diff --git a/app/src/main/res/drawable/ic_microg_settings.xml b/app/src/main/res/drawable/ic_microg_settings.xml
new file mode 100644
index 00000000..d4851e31
--- /dev/null
+++ b/app/src/main/res/drawable/ic_microg_settings.xml
@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="29dp"
+    android:height="29dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?colorPrimary"
+        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_vanced_language_selection.xml b/app/src/main/res/layout/fragment_vanced_language_selection.xml
index bfb58526..03b51e5b 100644
--- a/app/src/main/res/layout/fragment_vanced_language_selection.xml
+++ b/app/src/main/res/layout/fragment_vanced_language_selection.xml
@@ -6,16 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="@dimen/eightdp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="?colorSurfaceVariant"
-        app:cardElevation="0dp"
-        app:cardPreventCornerOverlap="true"
+        style="@style/InstallMaterialCard"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
@@ -25,12 +16,7 @@
 
             <TextView
                 android:id="@+id/install_language_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textAlignment="center"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo_bold"
+                style="@style/InstallCardTitle"
                 android:text="@string/choose_preferred_language" />
 
             <TextView
@@ -57,16 +43,10 @@
             </FrameLayout>
 
             <com.google.android.material.button.MaterialButton
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/InstallButtonStyle"
                 android:id="@+id/vanced_install_finish"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="6dp"
                 android:text="@string/finish"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_done_black_24dp"
-                app:iconGravity="end"
-                android:layout_gravity="end"/>
+                app:icon="@drawable/ic_done_black_24dp" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_vanced_theme_selection.xml b/app/src/main/res/layout/fragment_vanced_theme_selection.xml
index 2eef62de..0a34291f 100644
--- a/app/src/main/res/layout/fragment_vanced_theme_selection.xml
+++ b/app/src/main/res/layout/fragment_vanced_theme_selection.xml
@@ -6,16 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="12dp"
-        app:cardElevation="0dp"
-        app:cardCornerRadius="@dimen/eightdp"
-        app:cardBackgroundColor="?colorSurfaceVariant"
-        app:cardPreventCornerOverlap="true"
+        style="@style/InstallMaterialCard"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
@@ -25,12 +16,7 @@
 
             <TextView
                 android:id="@+id/install_theme_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textAlignment="center"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo_bold"
+                style="@style/InstallCardTitle"
                 android:text="@string/choose_preferred_theme" />
 
             <RadioGroup
@@ -58,16 +44,10 @@
             </RadioGroup>
 
             <com.google.android.material.button.MaterialButton
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/InstallButtonStyle"
                 android:id="@+id/vanced_next_to_variant"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="6dp"
                 android:text="@string/next"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_keyboard_next"
-                app:iconGravity="end"
-                android:layout_gravity="end"/>
+                app:icon="@drawable/ic_keyboard_next" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_vanced_variant_selection.xml b/app/src/main/res/layout/fragment_vanced_variant_selection.xml
index 13450bdb..742c1f4d 100644
--- a/app/src/main/res/layout/fragment_vanced_variant_selection.xml
+++ b/app/src/main/res/layout/fragment_vanced_variant_selection.xml
@@ -6,16 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="12dp"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="@dimen/eightdp"
-        app:cardBackgroundColor="?colorSurfaceVariant"
-        app:cardElevation="0dp"
-        app:cardPreventCornerOverlap="true"
+        style="@style/InstallMaterialCard"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
@@ -25,12 +16,7 @@
 
             <TextView
                 android:id="@+id/install_theme_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:textAlignment="center"
-                android:textSize="18sp"
-                android:fontFamily="@font/exo_bold"
+                style="@style/InstallCardTitle"
                 android:text="@string/choose_preferred_variant" />
 
             <RadioGroup
@@ -58,16 +44,10 @@
             </RadioGroup>
 
             <com.google.android.material.button.MaterialButton
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/InstallButtonStyle"
                 android:id="@+id/vanced_next_to_language"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="6dp"
                 android:text="@string/next"
-                android:textAllCaps="false"
-                app:icon="@drawable/ic_keyboard_next"
-                app:iconGravity="end"
-                android:layout_gravity="end"/>
+                app:icon="@drawable/ic_keyboard_next" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/include_about_app_devs.xml b/app/src/main/res/layout/include_about_app_devs.xml
index a7c8f75e..b8b20a82 100644
--- a/app/src/main/res/layout/include_about_app_devs.xml
+++ b/app/src/main/res/layout/include_about_app_devs.xml
@@ -3,15 +3,8 @@
     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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="8dp"
-    app:cardPreventCornerOverlap="true"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:contentPaddingRight="8dp"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingBottom="8dp"
+    style="@style/MaterialCard"
+    app:contentPaddingTop="2dp"
     tools:ignore="HardcodedText">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -19,17 +12,11 @@
         android:layout_height="match_parent">
 
         <TextView
+            style="@style/AboutCardTitle"
             android:id="@+id/about_card_vancedTeam"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/manager_devs"
-            android:textSize="24sp"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:fontFamily="@font/exo_semibold"
-            android:layout_marginTop="4dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_about_sources.xml b/app/src/main/res/layout/include_about_sources.xml
index 49afaaca..c54a8c83 100644
--- a/app/src/main/res/layout/include_about_sources.xml
+++ b/app/src/main/res/layout/include_about_sources.xml
@@ -3,39 +3,25 @@
     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"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardCornerRadius="8dp"
-    app:cardElevation="0dp"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingRight="8dp"
+    style="@style/MaterialCard"
+    app:contentPaddingTop="2dp"
     app:contentPaddingBottom="8dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <TextView
+            style="@style/AboutCardTitle"
             android:id="@+id/about_card_vancedTeam"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/sources"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:textSize="24sp"
-            android:fontFamily="@font/exo_semibold"
-            android:layout_marginTop="2dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/about_github_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintTop_toBottomOf="@id/about_card_vancedTeam"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:cardCornerRadius="8dp"
+            style="@style/InnerMaterialCard"
             app:contentPaddingRight="@dimen/eightdp"
             app:contentPaddingLeft="@dimen/eightdp"
             app:cardBackgroundColor="#000000">
@@ -51,33 +37,21 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/about_github_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_gravity="start"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@android:color/transparent"
-                        android:layout_marginEnd="16dp"
-                        android:backgroundTint="@android:color/transparent"
+                        style="@style/SocialButtonStyle"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/about_license_button"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:icon="@drawable/github"
-                        app:iconGravity="textStart"
-                        app:iconPadding="0dp"/>
+                        app:icon="@drawable/github" />
 
                     <com.google.android.material.button.MaterialButton
                         tools:ignore="HardcodedText"
                         android:id="@+id/about_license_button"
-                        style="@style/Widget.AppCompat.Button.Borderless"
+                        style="@style/SocialButtonStyle"
                         android:layout_marginStart="16dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
                         android:text="GPL"
                         android:textSize="21sp"
                         android:fontFamily="@font/exo_semibold"
-                        android:background="@android:color/transparent"
-                        android:backgroundTint="@android:color/transparent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintStart_toEndOf="@id/about_github_button"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -89,6 +63,6 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/include_about_vanced_devs.xml b/app/src/main/res/layout/include_about_vanced_devs.xml
index 99acadc6..245b461d 100644
--- a/app/src/main/res/layout/include_about_vanced_devs.xml
+++ b/app/src/main/res/layout/include_about_vanced_devs.xml
@@ -3,33 +3,20 @@
     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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="8dp"
-    app:cardPreventCornerOverlap="true"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:contentPaddingRight="8dp"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingBottom="8dp"
-    tools:ignore="HardcodedText">
+    style="@style/MaterialCard"
+    tools:ignore="HardcodedText"
+    app:contentPaddingTop="2dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <TextView
+            style="@style/AboutCardTitle"
             android:id="@+id/about_card_vancedTeam"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:text="@string/vanced_team"
-            android:textSize="24sp"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:fontFamily="@font/exo_semibold"
-            android:layout_marginTop="4dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_changelogs.xml b/app/src/main/res/layout/include_changelogs.xml
index a76cafdd..903dcc94 100644
--- a/app/src/main/res/layout/include_changelogs.xml
+++ b/app/src/main/res/layout/include_changelogs.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView
+    style="@style/MaterialCard"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:cardPreventCornerOverlap="true">
+    app:contentPaddingTop="2dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,15 +11,9 @@
         android:orientation="vertical">
 
         <TextView
+            style="@style/CardTitle"
             android:id="@+id/changelog_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/exo_bold"
-            android:text="@string/changelogs"
-            android:textSize="18sp"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:layout_marginTop="4dp"
-            android:layout_marginStart="@dimen/eightdp"/>
+            android:text="@string/changelogs" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/include_microg.xml b/app/src/main/res/layout/include_microg.xml
index 78ce3223..123e30b6 100644
--- a/app/src/main/res/layout/include_microg.xml
+++ b/app/src/main/res/layout/include_microg.xml
@@ -2,51 +2,37 @@
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:cardPreventCornerOverlap="true"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingRight="8dp"
-    app:contentPaddingTop="5dp"
-    app:contentPaddingBottom="5dp">
+    style="@style/MaterialCard">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:id="@+id/microg_title"
+        <ImageView
+            android:id="@+id/home_microg_logo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/exo_bold"
-            android:text="@string/microg"
-            android:textColor="?colorPrimary"
-            android:textSize="24sp"
+            app:srcCompat="@drawable/ic_microg"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier"
-            android:drawableStart="@drawable/ic_microg"
-            android:drawablePadding="8dp"/>
+            app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
 
-        <Button
+        <TextView
+            style="@style/TextAppTitle"
+            android:id="@+id/microg_title"
+            android:text="@string/microg"
+            app:layout_constraintStart_toEndOf="@id/home_microg_logo"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
+
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/microg_installbtn"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/exo_bold"
+            style="@style/ButtonStyle"
             android:text="@string/install"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
-            app:backgroundTint="?colorPrimary"
             app:icon="@drawable/outline_cloud_download_24"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn"
-            android:scrollbars="none"/>
+            app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/microg_title_buttons_barrier"
@@ -64,22 +50,14 @@
             app:layout_constraintBottom_toTopOf="@id/linearLayout2">
 
             <TextView
+                style="@style/AppVer"
                 android:id="@+id/microg_latest"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/exo"
-                android:text="@string/latest"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:textSize="13sp" />
+                android:text="@string/latest" />
 
             <TextView
+                style="@style/AppVer.Bold"
                 android:id="@+id/microg_latest_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/eightdp"
-                android:fontFamily="@font/exo_semibold"
-                android:text="@string/loading"
-                android:textColor="?attr/colorOnSurfaceVariant" />
+                android:text="@string/loading" />
 
         </LinearLayout>
 
@@ -92,49 +70,33 @@
             app:layout_constraintBottom_toBottomOf="parent">
 
             <TextView
+                style="@style/AppVer"
                 android:id="@+id/microg_installed"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/exo"
-                android:text="@string/installed"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:textSize="13sp" />
+                android:text="@string/installed" />
 
             <TextView
+                style="@style/AppVer.Bold"
                 android:id="@+id/microg_installed_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/eightdp"
-                android:fontFamily="@font/exo_semibold"
-                android:text="@string/loading"
-                android:textColor="?attr/colorOnSurfaceVariant" />
+                android:text="@string/loading" />
 
         </LinearLayout>
 
         <ImageView
+            style="@style/ClickableImageWidget"
             android:id="@+id/microg_settingsbtn"
-            android:layout_width="30dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="8dp"
-            android:tint="?colorPrimary"
-            android:clickable="true"
-            app:srcCompat="@drawable/ic_settings_black_24dp"
+            app:srcCompat="@drawable/ic_microg_settings"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/microg_uninstallbtn"
-            android:scrollbars="none"/>
+            app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier"
+            android:layout_marginEnd="4dp"/>
 
         <ImageView
+            style="@style/ClickableImageWidget.Red"
             android:id="@+id/microg_uninstallbtn"
-            android:layout_width="30dp"
-            android:layout_height="40dp"
-            android:fontFamily="@font/exo_semibold"
             app:srcCompat="@drawable/ic_delete_black_24dp"
-            android:tint="@color/Red"
-            android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/microg_installbtn"
-            android:scrollbars="none"/>
+            app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/include_network_error.xml b/app/src/main/res/layout/include_network_error.xml
index 3052dc57..7de405c3 100644
--- a/app/src/main/res/layout/include_network_error.xml
+++ b/app/src/main/res/layout/include_network_error.xml
@@ -2,14 +2,7 @@
 <com.vanced.manager.ui.core.SlidingCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:cardPreventCornerOverlap="true"
-    app:contentPaddingRight="8dp"
-    app:contentPaddingLeft="8dp">
+    style="@style/MaterialCard">
 
     <TextView
         android:id="@+id/network_errortxt"
diff --git a/app/src/main/res/layout/include_useful_links.xml b/app/src/main/res/layout/include_useful_links.xml
index 55d9ed33..26277147 100644
--- a/app/src/main/res/layout/include_useful_links.xml
+++ b/app/src/main/res/layout/include_useful_links.xml
@@ -2,15 +2,8 @@
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:cardElevation="0dp"
-    app:contentPaddingBottom="4dp"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingRight="8dp"
-    app:cardPreventCornerOverlap="true">
+    style="@style/MaterialCard"
+    app:contentPaddingTop="2dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,20 +11,14 @@
         android:orientation="vertical">
 
         <TextView
+            style="@style/CardTitle"
             android:id="@+id/useful_links_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:fontFamily="@font/exo_bold"
-            android:text="@string/useful_links"
-            android:textSize="18sp"
-            android:textColor="?attr/colorOnSurfaceVariant" />
+            android:text="@string/useful_links" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginTop="4dp">
+            android:orientation="vertical">
 
             <include
                 android:id="@+id/home_vanced_medias_wrapper"
@@ -40,26 +27,16 @@
                 android:layout_height="wrap_content" />
 
             <com.google.android.material.button.MaterialButton
+                style="@style/LinkButtonStyle"
                 android:id="@+id/brave_button"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:text="@string/support_us"
                 android:layout_marginTop="5dp"
-                android:textAllCaps="false"
-                android:textColor="#ffffff"
-                app:backgroundTint="?colorPrimary"
                 app:cornerRadius="@dimen/eightdp" />
 
             <com.google.android.material.button.MaterialButton
+                style="@style/LinkButtonStyle"
                 android:id="@+id/website_button"
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:text="@string/website_text"
-                android:textAllCaps="false"
-                app:backgroundTint="?colorPrimary"
-                android:textColor="#ffffff"
                 app:cornerRadius="@dimen/eightdp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/include_vanced.xml b/app/src/main/res/layout/include_vanced.xml
index 6105a7c4..4f857be8 100644
--- a/app/src/main/res/layout/include_vanced.xml
+++ b/app/src/main/res/layout/include_vanced.xml
@@ -3,16 +3,7 @@
     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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardElevation="0dp"
-    app:cardPreventCornerOverlap="true"
-    app:cardBackgroundColor="?colorSurfaceVariant"
-    app:contentPaddingRight="8dp"
-    app:contentPaddingLeft="8dp"
-    app:contentPaddingTop="5dp"
-    app:contentPaddingBottom="5dp"
+    style="@style/MaterialCard"
     tools:ignore="ContentDescription, KeyboardInaccessibleWidget">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -29,34 +20,20 @@
             app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
 
         <TextView
+            style="@style/TextAppTitle"
             android:id="@+id/vanced_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?colorPrimary"
-            android:drawablePadding="8dp"
-            android:fontFamily="@font/exo_bold"
             android:text="@string/vanced"
-            android:textSize="24sp"
             app:layout_constraintStart_toEndOf="@id/home_vanced_logo"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier"
-            android:layout_marginStart="8dp"/>
+            app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/vanced_installbtn"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            app:backgroundTint="?colorPrimary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/ButtonStyle"
             android:text="@string/install"
-            android:textAllCaps="false"
-            android:textColor="#ffffff"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            android:fontFamily="@font/exo_bold"
-            app:icon="@drawable/outline_cloud_download_24"
-            android:scrollbars="none"/>
+            app:icon="@drawable/outline_cloud_download_24" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/vanced_title_buttons_barrier"
@@ -66,17 +43,12 @@
             app:constraint_referenced_ids="home_vanced_logo, vanced_title, vanced_installbtn"/>
 
         <ImageView
+            style="@style/ClickableImageWidget.Red"
             android:id="@+id/vanced_uninstallbtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:iconPadding="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vanced_title_buttons_barrier"
-            android:clickable="true"
-            app:srcCompat="@drawable/ic_delete_black_24dp"
-            android:tint="@color/Red"
-            android:scrollbars="none"/>
+            app:srcCompat="@drawable/ic_delete_black_24dp" />
 
         <LinearLayout
             android:id="@+id/vanced_remote_latest_version"
@@ -87,21 +59,13 @@
             app:layout_constraintTop_toBottomOf="@+id/vanced_title_buttons_barrier">
 
             <TextView
+                style="@style/AppVer"
                 android:id="@+id/vanced_latest"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/latest"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo"
-                android:textSize="13sp" />
+                android:text="@string/latest" />
 
             <TextView
+                style="@style/AppVer.Bold"
                 android:id="@+id/vanced_latest_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/eightdp"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo_semibold"
                 android:text="@string/loading" />
 
         </LinearLayout>
@@ -114,21 +78,13 @@
             app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version">
 
             <TextView
+                style="@style/AppVer"
                 android:id="@+id/vanced_installed"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/installed"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo"
-                android:textSize="13sp" />
+                android:text="@string/installed" />
 
             <TextView
+                style="@style/AppVer.Bold"
                 android:id="@+id/vanced_installed_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/eightdp"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:fontFamily="@font/exo_semibold"
                 android:text="@string/loading" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/include_vanced_medias.xml b/app/src/main/res/layout/include_vanced_medias.xml
index eb01f518..904bfb43 100644
--- a/app/src/main/res/layout/include_vanced_medias.xml
+++ b/app/src/main/res/layout/include_vanced_medias.xml
@@ -2,14 +2,9 @@
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/InnerMaterialCard"
     android:id="@+id/social_media_card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/eightdp"
-    android:layout_marginEnd="@dimen/eightdp"
-    app:cardBackgroundColor="#6958D0"
-    app:cardCornerRadius="@dimen/eightdp"
-    app:cardElevation="0dp">
+    app:cardBackgroundColor="#6958D0">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -45,30 +40,16 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/discordbtn"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:backgroundTint="@android:color/transparent"
+                    style="@style/SocialButtonStyle"
                     app:icon="@drawable/discord"
-                    app:iconPadding="0dp"
-                    app:iconGravity="textStart"
-                    app:iconTint="#ffffff"
                     app:layout_constraintEnd_toStartOf="@id/tgbtn"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"/>
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/tgbtn"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:backgroundTint="@android:color/transparent"
+                    style="@style/SocialButtonStyle"
                     app:icon="@drawable/telegram"
-                    app:iconPadding="0dp"
-                    app:iconGravity="textStart"
-                    app:iconTint="#ffffff"
                     app:layout_constraintEnd_toStartOf="@id/twitterbtn"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toEndOf="@id/discordbtn"/>
@@ -76,30 +57,16 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/twitterbtn"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:backgroundTint="@android:color/transparent"
+                    style="@style/SocialButtonStyle"
                     app:icon="@drawable/twitter"
-                    app:iconPadding="0dp"
-                    app:iconGravity="textStart"
-                    app:iconTint="#ffffff"
                     app:layout_constraintEnd_toStartOf="@id/redditbtn"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toEndOf="@id/tgbtn"/>
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/redditbtn"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:backgroundTint="@android:color/transparent"
+                    style="@style/SocialButtonStyle"
                     app:icon="@drawable/ic_reddit"
-                    app:iconGravity="textStart"
-                    app:iconPadding="0dp"
-                    app:iconTint="#ffffff"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toEndOf="@id/twitterbtn"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8bed069a..91365331 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,130 @@
 <resources>
 
     <style name="SplashTheme" parent="Theme.MaterialComponents.NoActionBar">
-
         <item name="android:windowBackground">@drawable/splash_logo</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">true</item>
+    </style>
 
+    <style name="ButtonStyle" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="textAllCaps">false</item>
+        <item name="backgroundTint">?colorPrimary</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="fontFamily">@font/exo_bold</item>
+    </style>
+
+    <style name="InstallButtonStyle" parent="ButtonStyle">
+        <item name="android:layout_marginEnd">6dp</item>
+        <item name="android:layout_gravity">end</item>
+        <item name="iconGravity">end</item>
+    </style>
+
+    <style name="SocialButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:backgroundTint">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="iconPadding">0dp</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconTint">#ffffff</item>
+    </style>
+
+    <style name="LinkButtonStyle" parent="ButtonStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="cornerRadius">8dp</item>
+    </style>
+
+    <style name="MaterialCard" parent="Widget.MaterialComponents.CardView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="cardCornerRadius">8dp</item>
+        <item name="cardBackgroundColor">?colorSurfaceVariant</item>
+        <item name="cardElevation">0dp</item>
+        <item name="contentPaddingLeft">8dp</item>
+        <item name="contentPaddingRight">8dp</item>
+        <item name="contentPaddingTop">4dp</item>
+        <item name="contentPaddingBottom">4dp</item>
+        <item name="cardPreventCornerOverlap">true</item>
+    </style>
+
+    <style name="InstallMaterialCard" parent="MaterialCard">
+        <item name="contentPaddingLeft">0dp</item>
+        <item name="contentPaddingRight">0dp</item>
+        <item name="contentPaddingTop">0dp</item>
+        <item name="contentPaddingBottom">0dp</item>
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
+        <item name="android:layout_marginTop">12dp</item>
+    </style>
+
+    <style name="InnerMaterialCard" parent="MaterialCard">
+        <item name="contentPaddingTop">0dp</item>
+        <item name="contentPaddingBottom">0dp</item>
+        <item name="contentPaddingLeft">0dp</item>
+        <item name="contentPaddingRight">0dp</item>
+    </style>
+
+    <style name="TextAppTitle" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?colorPrimary</item>
+        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:layout_marginStart">8dp</item>
+    </style>
+
+    <style name="CardTitle" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?colorOnSurfaceVariant</item>
+        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="InstallCardTitle" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?colorOnSurfaceVariant</item>
+        <item name="android:fontFamily">@font/exo_bold</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="AboutCardTitle" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?colorOnSurfaceVariant</item>
+        <item name="android:fontFamily">@font/exo_semibold</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="AppVer" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?colorOnSurfaceVariant</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:fontFamily">@font/exo</item>
+    </style>
+
+    <style name="AppVer.Bold" parent="AppVer">
+        <item name="android:fontFamily">@font/exo_semibold</item>
+        <item name="android:layout_marginStart">8dp</item>
+    </style>
+
+    <style name="ClickableImageWidget">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:clickable">true</item>
+        <item name="android:tint">?colorPrimary</item>
+        <item name="iconPadding">0dp</item>
+    </style>
+
+    <style name="ClickableImageWidget.Red" parent="ClickableImageWidget">
+        <item name="android:tint">@color/Red</item>
     </style>
 
 </resources>
\ No newline at end of file