diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index c9814171d9..4b95b20029 100644
--- a/attachment-viewer/build.gradle
+++ b/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'
diff --git a/attachment-viewer/src/main/res/layout/item_image_attachment.xml b/attachment-viewer/src/main/res/layout/item_image_attachment.xml
index 91a009df2a..0f9a90e91c 100644
--- a/attachment-viewer/src/main/res/layout/item_image_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_image_attachment.xml
@@ -1,22 +1,18 @@
+ android:layout_height="match_parent">
+ android:layout_height="match_parent" />
+ android:layout_centerInParent="true" />
\ No newline at end of file
diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index 29f01650fd..7dd13ea460 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -1,8 +1,8 @@
+ android:layout_height="match_parent">
+ android:layout_centerInParent="true"
+ android:visibility="gone"
+ tools:visibility="visible" />
diff --git a/attachment-viewer/src/main/res/values/colors.xml b/attachment-viewer/src/main/res/values/colors.xml
deleted file mode 100644
index 7ceef40881..0000000000
--- a/attachment-viewer/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- #80000000
-
-
\ No newline at end of file
diff --git a/library/ui-styles/.gitignore b/library/ui-styles/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/library/ui-styles/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
new file mode 100644
index 0000000000..47c4664636
--- /dev/null
+++ b/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'
+}
\ No newline at end of file
diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000000..e32676136d
--- /dev/null
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
similarity index 90%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
index 0ac9a894ae..f5f69b1db4 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt
+++ b/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 {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
similarity index 87%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
index 69dc683bf3..492b359105 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
+++ b/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)
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
index 7e014577de..d24ceb6ede 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
index 4a1ed04f6a..fea1f27dae 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
index 6ac27aed45..379d55d006 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
index f6327e363b..57f172bdc3 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
index ae6c1dd68c..d3a6c757fb 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
index b4fb3c1cc8..3fafa61421 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt
+++ b/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()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
similarity index 52%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
index 783a2a3eb5..50d1e344e9 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.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,17 @@
* 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
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.lib.ui.styles.databinding.ActivityDebugButtonStylesBinding
-class DebugVectorButtonStylesActivity : VectorBaseActivity() {
- override fun getBinding() = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
+abstract class DebugVectorButtonStylesActivity : AppCompatActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val views = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
+ setContentView(views.root)
+ }
}
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt
new file mode 100644
index 0000000000..102ca53f3c
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.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 DebugVectorButtonStylesDarkActivity : DebugVectorButtonStylesActivity()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt
new file mode 100644
index 0000000000..c1b01dc6a3
--- /dev/null
+++ b/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()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt
new file mode 100644
index 0000000000..ac3d4ea696
--- /dev/null
+++ b/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)
+ }
+}
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt
new file mode 100644
index 0000000000..2d95056fef
--- /dev/null
+++ b/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()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt
new file mode 100644
index 0000000000..33e4a0f075
--- /dev/null
+++ b/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()
diff --git a/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml b/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml
new file mode 100644
index 0000000000..08af7d6539
--- /dev/null
+++ b/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/vector/src/debug/res/drawable/linear_divider.xml b/library/ui-styles/src/debug/res/drawable/linear_divider.xml
similarity index 100%
rename from vector/src/debug/res/drawable/linear_divider.xml
rename to library/ui-styles/src/debug/res/drawable/linear_divider.xml
diff --git a/vector/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
similarity index 74%
rename from vector/src/debug/res/layout/activity_debug_button_styles.xml
rename to library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index 3973f7cbb6..0f129fb406 100644
--- a/vector/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/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">
+
+
+
diff --git a/library/ui-styles/src/debug/res/menu/menu_debug.xml b/library/ui-styles/src/debug/res/menu/menu_debug.xml
new file mode 100644
index 0000000000..c58a29db8f
--- /dev/null
+++ b/library/ui-styles/src/debug/res/menu/menu_debug.xml
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/vector/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
similarity index 88%
rename from vector/src/debug/res/values/debug_styles.xml
rename to library/ui-styles/src/debug/res/values/debug_styles.xml
index 090de4dd4b..d025ba1784 100644
--- a/vector/src/debug/res/values/debug_styles.xml
+++ b/library/ui-styles/src/debug/res/values/debug_styles.xml
@@ -6,11 +6,11 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v23/theme_dark.xml b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
new file mode 100644
index 0000000000..45b340eaad
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-v23/theme_light.xml b/library/ui-styles/src/main/res/values-v23/theme_light.xml
similarity index 58%
rename from vector/src/main/res/values-v23/theme_light.xml
rename to library/ui-styles/src/main/res/values-v23/theme_light.xml
index 43d0027e17..28a78b98bf 100644
--- a/vector/src/main/res/values-v23/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_light.xml
@@ -1,11 +1,11 @@
-
-
+
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_black.xml b/library/ui-styles/src/main/res/values-v27/theme_black.xml
new file mode 100644
index 0000000000..2a18b021e3
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_black.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_dark.xml b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
new file mode 100644
index 0000000000..ee654bbaab
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-v27/theme_light.xml b/library/ui-styles/src/main/res/values-v27/theme_light.xml
similarity index 59%
rename from vector/src/main/res/values-v27/theme_light.xml
rename to library/ui-styles/src/main/res/values-v27/theme_light.xml
index 4755516267..0151130f5a 100644
--- a/vector/src/main/res/values-v27/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_light.xml
@@ -1,11 +1,11 @@
-
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-w820dp/dimens.xml b/library/ui-styles/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from vector/src/main/res/values-w820dp/dimens.xml
rename to library/ui-styles/src/main/res/values-w820dp/dimens.xml
diff --git a/vector/src/main/res/values/attrs_room_message_colors.xml b/library/ui-styles/src/main/res/values/attrs_room_message_colors.xml
similarity index 100%
rename from vector/src/main/res/values/attrs_room_message_colors.xml
rename to library/ui-styles/src/main/res/values/attrs_room_message_colors.xml
diff --git a/vector/src/main/res/values/attrs_social_login_button.xml b/library/ui-styles/src/main/res/values/attrs_social_login_button.xml
similarity index 100%
rename from vector/src/main/res/values/attrs_social_login_button.xml
rename to library/ui-styles/src/main/res/values/attrs_social_login_button.xml
diff --git a/vector/src/main/res/values/bools.xml b/library/ui-styles/src/main/res/values/bools.xml
similarity index 100%
rename from vector/src/main/res/values/bools.xml
rename to library/ui-styles/src/main/res/values/bools.xml
diff --git a/vector/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
similarity index 91%
rename from vector/src/main/res/values/colors.xml
rename to library/ui-styles/src/main/res/values/colors.xml
index 1eae207f0a..1e94d65c55 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -29,14 +29,11 @@
@android:color/black
+ #80000000
+
#55000000
#8A000000
-
- #FFF5F7FA
- #FF22282F
- #FF000000
-
@color/element_system_light
@color/element_system_light
@@ -104,11 +101,6 @@
#E3E8F0
#E3E8F0
-
- #C1C6CD
- #8E99A4
- #8E99A4
-
#AAAAAAAA
#55555555
diff --git a/vector/src/main/res/values/colors_password_strength.xml b/library/ui-styles/src/main/res/values/colors_password_strength.xml
similarity index 100%
rename from vector/src/main/res/values/colors_password_strength.xml
rename to library/ui-styles/src/main/res/values/colors_password_strength.xml
diff --git a/vector/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
similarity index 100%
rename from vector/src/main/res/values/dimens.xml
rename to library/ui-styles/src/main/res/values/dimens.xml
diff --git a/vector/src/main/res/values/integers.xml b/library/ui-styles/src/main/res/values/integers.xml
similarity index 100%
rename from vector/src/main/res/values/integers.xml
rename to library/ui-styles/src/main/res/values/integers.xml
diff --git a/vector/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
similarity index 100%
rename from vector/src/main/res/values/palette.xml
rename to library/ui-styles/src/main/res/values/palette.xml
diff --git a/vector/src/main/res/values/palette_mobile.xml b/library/ui-styles/src/main/res/values/palette_mobile.xml
similarity index 100%
rename from vector/src/main/res/values/palette_mobile.xml
rename to library/ui-styles/src/main/res/values/palette_mobile.xml
diff --git a/vector/src/main/res/values/stylable_badge_floating_action_button.xml b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_badge_floating_action_button.xml
rename to library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
diff --git a/vector/src/main/res/values/stylable_bottom_sheet_action.xml b/library/ui-styles/src/main/res/values/stylable_bottom_sheet_action.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_bottom_sheet_action.xml
rename to library/ui-styles/src/main/res/values/stylable_bottom_sheet_action.xml
diff --git a/vector/src/main/res/values/stylable_button_state_view.xml b/library/ui-styles/src/main/res/values/stylable_button_state_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_button_state_view.xml
rename to library/ui-styles/src/main/res/values/stylable_button_state_view.xml
diff --git a/vector/src/main/res/values/stylable_max_height_scroll_view.xml b/library/ui-styles/src/main/res/values/stylable_max_height_scroll_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_max_height_scroll_view.xml
rename to library/ui-styles/src/main/res/values/stylable_max_height_scroll_view.xml
diff --git a/vector/src/main/res/values/stylable_pool_result_line.xml b/library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_pool_result_line.xml
rename to library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
diff --git a/vector/src/main/res/values/stylable_reaction_button.xml b/library/ui-styles/src/main/res/values/stylable_reaction_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_reaction_button.xml
rename to library/ui-styles/src/main/res/values/stylable_reaction_button.xml
diff --git a/vector/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml b/library/ui-styles/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
rename to library/ui-styles/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
diff --git a/vector/src/main/res/values/stylable_social_login_button_view.xml b/library/ui-styles/src/main/res/values/stylable_social_login_button_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_social_login_button_view.xml
rename to library/ui-styles/src/main/res/values/stylable_social_login_button_view.xml
diff --git a/vector/src/main/res/values/stylable_wizard_button_view.xml b/library/ui-styles/src/main/res/values/stylable_wizard_button_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_wizard_button_view.xml
rename to library/ui-styles/src/main/res/values/stylable_wizard_button_view.xml
diff --git a/vector/src/main/res/values/style_snackbar.xml b/library/ui-styles/src/main/res/values/style_snackbar.xml
similarity index 51%
rename from vector/src/main/res/values/style_snackbar.xml
rename to library/ui-styles/src/main/res/values/style_snackbar.xml
index 60c78c0e65..d15f846d8f 100644
--- a/vector/src/main/res/values/style_snackbar.xml
+++ b/library/ui-styles/src/main/res/values/style_snackbar.xml
@@ -1,15 +1,15 @@
-
-
-
diff --git a/vector/src/main/res/values/styles.xml b/library/ui-styles/src/main/res/values/styles.xml
similarity index 66%
rename from vector/src/main/res/values/styles.xml
rename to library/ui-styles/src/main/res/values/styles.xml
index 8cc1fe70d8..b028d2e219 100644
--- a/vector/src/main/res/values/styles.xml
+++ b/library/ui-styles/src/main/res/values/styles.xml
@@ -1,8 +1,6 @@
-
-
diff --git a/library/ui-styles/src/main/res/values/styles_action_mode.xml b/library/ui-styles/src/main/res/values/styles_action_mode.xml
new file mode 100644
index 0000000000..f6e6079633
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_action_mode.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_alert_dialog.xml b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
similarity index 86%
rename from vector/src/main/res/values/styles_alert_dialog.xml
rename to library/ui-styles/src/main/res/values/styles_alert_dialog.xml
index 08ce9d4dda..283a1ab1ca 100644
--- a/vector/src/main/res/values/styles_alert_dialog.xml
+++ b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_attachments.xml b/library/ui-styles/src/main/res/values/styles_attachments.xml
similarity index 100%
rename from vector/src/main/res/values/styles_attachments.xml
rename to library/ui-styles/src/main/res/values/styles_attachments.xml
diff --git a/vector/src/main/res/values/styles_bottom_navigation.xml b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
similarity index 78%
rename from vector/src/main/res/values/styles_bottom_navigation.xml
rename to library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
index ddd5e7d30a..8925d6a74f 100644
--- a/vector/src/main/res/values/styles_bottom_navigation.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
@@ -1,7 +1,7 @@
-
-
-
diff --git a/vector/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
similarity index 64%
rename from vector/src/main/res/values/styles_buttons.xml
rename to library/ui-styles/src/main/res/values/styles_buttons.xml
index 71f23d71da..8d34995751 100644
--- a/vector/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -1,15 +1,15 @@
-
-
@@ -18,7 +18,7 @@
- ?colorError
-
@@ -27,15 +27,15 @@
-
-
@@ -44,23 +44,27 @@
- @color/button_bot_enabled_text_color
-
-
-
-
-
diff --git a/vector/src/main/res/values/styles_dial_pad.xml b/library/ui-styles/src/main/res/values/styles_dial_pad.xml
similarity index 100%
rename from vector/src/main/res/values/styles_dial_pad.xml
rename to library/ui-styles/src/main/res/values/styles_dial_pad.xml
diff --git a/vector/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
similarity index 59%
rename from vector/src/main/res/values/styles_edit_text.xml
rename to library/ui-styles/src/main/res/values/styles_edit_text.xml
index 586e77ffe7..d23c11c96c 100644
--- a/vector/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -2,9 +2,9 @@
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_label.xml b/library/ui-styles/src/main/res/values/styles_label.xml
similarity index 100%
rename from vector/src/main/res/values/styles_label.xml
rename to library/ui-styles/src/main/res/values/styles_label.xml
diff --git a/vector/src/main/res/values/styles_login.xml b/library/ui-styles/src/main/res/values/styles_login.xml
similarity index 89%
rename from vector/src/main/res/values/styles_login.xml
rename to library/ui-styles/src/main/res/values/styles_login.xml
index 8cba34daf3..ab2cb44c5a 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_login.xml
@@ -35,17 +35,17 @@
- 32dp
-
-
-
diff --git a/vector/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
similarity index 94%
rename from vector/src/main/res/values/styles_pin_code.xml
rename to library/ui-styles/src/main/res/values/styles_pin_code.xml
index 61f53ab522..2b6c113359 100644
--- a/vector/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -15,7 +15,7 @@
- @drawable/pin_code_dots
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_search_view.xml b/library/ui-styles/src/main/res/values/styles_search_view.xml
similarity index 71%
rename from vector/src/main/res/values/styles_search_view.xml
rename to library/ui-styles/src/main/res/values/styles_search_view.xml
index 5cf6db538f..e1439697c9 100644
--- a/vector/src/main/res/values/styles_search_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_search_view.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
new file mode 100644
index 0000000000..77e32da345
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
similarity index 100%
rename from vector/src/main/res/values/styles_timeline.xml
rename to library/ui-styles/src/main/res/values/styles_timeline.xml
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
new file mode 100644
index 0000000000..9f6ba102ed
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
new file mode 100644
index 0000000000..88192f70e6
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
similarity index 84%
rename from vector/src/main/res/values/theme_black.xml
rename to library/ui-styles/src/main/res/values/theme_black.xml
index e0df15b65b..6db7e5a663 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -3,11 +3,10 @@
-
-
+
diff --git a/vector/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
similarity index 78%
rename from vector/src/main/res/values/theme_common.xml
rename to library/ui-styles/src/main/res/values/theme_common.xml
index 2fcbd36bdf..2e9c2c5123 100644
--- a/vector/src/main/res/values/theme_common.xml
+++ b/library/ui-styles/src/main/res/values/theme_common.xml
@@ -2,21 +2,19 @@
-
-
-
-
-
-
+
diff --git a/vector/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
similarity index 73%
rename from vector/src/main/res/values/theme_light.xml
rename to library/ui-styles/src/main/res/values/theme_light.xml
index e976ca6e8d..08d9761a7a 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -3,7 +3,7 @@
-
-
+
diff --git a/vector/src/release/res/values/styles.xml b/library/ui-styles/src/release/res/values/styles.xml
similarity index 100%
rename from vector/src/release/res/values/styles.xml
rename to library/ui-styles/src/release/res/values/styles.xml
diff --git a/newsfragment/3459.feature b/newsfragment/3459.feature
index eedec1dfda..ccda58f8b5 100644
--- a/newsfragment/3459.feature
+++ b/newsfragment/3459.feature
@@ -1,2 +1,2 @@
-Migrate to new colors and cleanup the style and theme
+Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles
Ref: https://material.io/blog/migrate-android-material-components
\ No newline at end of file
diff --git a/newsfragment/3485.feature b/newsfragment/3485.feature
new file mode 100644
index 0000000000..68c78267be
--- /dev/null
+++ b/newsfragment/3485.feature
@@ -0,0 +1 @@
+Add beta warning to private space creation flow
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 76a15a206d..b88ea99b05 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,3 +4,4 @@ include ':matrix-sdk-android-rx'
include ':diff-match-patch'
include ':attachment-viewer'
include ':multipicker'
+include ':library:ui-styles'
diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 0b4272cbfe..7decb985bb 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -95,6 +95,14 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt
resultForbiddenStringInResource=$?
+echo
+echo "Search for forbidden patterns in layouts..."
+
+${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_layout.txt \
+ ./vector/src/main/res/layout
+
+resultForbiddenStringInLayout=$?
+
#######################################################################################################################
# Check files with long lines
#######################################################################################################################
@@ -156,7 +164,13 @@ fi
echo
-if [[ ${resultNbOfDrawable} -eq 0 ]] && [[ ${resultForbiddenStringInCode} -eq 0 ]] && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] && [[ ${resultForbiddenStringInResource} -eq 0 ]] && [[ ${resultLongFiles} -eq 0 ]] && [[ ${resultPngInDrawable} -eq 0 ]]; then
+if [[ ${resultNbOfDrawable} -eq 0 ]] \
+ && [[ ${resultForbiddenStringInCode} -eq 0 ]] \
+ && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] \
+ && [[ ${resultForbiddenStringInResource} -eq 0 ]] \
+ && [[ ${resultForbiddenStringInLayout} -eq 0 ]] \
+ && [[ ${resultLongFiles} -eq 0 ]] \
+ && [[ ${resultPngInDrawable} -eq 0 ]]; then
echo "MAIN OK"
else
echo "❌ MAIN ERROR"
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
new file mode 100644
index 0000000000..09f0d01f69
--- /dev/null
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -0,0 +1,27 @@
+#
+# Copyright 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.
+#
+
+# This file list String which are not allowed in source code.
+# Use Perl regex to write forbidden strings
+# Note: line cannot start with a space. Use \s instead.
+# It is possible to specify an authorized number of occurrence with === suffix. Default is 0
+# Example:
+# AuthorizedStringThreeTimes===3
+
+# Extension:xml
+
+### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute
+android:textSize===9
diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 4ebc4008c1..474fb03508 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -106,4 +106,7 @@ layout_constraintLeft_
colorAccent
### Use MaterialCardView
-
-
-
-
-
-
-
-
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 65a24c9aeb..539091c7ce 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -37,6 +37,16 @@ import im.vector.app.core.utils.toast
import im.vector.app.databinding.ActivityDebugMenuBinding
import im.vector.app.features.debug.sas.DebugSasEmojiActivity
import im.vector.app.features.qrcode.QrCodeScannerActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightDefaultActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightTestActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightVectorActivity
+import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesDarkActivity
+import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesLightActivity
+import im.vector.lib.ui.styles.debug.DebugVectorTextViewDarkActivity
+import im.vector.lib.ui.styles.debug.DebugVectorTextViewLightActivity
import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
import timber.log.Timber
@@ -71,8 +81,17 @@ class DebugMenuActivity : VectorBaseActivity() {
private fun setupViews() {
views.debugTestTextViewLink.setOnClickListener { testTextViewLink() }
- views.debugOpenButtonStyles.setOnClickListener {
- startActivity(Intent(this, DebugVectorButtonStylesActivity::class.java))
+ views.debugOpenButtonStylesLight.setOnClickListener {
+ startActivity(Intent(this, DebugVectorButtonStylesLightActivity::class.java))
+ }
+ views.debugOpenButtonStylesDark.setOnClickListener {
+ startActivity(Intent(this, DebugVectorButtonStylesDarkActivity::class.java))
+ }
+ views.debugTestTextViewLight.setOnClickListener {
+ startActivity(Intent(this, DebugVectorTextViewLightActivity::class.java))
+ }
+ views.debugTestTextViewDark.setOnClickListener {
+ startActivity(Intent(this, DebugVectorTextViewDarkActivity::class.java))
}
views.debugShowSasEmoji.setOnClickListener { showSasEmoji() }
views.debugTestNotification.setOnClickListener { testNotification() }
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml
index 454d8992fd..60cfc1e826 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector/src/debug/res/layout/activity_debug_menu.xml
@@ -66,6 +66,20 @@
android:text="Vector" />
+
+
+
+
+
+
+ android:text="See button dark" />
+ android:theme="@style/Theme.Vector.Light">
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:theme="@style/AppTheme.Dark">
+ android:theme="@style/Theme.Vector.Dark">
@@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:theme="@style/AppTheme.Black">
+ android:theme="@style/Theme.Vector.Black">
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 23d6f3b348..a6a0e28058 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -12,20 +12,21 @@
diff --git a/vector/src/debug/res/menu/menu_debug.xml b/vector/src/debug/res/menu/menu_debug.xml
deleted file mode 100644
index c4fdaa435d..0000000000
--- a/vector/src/debug/res/menu/menu_debug.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
\ No newline at end of file
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index f601dc88dd..e71f355a23 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme.Light"
+ android:theme="@style/Theme.Vector.Light"
tools:replace="android:allowBackup">
@@ -85,7 +85,7 @@
+ android:theme="@style/Theme.Vector.Launcher" />
@@ -268,7 +268,7 @@
+ android:theme="@style/Theme.Vector.Black.AttachmentsPreview" />
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
index 712432abfd..6c9b3d19fc 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
@@ -18,9 +18,9 @@ package im.vector.app.core.ui.views
import android.content.Context
import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
+import com.google.android.material.textview.MaterialTextView
-class NonScrollingTextView : AppCompatTextView {
+class NonScrollingTextView : MaterialTextView {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index decb9eaad5..e1b703e0fc 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -18,8 +18,6 @@ package im.vector.app.features.crypto.verification.epoxy
import android.content.Context
import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute
@@ -27,6 +25,7 @@ import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.R
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.databinding.ItemEmojiVerifBinding
import me.gujun.android.span.Span
import me.gujun.android.span.image
import me.gujun.android.span.span
@@ -68,16 +67,18 @@ abstract class BottomSheetVerificationEmojisItem : VectorEpoxyModel(R.id.item_emoji_tv).isVisible = false
- view.findViewById(R.id.item_emoji_image).isVisible = true
- view.findViewById(R.id.item_emoji_image).setImageDrawable(ContextCompat.getDrawable(view.context, it))
- } ?: run {
- view.findViewById(R.id.item_emoji_tv).isVisible = true
- view.findViewById(R.id.item_emoji_image).isVisible = false
- view.findViewById(R.id.item_emoji_tv).text = rep.emoji
+ val views = ItemEmojiVerifBinding.bind(view)
+ val drawableRes = rep.drawableRes
+ if (drawableRes != null) {
+ views.itemEmojiTv.isVisible = false
+ views.itemEmojiImage.isVisible = true
+ views.itemEmojiImage.setImageDrawable(ContextCompat.getDrawable(view.context, drawableRes))
+ } else {
+ views.itemEmojiTv.isVisible = true
+ views.itemEmojiImage.isVisible = false
+ views.itemEmojiTv.text = rep.emoji
}
- view.findViewById(R.id.item_emoji_name_tv).setText(rep.nameResId)
+ views.itemEmojiNameTv.setText(rep.nameResId)
}
class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
index a9b6bbf0aa..1f12bdbd2c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
@@ -69,7 +69,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem {
holder.rejectView.setText(R.string.ignore)
holder.acceptView.setText(R.string.join)
- holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary)
+ holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
}
CallKind.AUDIO -> {
holder.rejectView.setText(R.string.call_notification_reject)
holder.acceptView.setText(R.string.call_notification_answer)
- holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary)
+ holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
}
CallKind.VIDEO -> {
holder.rejectView.setText(R.string.call_notification_reject)
holder.acceptView.setText(R.string.call_notification_answer)
- holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorPrimary)
+ holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
}
else -> {
Timber.w("Shouldn't be in that state")
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
index cc7271b55f..9887e06654 100755
--- a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.home.room.list
import android.content.Context
import android.util.AttributeSet
import android.view.View
-import androidx.appcompat.widget.AppCompatTextView
+import com.google.android.material.textview.MaterialTextView
import im.vector.app.R
-class UnreadCounterBadgeView : AppCompatTextView {
+class UnreadCounterBadgeView : MaterialTextView {
constructor(context: Context) : super(context)
diff --git a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
index 8a4fc7a78d..17ad35f07a 100644
--- a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
@@ -18,11 +18,10 @@ package im.vector.app.features.popup
import android.app.Activity
import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
import im.vector.app.R
import im.vector.app.core.extensions.setLeftDrawable
import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.AlerterIncomingCallLayoutBinding
import im.vector.app.features.home.AvatarRenderer
import org.matrix.android.sdk.api.util.MatrixItem
@@ -40,30 +39,24 @@ class IncomingCallAlert(uid: String,
private val avatarRenderer: AvatarRenderer,
private val isVideoCall: Boolean,
private val onAccept: () -> Unit,
- private val onReject: () -> Unit)
- : VectorAlert.ViewBinder {
+ private val onReject: () -> Unit) : VectorAlert.ViewBinder {
override fun bind(view: View) {
- val (callKindText, callKindIcon) = if (isVideoCall) {
- Pair(R.string.action_video_call, R.drawable.ic_call_video_small)
+ val views = AlerterIncomingCallLayoutBinding.bind(view)
+ val (callKindText, callKindIcon, callKindActionIcon) = if (isVideoCall) {
+ Triple(R.string.action_video_call, R.drawable.ic_call_video_small, R.drawable.ic_call_answer_video)
} else {
- Pair(R.string.action_voice_call, R.drawable.ic_call_audio_small)
+ Triple(R.string.action_voice_call, R.drawable.ic_call_audio_small, R.drawable.ic_call_answer)
}
- view.findViewById(R.id.incomingCallKindView).apply {
- setText(callKindText)
- setLeftDrawable(callKindIcon)
+ views.incomingCallKindView.setText(callKindText)
+ views.incomingCallKindView.setLeftDrawable(callKindIcon)
+ views.incomingCallNameView.text = matrixItem?.getBestName()
+ matrixItem?.let { avatarRenderer.render(it, views.incomingCallAvatar, GlideApp.with(view.context.applicationContext)) }
+ views.incomingCallAcceptView.setOnClickListener {
+ onAccept()
}
- view.findViewById(R.id.incomingCallNameView).text = matrixItem?.getBestName()
- view.findViewById(R.id.incomingCallAvatar)?.let { imageView ->
- matrixItem?.let { avatarRenderer.render(it, imageView, GlideApp.with(view.context.applicationContext)) }
- }
- view.findViewById(R.id.incomingCallAcceptView).apply {
- setOnClickListener {
- onAccept()
- }
- setImageResource(callKindIcon)
- }
- view.findViewById(R.id.incomingCallRejectView).setOnClickListener {
+ views.incomingCallAcceptView.setImageResource(callKindActionIcon)
+ views.incomingCallRejectView.setOnClickListener {
onReject()
}
}
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 3228ffa6e1..d6aa0a1943 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -231,7 +231,7 @@ class PopupAlertManager @Inject constructor() {
setIcon(it)
}
alert.actions.forEach { action ->
- addButton(action.title, R.style.AlerterButton) {
+ addButton(action.title, R.style.Widget_Vector_Button_Text_Alerter) {
if (action.autoClose) {
currentIsDismissed()
Alerter.hide()
diff --git a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
index ee6728f969..228c629161 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.popup
import android.app.Activity
import android.view.View
-import android.widget.ImageView
import androidx.annotation.DrawableRes
import im.vector.app.R
import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.AlerterVerificationLayoutBinding
import im.vector.app.features.home.AvatarRenderer
import org.matrix.android.sdk.api.util.MatrixItem
@@ -33,19 +33,15 @@ class VerificationVectorAlert(uid: String,
* Alert are displayed by default, but let this lambda return false to prevent displaying
*/
override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
-) : DefaultVectorAlert(
- uid, title, description, iconId, shouldBeDisplayedIn
-) {
+) : DefaultVectorAlert(uid, title, description, iconId, shouldBeDisplayedIn) {
override val layoutRes = R.layout.alerter_verification_layout
class ViewBinder(private val matrixItem: MatrixItem?,
- private val avatarRenderer: AvatarRenderer)
- : VectorAlert.ViewBinder {
+ private val avatarRenderer: AvatarRenderer) : VectorAlert.ViewBinder {
override fun bind(view: View) {
- view.findViewById(R.id.ivUserAvatar)?.let { imageView ->
- matrixItem?.let { avatarRenderer.render(it, imageView, GlideApp.with(view.context.applicationContext)) }
- }
+ val views = AlerterVerificationLayoutBinding.bind(view)
+ matrixItem?.let { avatarRenderer.render(it, views.ivUserAvatar, GlideApp.with(view.context.applicationContext)) }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index fd7e3cbb6a..70e5bdff10 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -18,13 +18,10 @@ package im.vector.app.features.settings.troubleshoot
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import im.vector.app.R
+import im.vector.app.databinding.ItemNotificationTroubleshootBinding
import im.vector.app.features.themes.ThemeUtils
class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList)
@@ -46,71 +43,67 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList(R.id.troubleshootProgressBar)
- private val troubleshootTestTitle = itemView.findViewById(R.id.troubleshootTestTitle)
- private val troubleshootTestDescription = itemView.findViewById(R.id.troubleshootTestDescription)
- private val troubleshootStatusIcon = itemView.findViewById(R.id.troubleshootStatusIcon)
- private val troubleshootTestButton = itemView.findViewById(R.id.troubleshootTestButton)
+ private val views = ItemNotificationTroubleshootBinding.bind(itemView)
fun bind(test: TroubleshootTest) {
val context = itemView.context
- troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_primary))
- troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
+ views.troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_primary))
+ views.troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
when (test.status) {
TroubleshootTest.TestStatus.NOT_STARTED -> {
- troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
+ views.troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
- troubleshootProgressBar.visibility = View.INVISIBLE
- troubleshootStatusIcon.visibility = View.VISIBLE
- troubleshootStatusIcon.setImageResource(R.drawable.unit_test)
+ views.troubleshootProgressBar.visibility = View.INVISIBLE
+ views.troubleshootStatusIcon.visibility = View.VISIBLE
+ views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test)
}
TroubleshootTest.TestStatus.WAITING_FOR_USER -> {
- troubleshootProgressBar.visibility = View.INVISIBLE
- troubleshootStatusIcon.visibility = View.VISIBLE
+ views.troubleshootProgressBar.visibility = View.INVISIBLE
+ views.troubleshootStatusIcon.visibility = View.VISIBLE
val infoColor = ContextCompat.getColor(context, R.color.vector_info_color)
val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_notification_privacy_warning)?.apply {
ThemeUtils.tintDrawableWithColor(this, infoColor)
}
- troubleshootStatusIcon.setImageDrawable(drawable)
- troubleshootTestDescription.setTextColor(infoColor)
+ views.troubleshootStatusIcon.setImageDrawable(drawable)
+ views.troubleshootTestDescription.setTextColor(infoColor)
}
TroubleshootTest.TestStatus.RUNNING -> {
- troubleshootProgressBar.visibility = View.VISIBLE
- troubleshootStatusIcon.visibility = View.INVISIBLE
+ views.troubleshootProgressBar.visibility = View.VISIBLE
+ views.troubleshootStatusIcon.visibility = View.INVISIBLE
}
TroubleshootTest.TestStatus.FAILED -> {
- troubleshootProgressBar.visibility = View.INVISIBLE
- troubleshootStatusIcon.visibility = View.VISIBLE
- troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ko)
- troubleshootStatusIcon.imageTintList = null
- troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
+ views.troubleshootProgressBar.visibility = View.INVISIBLE
+ views.troubleshootStatusIcon.visibility = View.VISIBLE
+ views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ko)
+ views.troubleshootStatusIcon.imageTintList = null
+ views.troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
}
TroubleshootTest.TestStatus.SUCCESS -> {
- troubleshootProgressBar.visibility = View.INVISIBLE
- troubleshootStatusIcon.visibility = View.VISIBLE
- troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ok)
+ views.troubleshootProgressBar.visibility = View.INVISIBLE
+ views.troubleshootStatusIcon.visibility = View.VISIBLE
+ views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ok)
}
}
val quickFix = test.quickFix
if (quickFix != null) {
- troubleshootTestButton.setText(test.quickFix!!.title)
- troubleshootTestButton.setOnClickListener {
+ views.troubleshootTestButton.setText(test.quickFix!!.title)
+ views.troubleshootTestButton.setOnClickListener {
test.quickFix!!.doFix()
}
- troubleshootTestButton.visibility = View.VISIBLE
+ views.troubleshootTestButton.visibility = View.VISIBLE
} else {
- troubleshootTestButton.visibility = View.GONE
+ views.troubleshootTestButton.visibility = View.GONE
}
- troubleshootTestTitle.setText(test.titleResId)
+ views.troubleshootTestTitle.setText(test.titleResId)
val description = test.description
if (description == null) {
- troubleshootTestDescription.visibility = View.GONE
+ views.troubleshootTestDescription.visibility = View.GONE
} else {
- troubleshootTestDescription.visibility = View.VISIBLE
- troubleshootTestDescription.text = description
+ views.troubleshootTestDescription.visibility = View.VISIBLE
+ views.troubleshootTestDescription.text = description
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 57c6b40404..6bf31dd5ce 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -53,16 +53,15 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
-
if (isFirstCreation()) {
when (withState(viewModel) { it.step }) {
- CreateSpaceState.Step.ChooseType -> {
+ CreateSpaceState.Step.ChooseType -> {
navigateToFragment(ChooseSpaceTypeFragment::class.java)
}
- CreateSpaceState.Step.SetDetails -> {
+ CreateSpaceState.Step.SetDetails -> {
navigateToFragment(ChooseSpaceTypeFragment::class.java)
}
- CreateSpaceState.Step.AddRooms -> {
+ CreateSpaceState.Step.AddRooms -> {
navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
}
CreateSpaceState.Step.ChoosePrivateType -> {
@@ -81,29 +80,29 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
viewModel.observeViewEvents {
when (it) {
- CreateSpaceEvents.NavigateToDetails -> {
+ CreateSpaceEvents.NavigateToDetails -> {
navigateToFragment(CreateSpaceDetailsFragment::class.java)
}
- CreateSpaceEvents.NavigateToChooseType -> {
+ CreateSpaceEvents.NavigateToChooseType -> {
navigateToFragment(ChooseSpaceTypeFragment::class.java)
}
- CreateSpaceEvents.Dismiss -> {
+ CreateSpaceEvents.Dismiss -> {
finish()
}
- CreateSpaceEvents.NavigateToAddRooms -> {
+ CreateSpaceEvents.NavigateToAddRooms -> {
navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
}
CreateSpaceEvents.NavigateToChoosePrivateType -> {
navigateToFragment(ChoosePrivateSpaceTypeFragment::class.java)
}
- is CreateSpaceEvents.ShowModalError -> {
+ is CreateSpaceEvents.ShowModalError -> {
hideWaitingView()
MaterialAlertDialogBuilder(this)
.setMessage(it.errorMessage)
.setPositiveButton(getString(R.string.ok), null)
.show()
}
- is CreateSpaceEvents.FinishSuccess -> {
+ is CreateSpaceEvents.FinishSuccess -> {
setResult(RESULT_OK, Intent().apply {
putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
@@ -111,7 +110,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
})
finish()
}
- CreateSpaceEvents.HideModalLoading -> {
+ CreateSpaceEvents.HideModalLoading -> {
hideWaitingView()
}
}
@@ -135,9 +134,9 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
private fun renderState(state: CreateSpaceState) {
val titleRes = when (state.step) {
- CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
+ CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
CreateSpaceState.Step.SetDetails,
- CreateSpaceState.Step.AddRooms -> {
+ CreateSpaceState.Step.AddRooms -> {
if (state.spaceType == SpaceType.Public) R.string.your_public_space
else R.string.your_private_space
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
new file mode 100644
index 0000000000..fc3d98e6b8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.setFragmentResult
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSpaceCreatePrivateWarningBinding
+
+class BetaWarningBottomSheet : VectorBaseBottomSheetDialogFragment() {
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+ BottomSheetSpaceCreatePrivateWarningBinding.inflate(inflater, container, false)
+
+ override val showExpanded = true
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ views.continueButton.debouncedClicks {
+ setFragmentResult(REQUEST_KEY, Bundle.EMPTY)
+ dismiss()
+ }
+ }
+
+ companion object {
+ const val REQUEST_KEY = "BetaWarningBottomSheet"
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 4f079551eb..4031b56c1d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.fragment.app.setFragmentResultListener
import com.airbnb.mvrx.activityViewModel
import im.vector.app.R
import im.vector.app.core.epoxy.onClick
@@ -38,6 +39,13 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
FragmentSpaceCreateChoosePrivateModelBinding.inflate(layoutInflater, container, false)
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setFragmentResultListener(BetaWarningBottomSheet.REQUEST_KEY) { _, _ ->
+ sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+ }
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
@@ -46,7 +54,7 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
}
views.teammatesButton.onClick {
- sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+ BetaWarningBottomSheet().show(parentFragmentManager, "warning")
}
sharedViewModel.subscribe { state ->
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 9881232f4d..aff342cea7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -70,7 +70,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
override fun handle(action: CreateSpaceAction) {
when (action) {
- is CreateSpaceAction.SetRoomType -> {
+ is CreateSpaceAction.SetRoomType -> {
setState {
copy(
step = CreateSpaceState.Step.SetDetails,
@@ -79,7 +79,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
}
_viewEvents.post(CreateSpaceEvents.NavigateToDetails)
}
- is CreateSpaceAction.NameChanged -> {
+ is CreateSpaceAction.NameChanged -> {
setState {
copy(
nameInlineError = null,
@@ -87,20 +87,20 @@ class CreateSpaceViewModel @AssistedInject constructor(
)
}
}
- is CreateSpaceAction.TopicChanged -> {
+ is CreateSpaceAction.TopicChanged -> {
setState {
copy(
topic = action.topic
)
}
}
- CreateSpaceAction.OnBackPressed -> {
+ CreateSpaceAction.OnBackPressed -> {
handleBackNavigation()
}
- CreateSpaceAction.NextFromDetails -> {
+ CreateSpaceAction.NextFromDetails -> {
handleNextFromDetails()
}
- CreateSpaceAction.NextFromDefaultRooms -> {
+ CreateSpaceAction.NextFromDefaultRooms -> {
handleNextFromDefaultRooms()
}
is CreateSpaceAction.DefaultRoomNameChanged -> {
@@ -112,10 +112,10 @@ class CreateSpaceViewModel @AssistedInject constructor(
)
}
}
- is CreateSpaceAction.SetAvatar -> {
+ is CreateSpaceAction.SetAvatar -> {
setState { copy(avatarUri = action.uri) }
}
- is CreateSpaceAction.SetSpaceTopology -> {
+ is CreateSpaceAction.SetSpaceTopology -> {
handleSetTopology(action)
}
}.exhaustive
@@ -123,7 +123,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
private fun handleSetTopology(action: CreateSpaceAction.SetSpaceTopology) {
when (action.topology) {
- SpaceTopology.JustMe -> {
+ SpaceTopology.JustMe -> {
setState {
copy(
spaceTopology = SpaceTopology.JustMe,
@@ -146,10 +146,10 @@ class CreateSpaceViewModel @AssistedInject constructor(
private fun handleBackNavigation() = withState { state ->
when (state.step) {
- CreateSpaceState.Step.ChooseType -> {
+ CreateSpaceState.Step.ChooseType -> {
_viewEvents.post(CreateSpaceEvents.Dismiss)
}
- CreateSpaceState.Step.SetDetails -> {
+ CreateSpaceState.Step.SetDetails -> {
setState {
copy(
step = CreateSpaceState.Step.ChooseType,
@@ -159,7 +159,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
}
_viewEvents.post(CreateSpaceEvents.NavigateToChooseType)
}
- CreateSpaceState.Step.AddRooms -> {
+ CreateSpaceState.Step.AddRooms -> {
if (state.spaceType == SpaceType.Private && state.spaceTopology == SpaceTopology.MeAndTeammates) {
setState {
copy(
@@ -234,7 +234,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
)
)
when (result) {
- is CreateSpaceTaskResult.Success -> {
+ is CreateSpaceTaskResult.Success -> {
setState {
copy(creationResult = Success(result.spaceId))
}
@@ -246,7 +246,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
)
)
}
- is CreateSpaceTaskResult.PartialSuccess -> {
+ is CreateSpaceTaskResult.PartialSuccess -> {
// XXX what can we do here?
setState {
copy(creationResult = Success(result.spaceId))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index cb163622fa..0d5e64d3d7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -40,7 +40,7 @@ import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.utils.colorizeMatchingText
import im.vector.app.core.utils.isValidUrl
import im.vector.app.core.utils.openUrlInExternalBrowser
-import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import im.vector.app.databinding.FragmentSpaceDirectoryBinding
import im.vector.app.features.home.room.detail.timeline.TimelineEventController
import im.vector.app.features.matrixto.SpaceCardRenderer
import im.vector.app.features.permalink.PermalinkHandler
@@ -63,7 +63,7 @@ class SpaceDirectoryFragment @Inject constructor(
private val permalinkHandler: PermalinkHandler,
private val spaceCardRenderer: SpaceCardRenderer,
private val colorProvider: ColorProvider
-) : VectorBaseFragment(),
+) : VectorBaseFragment(),
SpaceDirectoryController.InteractionListener,
TimelineEventController.UrlClickCallback,
OnBackPressed {
@@ -71,7 +71,7 @@ class SpaceDirectoryFragment @Inject constructor(
override fun getMenuRes() = R.menu.menu_space_directory
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
- FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
+ FragmentSpaceDirectoryBinding.inflate(layoutInflater, container, false)
private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
@@ -85,7 +85,7 @@ class SpaceDirectoryFragment @Inject constructor(
it.setDisplayHomeAsUpEnabled(true)
}
epoxyController.listener = this
- views.roomDirectoryPickerList.configureWith(epoxyController)
+ views.spaceDirectoryList.configureWith(epoxyController)
viewModel.selectSubscribe(this, SpaceDirectoryState::canAddRooms) {
invalidateOptionsMenu()
@@ -97,7 +97,7 @@ class SpaceDirectoryFragment @Inject constructor(
override fun onDestroyView() {
epoxyController.listener = null
- views.roomDirectoryPickerList.cleanup()
+ views.spaceDirectoryList.cleanup()
super.onDestroyView()
}
diff --git a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index a1065ed10b..8c21e96bea 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -27,22 +27,22 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
@StyleRes val black: Int) {
object Default : ActivityOtherThemes(
- R.style.AppTheme_Dark,
- R.style.AppTheme_Black
+ R.style.Theme_Vector_Dark,
+ R.style.Theme_Vector_Black
)
object Launcher : ActivityOtherThemes(
- R.style.AppTheme_Launcher,
- R.style.AppTheme_Launcher
+ R.style.Theme_Vector_Launcher,
+ R.style.Theme_Vector_Launcher
)
object AttachmentsPreview : ActivityOtherThemes(
- R.style.AppTheme_AttachmentsPreview,
- R.style.AppTheme_AttachmentsPreview
+ R.style.Theme_Vector_Black_AttachmentsPreview,
+ R.style.Theme_Vector_Black_AttachmentsPreview
)
object VectorAttachmentsPreview : ActivityOtherThemes(
- R.style.AppTheme_Transparent,
- R.style.AppTheme_Transparent
+ R.style.Theme_Vector_Black_Transparent,
+ R.style.Theme_Vector_Black_Transparent
)
}
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index db8ad61c0a..c4c9ca63ae 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -114,10 +114,10 @@ object ThemeUtils {
currentTheme.set(aTheme)
context.setTheme(
when (aTheme) {
- SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.AppTheme_Dark else R.style.AppTheme_Light
- THEME_DARK_VALUE -> R.style.AppTheme_Dark
- THEME_BLACK_VALUE -> R.style.AppTheme_Black
- else -> R.style.AppTheme_Light
+ SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
+ THEME_DARK_VALUE -> R.style.Theme_Vector_Dark
+ THEME_BLACK_VALUE -> R.style.Theme_Vector_Black
+ else -> R.style.Theme_Vector_Light
}
)
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index e4d2571333..ab8af20063 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -21,11 +21,9 @@ import android.content.Intent
import android.webkit.WebChromeClient
import android.webkit.WebView
import androidx.annotation.CallSuper
-import im.vector.app.R
import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.databinding.ActivityVectorWebViewBinding
-
import org.matrix.android.sdk.api.session.Session
import javax.inject.Inject
@@ -48,7 +46,7 @@ class VectorWebViewActivity : VectorBaseActivity()
override fun initUiAndData() {
configureToolbar(views.webviewToolbar)
- waitingView = findViewById(R.id.simple_webview_loader)
+ waitingView = views.simpleWebviewLoader
views.simpleWebview.settings.apply {
// Enable Javascript
diff --git a/vector/src/main/res/drawable/ic_call_answer_video.xml b/vector/src/main/res/drawable/ic_call_answer_video.xml
new file mode 100644
index 0000000000..d3af4f7b70
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_call_answer_video.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
index 24fdbc94c2..8f7beaeb20 100644
--- a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
+++ b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
@@ -5,5 +5,5 @@
android:viewportHeight="30">
+ android:fillColor="?colorError"/>
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_16.xml b/vector/src/main/res/drawable/rounded_rect_shape_16.xml
index c2fc859525..27dabcaa74 100644
--- a/vector/src/main/res/drawable/rounded_rect_shape_16.xml
+++ b/vector/src/main/res/drawable/rounded_rect_shape_16.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_8.xml b/vector/src/main/res/drawable/rounded_rect_shape_8.xml
index aa51217152..9933e6192c 100644
--- a/vector/src/main/res/drawable/rounded_rect_shape_8.xml
+++ b/vector/src/main/res/drawable/rounded_rect_shape_8.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/vector/src/main/res/drawable/rounded_rect_stroke_8.xml b/vector/src/main/res/drawable/rounded_rect_stroke_8.xml
index 93ec91f276..576c5ad622 100644
--- a/vector/src/main/res/drawable/rounded_rect_stroke_8.xml
+++ b/vector/src/main/res/drawable/rounded_rect_stroke_8.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 9c52cd6851..f9e290f29e 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -26,6 +26,7 @@
+ android:textColor="?vctr_content_secondary" />
@@ -98,6 +98,7 @@
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index f664d4c60d..b24ea8a322 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -15,10 +15,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
+
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?colorOnPrimary"
+ tools:ignore="MissingPrefix"
+ tools:src="@drawable/ic_call_answer" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?colorOnPrimary"
+ tools:ignore="MissingPrefix" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 3fb677540e..5da9102e1e 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -5,8 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- tools:background="@android:color/darker_gray"
- tools:foreground="?android:attr/selectableItemBackground"
+ tools:background="?colorPrimary"
tools:style="@style/AlertStyle">
-
+
-
+
-
+
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 08533c5249..52784bc6af 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,17 +31,18 @@
+ android:textColor="?vctr_content_primary" />
+ android:layout_height="wrap_content"
+ android:padding="16dp">
+ android:textColor="?vctr_content_secondary" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+
+
+ android:textColor="?vctr_content_primary" />
@@ -84,11 +85,12 @@
tools:ignore="MissingPrefix" />
+ android:textColor="?vctr_content_primary" />
diff --git a/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
new file mode 100644
index 0000000000..6e46c87548
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index 10120747cf..03893a45f9 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -10,6 +10,7 @@
-
+
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 5c504bd7c0..d263180521 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -9,6 +9,7 @@
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index c4f2bb924b..2975df65d5 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -27,6 +27,7 @@
+ android:text="@string/encryption_information_verify_device_warning" />
+ android:text="@string/encryption_information_verify_device_warning2" />
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 7b12194604..38f376e7eb 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,17 +41,18 @@
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index c779d37bfc..d3c52a61ed 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -1,14 +1,18 @@
+ android:textColor="?vctr_content_primary"
+ android:textIsSelectable="true"
+ tools:text="Event content" />
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 7a2dafd08e..60797804c7 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -12,11 +12,11 @@
+ android:text="@string/devices_delete_dialog_text" />
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 0c6fad871e..584db222c0 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -13,6 +13,7 @@
android:paddingEnd="?dialogPreferredPadding">
@@ -58,7 +58,7 @@
@@ -48,6 +48,7 @@
@@ -75,7 +76,7 @@
@@ -41,15 +41,17 @@
@@ -28,19 +28,19 @@
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/reAuthFailureText" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index a4b6ae6b8d..d7c26a316a 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -10,17 +10,18 @@
+ android:textColor="?vctr_content_primary" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index c05b5f8d1c..32bee53581 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -10,14 +10,14 @@
+ android:textColor="?vctr_content_primary" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index 0aad3b1a10..ee411a94d6 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -10,12 +10,12 @@
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 8e98a0b1af..9c704f3a42 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -37,10 +37,13 @@
android:src="@drawable/ic_x_18dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/devToolKeyRequestTabs" />
+ android:layout_height="40dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_devtools_editor.xml b/vector/src/main/res/layout/fragment_devtools_editor.xml
index fd657555bc..b3fe9834d7 100644
--- a/vector/src/main/res/layout/fragment_devtools_editor.xml
+++ b/vector/src/main/res/layout/fragment_devtools_editor.xml
@@ -13,7 +13,6 @@
android:hint="@string/dev_tools_event_content_hint"
android:inputType="textMultiLine"
android:scrollHorizontally="true"
- android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 79ba14dba1..07e879e2ca 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -46,6 +46,7 @@
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 9133dd8d86..c8cde46247 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -12,11 +12,91 @@
android:id="@+id/homeDrawerHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?vctr_home_drawer_header_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ app:tint="?colorPrimary"
+ tools:ignore="MissingPrefix" />
@@ -136,11 +126,12 @@
android:id="@+id/homeDrawerBottomSeparator"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="?vctr_list_separator_on_surface"
+ android:background="?vctr_list_separator"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerHeaderSettingsView" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index 93489d31b9..db4393dccc 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -26,13 +26,13 @@
@@ -120,6 +120,7 @@
@@ -43,6 +43,7 @@
+ android:textColor="?vctr_content_primary" />
@@ -82,7 +82,7 @@
@@ -114,7 +117,7 @@
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_secondary" />
@@ -104,11 +108,12 @@
+ android:textColor="?vctr_content_secondary" />
+ android:text="@string/auth_recaptcha_message"
+ android:textColor="?vctr_content_secondary" />
@@ -67,7 +70,7 @@
@@ -78,7 +82,7 @@
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
@@ -71,12 +73,13 @@
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index fc5fc66285..0a5c10935a 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -27,28 +27,30 @@
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
@@ -96,7 +98,7 @@
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_primary" />
+ android:textColor="?vctr_content_secondary" />
@@ -211,11 +214,11 @@
-
+
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 995759dc4b..fbe504a2d6 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -21,6 +21,7 @@
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 94a5b84d78..a16d45591c 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -36,7 +36,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 9390edf7a2..374346c2b2 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -11,6 +11,7 @@
-
+
@@ -79,11 +79,11 @@
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 2c7fa6c586..58c13262e7 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -30,7 +30,7 @@
-
+ android:layout_height="match_parent">
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent">
+ tools:title="Title" />
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 9fe328ab6b..fac0c0f170 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -5,13 +5,14 @@
android:id="@+id/stateView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?colorSurface">
+ android:background="?android:colorBackground">
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index cf41d67a35..7d63c140f3 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,6 +48,7 @@
@@ -76,7 +76,7 @@
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 0aab5b34e6..b675ec9b30 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,22 +12,22 @@
diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml
new file mode 100644
index 0000000000..3d5932df4a
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_directory.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 6096c33d2f..e5c0a933d7 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -20,25 +20,13 @@
android:id="@+id/roomPreviewNoPreviewToolbar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
- app:navigationIcon="@drawable/ic_x_18dp">
+ app:navigationIcon="@drawable/ic_x_18dp"
+ app:navigationIconTint="?vctr_content_secondary">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_primary"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
@@ -156,6 +158,7 @@
@@ -187,7 +189,7 @@
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:tint="?vctr_content_secondary"
+ tools:ignore="MissingPrefix" />
@@ -110,13 +111,13 @@
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index 24d2aff598..e302138d55 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -20,12 +20,5 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center" />
-
-
-
-
-
-
-
-
+
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 65aa68dab6..f58790deec 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -6,6 +6,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index f4c2bbf0bc..5ba4faa698 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,11 +10,11 @@
@@ -27,17 +27,18 @@
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 9203cac6bf..6f4a4e176e 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -25,24 +25,24 @@
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 315af94be2..23addf5fe4 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,9 +1,9 @@
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 348520b665..483700c41f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,6 +53,7 @@
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 1098cb7ecd..3e2c775643 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -24,6 +24,7 @@
@@ -67,6 +67,7 @@
+ app:drawableStartCompat="@drawable/ic_warning_badge"
+ tools:text="@string/unable_to_send_message" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 23494c9006..db243184e5 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,83 +9,74 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index 27c680555f..f4e5aad33b 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -22,6 +22,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 59f43472b6..b98adec5e6 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -11,6 +11,7 @@
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 690b292de8..18e9d1d3ec 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -41,6 +41,7 @@
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_secondary" />
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index d74b254e67..26f85d8c97 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -11,14 +11,13 @@
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin">
-
@@ -30,20 +29,20 @@
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 23a5b3bda5..0ef46c56a6 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,6 +10,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 1db25f4c27..93c14acbac 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -10,13 +10,13 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index ef33ec3be7..932f5666c6 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -23,13 +23,13 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 9cc240e557..a23d4e30a7 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -24,6 +24,7 @@
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index f28d399d35..bc17752cbc 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -25,6 +25,7 @@
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index 81b9570e7e..165fc83d7b 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -2,11 +2,12 @@
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 16a77ce9cd..342237cdde 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -2,11 +2,12 @@
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index 5fc43a447a..a46bd1b2f1 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,6 +1,7 @@
+ android:textStyle="bold"
+ tools:text="Security" />
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index d5bd16e5b5..12aaf8a653 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -25,6 +25,7 @@
@@ -42,11 +42,11 @@
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index 2e890ec9e3..0fd1e96d4a 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -18,6 +18,7 @@
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 51b1f4d5f8..355f14cef3 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,6 +27,7 @@
+ android:textColor="?vctr_content_secondary" />
+ app:layout_constraintVertical_chainStyle="packed" />
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index ae3e6aa804..9f4cb5742c 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -11,11 +11,11 @@
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index eae4e97864..b4e6e24b2f 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -18,22 +18,22 @@
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 98446b92c7..74ae731b0e 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -26,11 +26,11 @@
+ tools:text="@tools:sample/lorem/random"
+ tools:visibility="visible" />
+ android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index d87337439e..e1d8b8edd6 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -41,6 +41,7 @@
@@ -64,7 +64,7 @@
+ android:fontFamily="monospace" />
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 49e9bff53a..ea881ccdd0 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -7,6 +7,7 @@
+ app:drawableStartCompat="@drawable/error"
+ tools:text="This room is continuation…" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 38b03c4159..7b5e62dca2 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -15,6 +15,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index f32d9cf813..a5357f2227 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -17,6 +17,7 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 3c551bea88..bf6a5b7479 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -41,6 +41,7 @@
@@ -45,12 +45,12 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 289489d98f..c8d635bada 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -63,12 +63,12 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 9a26855396..abcd679dea 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -21,6 +21,7 @@
+ app:drawableStartCompat="@drawable/ic_clock"
+ app:drawableTint="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index f924ca6dd5..8b024849cc 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -17,6 +17,7 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 9643144d20..e3a8bd7df4 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -7,12 +7,11 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index 23833d91c9..03504b12d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -23,12 +23,12 @@
@@ -36,7 +36,7 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 28bf58bcff..f2dbb3e6c6 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,11 +1,11 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index ff0effcb5f..fb2d8c2057 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -8,13 +8,13 @@
@@ -22,6 +22,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 66373100c1..39df45989c 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -8,10 +8,10 @@
@@ -23,6 +23,7 @@
@@ -61,12 +61,12 @@
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 6732e6d121..1e73fc09a7 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -9,12 +9,12 @@
+ android:textColor="@color/notification_accent_color" />
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index 2faab4921f..0a02ff7f54 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -16,6 +16,7 @@
-
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index af1d0dec90..6faa957862 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -1,14 +1,12 @@
-
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 69c513985f..d0afcea5f2 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -33,11 +33,11 @@
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index eb4a82a9be..2bc83fc993 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -2,6 +2,7 @@
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 278a8a8fd0..d406fed84f 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -12,6 +12,7 @@
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index e2b0566fdb..6a265f4edc 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -12,10 +12,10 @@
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 72a795db76..f31e86ed96 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -36,6 +36,7 @@
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 7af3262248..6dc5fd41c7 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -21,12 +21,13 @@
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index 9df48bbe5d..5242bfdf85 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -19,25 +19,26 @@
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 043736c190..9f26ed9a1a 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -9,6 +9,7 @@
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index 4d54d2980a..648ca91820 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -1,162 +1,167 @@
-
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp">
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_attachment_type_selector"
+ android:orientation="vertical"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ tools:ignore="UselessParent">
+ android:layout_height="match_parent"
+ android:layout_margin="16dp"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ android:weightSum="3">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:layout_height="match_parent"
+ android:layout_margin="16dp"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ android:weightSum="3">
-
+
-
+
-
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 8a950f17ea..5056f38e09 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -38,11 +38,11 @@
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index 871844a22a..3e0e307dc3 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -20,6 +20,7 @@
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 5f5944fa17..7850435c2d 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -9,6 +9,7 @@
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index bea00fbb15..65eb02e95c 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -7,11 +7,12 @@
+ android:textColor="?vctr_content_primary" />
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 67b23f9a94..fa4aa887be 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -23,13 +23,13 @@
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
index 858c3bc9c3..ac657e0df2 100644
--- a/vector/src/main/res/menu/menu_manage_space.xml
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -4,18 +4,18 @@
+ app:showAsAction="never" />
+ app:showAsAction="never" />
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_push_gateways.xml b/vector/src/main/res/menu/menu_push_gateways.xml
index 15709a1f1e..99b2bca963 100644
--- a/vector/src/main/res/menu/menu_push_gateways.xml
+++ b/vector/src/main/res/menu/menu_push_gateways.xml
@@ -6,6 +6,7 @@
android:id="@+id/refresh"
android:icon="@drawable/ic_refresh_cw"
android:title="@string/refresh"
+ app:iconTint="?colorPrimary"
app:showAsAction="always" />
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_space_add_room.xml b/vector/src/main/res/menu/menu_space_add_room.xml
index b11844673e..048b89892c 100644
--- a/vector/src/main/res/menu/menu_space_add_room.xml
+++ b/vector/src/main/res/menu/menu_space_add_room.xml
@@ -4,6 +4,5 @@
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_room_profile.xml b/vector/src/main/res/menu/vector_room_profile.xml
index 0ac3412497..ef1bbbc7d8 100644
--- a/vector/src/main/res/menu/vector_room_profile.xml
+++ b/vector/src/main/res/menu/vector_room_profile.xml
@@ -5,6 +5,6 @@
android:id="@+id/roomProfileShareAction"
android:icon="@drawable/ic_material_share"
android:title="@string/share"
- app:iconTint="?vctr_content_secondary"
+ app:iconTint="?colorSecondary"
app:showAsAction="ifRoom" />
\ No newline at end of file
diff --git a/vector/src/main/res/values-v23/theme_black.xml b/vector/src/main/res/values-v23/theme_black.xml
deleted file mode 100644
index ad6abc9fbe..0000000000
--- a/vector/src/main/res/values-v23/theme_black.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values-v23/theme_dark.xml b/vector/src/main/res/values-v23/theme_dark.xml
deleted file mode 100644
index c9fb7dab28..0000000000
--- a/vector/src/main/res/values-v23/theme_dark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values-v27/theme_black.xml b/vector/src/main/res/values-v27/theme_black.xml
deleted file mode 100644
index f8650c7e8b..0000000000
--- a/vector/src/main/res/values-v27/theme_black.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values-v27/theme_dark.xml b/vector/src/main/res/values-v27/theme_dark.xml
deleted file mode 100644
index ef0a39902a..0000000000
--- a/vector/src/main/res/values-v27/theme_dark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 80120b51bf..621ecb7aee 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -771,6 +771,7 @@
YES
NO
Continue
+ Continue Anyway
Remove
@@ -3399,4 +3400,7 @@
Some rooms may be hidden because they’re private and you need an invite.
Unnamed Room
+
+ "Teammate spaces aren’t quite ready but you can still give them a try"
+ "At the moment people might not be able to join any private rooms you make.\n\nWe’ll be improving this as part of the beta, but just wanted to let you know."
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
deleted file mode 100644
index faca4feb25..0000000000
--- a/vector/src/main/res/values/styles_toolbar.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
deleted file mode 100644
index 750dcaf10e..0000000000
--- a/vector/src/main/res/values/text_appearances.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file