Merge pull request #3511 from vector-im/feature/bma/theme_again

Create a module with themes and styles

attachment-viewer/build.gradle

@@ -47,6 +47,8 @@ android {
 }
 
 dependencies {
+    implementation project(":library:ui-styles")
+
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

attachment-viewer/src/main/res/layout/item_image_attachment.xml

@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <com.github.chrisbanes.photoview.PhotoView
         android:id="@+id/touchImageView"
-        android:visibility="visible"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/imageLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:visibility="visible"
-        tools:visibility="gone" />
+        android:layout_centerInParent="true" />
 
 </RelativeLayout>

attachment-viewer/src/main/res/layout/item_video_attachment.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/videoThumbnailImage"
@@ -19,29 +19,29 @@
 
     <ImageView
         android:id="@+id/videoControlIcon"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
-        tools:visibility="visible"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        />
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/videoLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerInParent="true"
         android:visibility="invisible"
         tools:visibility="visible" />
 
     <TextView
         android:id="@+id/videoMediaViewerErrorView"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_margin="16dp"
-        android:textSize="16sp"
+        android:textColor="?colorError"
         android:visibility="gone"
         tools:text="Error"
         tools:visibility="visible" />

attachment-viewer/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-
-    <color name="half_transparent_status_bar">#80000000</color>
-
-</resources>

library/ui-styles/.gitignore

@@ -0,0 +1 @@
+/build

library/ui-styles/build.gradle

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    // Pref theme
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    // PFLockScreen attrs
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
+    // dialpad dimen
+    implementation 'im.dlg:android-dialer:1.2.5'
+}

library/ui-styles/src/debug/AndroidManifest.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.lib.ui.styles">
+
+    <application android:theme="@style/Theme.Vector.Light">
+        <activity
+            android:name=".debug.DebugMaterialThemeLightDefaultActivity"
+            android:theme="@style/Theme.Debug.Light" />
+        <activity
+            android:name=".debug.DebugMaterialThemeLightTestActivity"
+            android:theme="@style/Theme.Debug.Light.Test" />
+        <activity
+            android:name=".debug.DebugMaterialThemeLightVectorActivity"
+            android:theme="@style/Theme.Vector.Light" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkDefaultActivity"
+            android:theme="@style/Theme.Debug.Dark" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkTestActivity"
+            android:theme="@style/Theme.Debug.Dark.Test" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkVectorActivity"
+            android:theme="@style/Theme.Vector.Dark" />
+
+        <activity
+            android:name=".debug.DebugVectorButtonStylesLightActivity"
+            android:theme="@style/Theme.Vector.Light" />
+        <activity
+            android:name=".debug.DebugVectorButtonStylesDarkActivity"
+            android:theme="@style/Theme.Vector.Dark" />
+
+        <activity
+            android:name=".debug.DebugVectorTextViewLightActivity"
+            android:theme="@style/Theme.Vector.Light" />
+        <activity
+            android:name=".debug.DebugVectorTextViewDarkActivity"
+            android:theme="@style/Theme.Vector.Dark" />
+    </application>
+
+</manifest>

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import im.vector.app.databinding.ActivityTestMaterialThemeBinding
+import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
 
 class DebugBottomSheet : BottomSheetDialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 import android.os.Bundle
 import android.view.Menu
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import im.vector.app.R
-import im.vector.app.core.utils.toast
-import im.vector.app.databinding.ActivityTestMaterialThemeBinding
+import im.vector.lib.ui.styles.R
+import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
 
 // Rendering is not the same with VectorBaseActivity
 abstract class DebugMaterialThemeActivity : AppCompatActivity() {
@@ -46,14 +46,14 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
         }
 
         views.debugShowToast.setOnClickListener {
-            toast("Toast")
+            Toast.makeText(this, "Toast", Toast.LENGTH_SHORT).show()
         }
 
         views.debugShowDialog.setOnClickListener {
             MaterialAlertDialogBuilder(this)
                     .setTitle("Dialog title")
                     .setMessage("Dialog content")
-                    .setIcon(R.drawable.ic_settings_x)
+                    .setIcon(R.drawable.ic_debug_icon)
                     .setPositiveButton("Positive", null)
                     .setNegativeButton("Negative", null)
                     .setNeutralButton("Neutral", null)

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkDefaultActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkTestActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkVectorActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightDefaultActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightTestActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightVectorActivity : DebugMaterialThemeActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.lib.ui.styles.databinding.ActivityDebugButtonStylesBinding
+
+abstract class DebugVectorButtonStylesActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val views = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
+        setContentView(views.root)
+    }
+}

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityDebugButtonStylesBinding
-
-class DebugVectorButtonStylesActivity : VectorBaseActivity<ActivityDebugButtonStylesBinding>() {
-    override fun getBinding() = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
-}
+class DebugVectorButtonStylesDarkActivity : DebugVectorButtonStylesActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorButtonStylesLightActivity : DebugVectorButtonStylesActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.lib.ui.styles.databinding.ActivityDebugTextViewBinding
+
+// Rendering is not the same with VectorBaseActivity
+abstract class DebugVectorTextViewActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val views = ActivityDebugTextViewBinding.inflate(layoutInflater)
+        setContentView(views.root)
+    }
+}

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorTextViewDarkActivity : DebugVectorTextViewActivity()

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorTextViewLightActivity : DebugVectorTextViewActivity()

library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,10m-2.455,0a2.455,2.455 0,1 1,4.91 0a2.455,2.455 0,1 1,-4.91 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#454545"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.055,12.455a1.35,1.35 0,0 0,0.27 1.489l0.049,0.049a1.636,1.636 0,1 1,-2.316 2.315l-0.049,-0.049a1.35,1.35 0,0 0,-1.489 -0.27,1.35 1.35,0 0,0 -0.818,1.236v0.139a1.636,1.636 0,0 1,-3.273 0v-0.074a1.35,1.35 0,0 0,-0.884 -1.235,1.35 1.35,0 0,0 -1.489,0.27l-0.049,0.049a1.636,1.636 0,1 1,-2.315 -2.316l0.049,-0.049a1.35,1.35 0,0 0,0.27 -1.489,1.35 1.35,0 0,0 -1.236,-0.818h-0.139a1.636,1.636 0,0 1,0 -3.273h0.074a1.35,1.35 0,0 0,1.235 -0.884,1.35 1.35,0 0,0 -0.27,-1.489l-0.049,-0.049a1.636,1.636 0,1 1,2.316 -2.315l0.049,0.049a1.35,1.35 0,0 0,1.489 0.27h0.065a1.35,1.35 0,0 0,0.819 -1.236v-0.139a1.636,1.636 0,0 1,3.272 0v0.074a1.35,1.35 0,0 0,0.819 1.235,1.35 1.35,0 0,0 1.489,-0.27l0.049,-0.049a1.636,1.636 0,1 1,2.315 2.316l-0.049,0.049a1.35,1.35 0,0 0,-0.27 1.489v0.065a1.35,1.35 0,0 0,1.236 0.819h0.139a1.636,1.636 0,0 1,0 3.272h-0.074a1.35,1.35 0,0 0,-1.235 0.819z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#454545"
+      android:strokeLineCap="round"/>
+</vector>

library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".features.debug.DebugVectorButtonStylesActivity"
+    tools:context=".debug.DebugVectorButtonStylesActivity"
     tools:ignore="HardcodedText">
 
     <LinearLayout
@@ -12,93 +12,100 @@
         android:orientation="vertical"
         android:padding="16dp">
 
+        <!-- Note: Default style is @style/Widget.Vector.Button in the theme -->
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Widget.Vector.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Widget.Vector.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Line1\nLine 2" />
+
+        <Button
+            style="@style/Widget.Vector.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Default disabled" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Text" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Text disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Positive" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Positive disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Destructive" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Destructive disabled" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Widget.Vector.Button.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Bot" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Widget.Vector.Button.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Bot disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="Outline" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Outline disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Widget.Vector.Button.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Poll " />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Widget.Vector.Button.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
@@ -112,14 +119,14 @@
             android:padding="8dp">
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Widget.Vector.Button.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="Alerter" />
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Widget.Vector.Button.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="false"

library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Title\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Title.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Title.Medium\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Subtitle\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Subtitle.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Body\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Body.Medium\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Caption\nline 2" />
+
+    <TextView
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextAppearance.Vector.Micro\nline 2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Default (TextAppearance.Vector.Body)\nline 2" />
+
+</LinearLayout>

library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml

@@ -5,8 +5,8 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".features.debug.DebugMaterialThemeActivity"
-    tools:ignore="HardcodedText">
+    tools:context=".debug.DebugMaterialThemeActivity"
+    tools:ignore="HardcodedText,MissingPrefix">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -330,7 +330,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Classic"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button"
@@ -338,14 +338,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="Classic Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="OutlinedButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -353,14 +353,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="OutlinedButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="TextButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -368,14 +368,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="TextButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="UnelevatedButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
@@ -383,7 +383,7 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="UnelevatedButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -447,12 +447,12 @@
                     android:layout_gravity="end"
                     android:layout_margin="16dp"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_settings_x" />
+                    android:src="@drawable/ic_debug_icon" />
 
                 <com.google.android.material.bottomnavigation.BottomNavigationView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:menu="@menu/home_bottom_navigation" />
+                    app:menu="@menu/menu_debug" />
 
             </LinearLayout>
 

library/ui-styles/src/debug/res/menu/menu_debug.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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"
+    tools:ignore="HardcodedText">
+
+    <item
+        android:id="@+id/menuDebug1"
+        android:icon="@drawable/ic_debug_icon"
+        android:title="Edit"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menuDebug2"
+        android:icon="@drawable/ic_debug_icon"
+        android:title="Send"
+        app:showAsAction="always" />
+
+</menu>

library/ui-styles/src/debug/res/values/debug_styles.xml

@@ -6,11 +6,11 @@
     </style>
 
 
-    <style name="VectorMaterialThemeDebugLight" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugLight.Test">
+    <style name="Theme.Debug.Light.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>
@@ -34,11 +34,11 @@
         <item name="android:textColorLink">#000FFF</item>
     </style>
 
-    <style name="VectorMaterialThemeDebugDark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Theme.Debug.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugDark.Test">
+    <style name="Theme.Debug.Dark.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>

library/ui-styles/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="im.vector.lib.ui.styles"/>

library/ui-styles/src/main/res/drawable/splash.xml

@@ -10,7 +10,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/riot_splash_white" />
+            android:src="@drawable/element_splash_white" />
     </item>
 
 </layer-list>

library/ui-styles/src/main/res/values-v23/theme_black.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Vector.Black.v23" parent="Base.Theme.Vector.Black">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v23"/>
+
+</resources>

library/ui-styles/src/main/res/values-v23/theme_dark.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Vector.Dark.v23" parent="Base.Theme.Vector.Dark">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v23"/>
+
+</resources>

library/ui-styles/src/main/res/values-v23/theme_light.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v23" parent="AppTheme.Base.Light">
+    <style name="Theme.Vector.Light.v23" parent="Base.Theme.Vector.Light">
         <item name="android:statusBarColor">@color/android_status_bar_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v23"/>
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v23"/>
 
 </resources>

library/ui-styles/src/main/res/values-v27/theme_black.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Vector.Black.v27" parent="Theme.Vector.Black.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v27" />
+
+</resources>

library/ui-styles/src/main/res/values-v27/theme_dark.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Vector.Dark.v27" parent="Theme.Vector.Dark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v27" />
+
+</resources>

library/ui-styles/src/main/res/values-v27/theme_light.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v27" parent="AppTheme.Light.v23">
+    <style name="Theme.Vector.Light.v27" parent="Theme.Vector.Light.v23">
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v27" />
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v27" />
 
 </resources>

library/ui-styles/src/main/res/values/colors.xml

@@ -29,14 +29,11 @@
     <!-- Emoji text has to use a black text color -->
     <color name="emoji_color">@android:color/black</color>
 
+    <color name="half_transparent_status_bar">#80000000</color>
+
     <color name="black_alpha">#55000000</color>
     <color name="black_54">#8A000000</color>
 
-    <attr name="vctr_home_drawer_header_background" format="color" />
-    <color name="vctr_home_drawer_header_background_light">#FFF5F7FA</color>
-    <color name="vctr_home_drawer_header_background_dark">#FF22282F</color>
-    <color name="vctr_home_drawer_header_background_black">#FF000000</color>
-
     <!-- For Android status bar and navigation bar -->
     <color name="android_status_bar_background_light">@color/element_system_light</color>
     <color name="android_navigation_bar_background_light">@color/element_system_light</color>
@@ -104,11 +101,6 @@
     <color name="vctr_room_active_widgets_banner_text_dark">#E3E8F0</color>
     <color name="vctr_room_active_widgets_banner_text_black">#E3E8F0</color>
 
-    <attr name="vctr_bottom_nav_icon_color" format="color" />
-    <color name="vctr_bottom_nav_icon_color_light">#C1C6CD</color>
-    <color name="vctr_bottom_nav_icon_color_dark">#8E99A4</color>
-    <color name="vctr_bottom_nav_icon_color_black">#8E99A4</color>
-
     <attr name="vctr_waiting_background_color" format="color" />
     <color name="vctr_waiting_background_color_light">#AAAAAAAA</color>
     <color name="vctr_waiting_background_color_dark">#55555555</color>

library/ui-styles/src/main/res/values/style_snackbar.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorSnackBarStyle" parent="@style/Widget.MaterialComponents.Snackbar">
+    <style name="Widget.Vector.SnackBar" parent="@style/Widget.MaterialComponents.Snackbar">
 <!--        <item name="android:background">@color/notification_accent_color</item>-->
     </style>
 
-    <style name="VectorSnackBarButton" parent="@style/VectorButtonStyleText.OnPrimary">
+    <style name="Widget.Vector.SnackBar.Button" parent="@style/Widget.Vector.Button.Text.OnPrimary">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
-    <style name="VectorSnackBarText" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+    <style name="Widget.Vector.SnackBar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 

library/ui-styles/src/main/res/values/styles.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Vector.PopupMenu" parent="Vector.PopupMenuBase" />
-
     <style name="VectorEmptyImageView">
         <item name="android:visibility">visible</item>
     </style>

library/ui-styles/src/main/res/values/styles_action_mode.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Action mode style -->
+    <style name="Widget.Vector.ActionMode" parent="Widget.AppCompat.ActionMode">
+        <item name="background">?android:colorBackground</item>
+        <item name="titleTextStyle">@style/Widget.Vector.TextView.Title</item>
+        <item name="subtitleTextStyle">@style/Widget.Vector.TextView.Subtitle</item>
+        <item name="actionMenuTextColor">?colorOnPrimary</item>
+    </style>
+
+</resources>

library/ui-styles/src/main/res/values/styles_alert_dialog.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Light" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_light</item>
@@ -13,7 +13,7 @@
         <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
     </style>
 
-    <style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_dark</item>

library/ui-styles/src/main/res/values/styles_app_bar_layout.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Vector.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+        <item name="android:background">?vctr_toolbar_background</item>
+        <item name="elevation">4dp</item>
+    </style>
+
+</resources>

library/ui-styles/src/main/res/values/styles_bottom_navigation.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
+    <style name="BottomNavigation.Vector" parent="Widget.MaterialComponents.BottomNavigationView">
         <item name="android:background">@drawable/bg_bottom_navigation</item>
         <item name="itemBackground">@drawable/bg_bottom_navigation</item>
         <item name="itemIconSize">20dp</item>

library/ui-styles/src/main/res/values/styles_bottom_sheet.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_light</item>
@@ -13,7 +13,7 @@
         <item name="android:textColorLink">@color/element_link_light</item>
     </style>
 
-    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_dark</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_dark</item>
@@ -24,7 +24,7 @@
         <item name="android:textColorLink">@color/element_link_dark</item>
     </style>
 
-    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
+    <style name="BottomSheet.Vector.Black" parent="BottomSheet.Vector.Dark">
         <item name="colorSurface">@color/element_background_black</item>
     </style>
 

library/ui-styles/src/main/res/values/styles_buttons.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Vector.Button" parent="Widget.MaterialComponents.Button">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyle.Destructive">
+    <style name="Widget.Vector.Button.Destructive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
     </style>
@@ -18,7 +18,7 @@
         <item name="colorPrimary">?colorError</item>
     </style>
 
-    <style name="VectorButtonStyle.Positive">
+    <style name="Widget.Vector.Button.Positive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
     </style>
@@ -27,15 +27,15 @@
         <!-- Keep default colors from the theme -->
     </style>
 
-    <style name="VectorButtonStyleUnelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Widget.Vector.Button.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleUnelevated.Bot">
+    <style name="Widget.Vector.Button.Unelevated.Bot">
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
     </style>
 
@@ -44,23 +44,27 @@
         <item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
     </style>
 
-    <style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.Vector.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleText.OnPrimary">
+    <style name="Widget.Vector.Button.Text.OnPrimary">
         <item name="colorControlHighlight">?colorOnPrimary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Widget.Vector.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="AlerterButton" parent="VectorButtonStyleText">
+    <style name="Widget.Vector.Button.Text.Alerter">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
@@ -70,7 +74,7 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined.Poll">
+    <style name="Widget.Vector.Button.Outlined.Poll">
         <item name="android:minHeight">44dp</item>
         <item name="cornerRadius">10dp</item>
     </style>

library/ui-styles/src/main/res/values/styles_edit_text.xml

@@ -2,9 +2,9 @@
 <resources>
 
     <!-- Default style for TextInputLayout -->
-    <style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+    <style name="Widget.Vector.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
-    <style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
+    <style name="Widget.Vector.EditText.Composer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">12</item>
@@ -14,10 +14,4 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
-    <!-- Styles for login screen -->
-    <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-
 </resources>

library/ui-styles/src/main/res/values/styles_login.xml

@@ -35,17 +35,17 @@
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
+    <style name="Widget.Vector.Button.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
+    <style name="Widget.Vector.Button.Outlined.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
+    <style name="Widget.Vector.Button.Text.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>