From aeffaac065e3143a5d58c65296c3e4eedbbd32f0 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 12:52:52 +0200 Subject: [PATCH 01/10] Update layout https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2857%3A321 --- .../res/layout/fragment_user_code_show.xml | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml index 8cf5753993..10a5998d1d 100644 --- a/vector/src/main/res/layout/fragment_user_code_show.xml +++ b/vector/src/main/res/layout/fragment_user_code_show.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + @@ -62,35 +63,14 @@ - - - - + android:layout_height="wrap_content"> @@ -139,23 +118,44 @@ - + app:layout_constraintWidth_percent="0.8"> + + + + + + @@ -175,7 +175,7 @@ android:id="@+id/showUserCodeShareButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="24dp" android:minWidth="130dp" android:text="@string/user_code_share" app:icon="@drawable/ic_share" From 9a70ddf0b812cb80e238f712de2ec2c2ece16883 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 13:06:53 +0200 Subject: [PATCH 02/10] Fix color for tiles and space buttons Also remove unused resource --- .../src/main/res/drawable/rounded_rect_shape_16.xml | 11 ----------- vector/src/main/res/drawable/rounded_rect_shape_8.xml | 2 +- .../src/main/res/drawable/rounded_rect_stroke_8.xml | 11 ----------- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 vector/src/main/res/drawable/rounded_rect_shape_16.xml delete mode 100644 vector/src/main/res/drawable/rounded_rect_stroke_8.xml diff --git a/vector/src/main/res/drawable/rounded_rect_shape_16.xml b/vector/src/main/res/drawable/rounded_rect_shape_16.xml deleted file mode 100644 index c2fc859525..0000000000 --- a/vector/src/main/res/drawable/rounded_rect_shape_16.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 93ec91f276..0000000000 --- a/vector/src/main/res/drawable/rounded_rect_stroke_8.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file From 1ffe57ce94bc7155cc63eb83a8f8de13a16762f8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 13:27:21 +0200 Subject: [PATCH 03/10] Change vctr_header_background alias from vctr_content_quinary to vctr_system --- library/ui-styles/src/main/res/values/theme_dark.xml | 2 +- library/ui-styles/src/main/res/values/theme_light.xml | 2 +- vector/src/main/res/layout/item_profile_section.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml index a262dfe782..b9965439ff 100644 --- a/library/ui-styles/src/main/res/values/theme_dark.xml +++ b/library/ui-styles/src/main/res/values/theme_dark.xml @@ -43,7 +43,7 @@ #FFFFFFFF - ?vctr_content_quinary + ?vctr_system ?vctr_content_quinary ?vctr_system ?vctr_system diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml index 6a1010bf28..531f590b6c 100644 --- a/library/ui-styles/src/main/res/values/theme_light.xml +++ b/library/ui-styles/src/main/res/values/theme_light.xml @@ -43,7 +43,7 @@ #FF000000 - ?vctr_content_quinary + ?vctr_system ?vctr_content_quinary ?vctr_system ?vctr_system diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml index d32dbdc8e0..8e00a3c8ce 100644 --- a/vector/src/main/res/layout/item_profile_section.xml +++ b/vector/src/main/res/layout/item_profile_section.xml @@ -5,7 +5,7 @@ style="@style/Widget.Vector.TextView.Title" android:layout_width="match_parent" android:layout_height="56dp" - android:background="?vctr_list_separator_system" + android:background="?vctr_header_background" android:gravity="bottom" android:paddingStart="16dp" android:paddingEnd="16dp" From a619b0141a82d5994f47c23a9f8c412b78dd5e28 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 15:02:12 +0200 Subject: [PATCH 04/10] Rename file --- .../java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt | 4 ++-- .../vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt | 4 ++-- ...t_material_theme.xml => activity_debug_material_theme.xml} | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) rename library/ui-styles/src/debug/res/layout/{activity_test_material_theme.xml => activity_debug_material_theme.xml} (99%) diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt index f5f69b1db4..9998fd661f 100644 --- a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt +++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt @@ -21,12 +21,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding +import im.vector.lib.ui.styles.databinding.ActivityDebugMaterialThemeBinding class DebugBottomSheet : BottomSheetDialogFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { // Reuse tha Activity layout - val binding = ActivityTestMaterialThemeBinding.inflate(inflater, container, false) + val binding = ActivityDebugMaterialThemeBinding.inflate(inflater, container, false) return binding.root } } diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt index 492b359105..675edde4f2 100644 --- a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt +++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt @@ -23,14 +23,14 @@ import androidx.appcompat.app.AppCompatActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import im.vector.lib.ui.styles.R -import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding +import im.vector.lib.ui.styles.databinding.ActivityDebugMaterialThemeBinding // Rendering is not the same with VectorBaseActivity abstract class DebugMaterialThemeActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val views = ActivityTestMaterialThemeBinding.inflate(layoutInflater) + val views = ActivityDebugMaterialThemeBinding.inflate(layoutInflater) setContentView(views.root) setSupportActionBar(views.debugToolbar) diff --git a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml similarity index 99% rename from library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml rename to library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml index dca2f33abe..1e803530db 100644 --- a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml +++ b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml @@ -263,6 +263,7 @@ style="@style/DebugTextColorDemo.Black" android:background="?android:textColorLink" android:text="android:textColorLink" /> + From 9f101423e2507043d9009876307a7143bc3e6d51 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 15:08:51 +0200 Subject: [PATCH 05/10] Add some TextViews --- .../layout/activity_debug_material_theme.xml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml index 1e803530db..7df0facb12 100644 --- a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml +++ b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml @@ -268,6 +268,46 @@ + + + + + + + + + + Date: Fri, 18 Jun 2021 15:31:02 +0200 Subject: [PATCH 06/10] Add some TextViews --- .../vector/app/features/call/dialpad/CallDialPadBottomSheet.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt index 02e170d20c..e7c8602698 100644 --- a/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt @@ -71,7 +71,7 @@ class CallDialPadBottomSheet : VectorBaseBottomSheetDialogFragment Date: Fri, 18 Jun 2021 15:32:33 +0200 Subject: [PATCH 07/10] Use debouncedClick --- .../app/features/spaces/SpaceSettingsMenuBottomSheet.kt | 2 +- .../widgets/permissions/RoomWidgetPermissionBottomSheet.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt index 487f4406a3..c74dbaedbe 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt @@ -128,7 +128,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment From e12b9a3dfe2ab11f47b41efca9cb0a3e7a185a1f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 17:28:25 +0200 Subject: [PATCH 08/10] Fix crash due to style refacto --- vector/src/main/res/layout/fragment_login_terms.xml | 2 ++ vector/src/main/res/layout/fragment_login_terms_2.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml index 5a52f4d15d..84ae53ab92 100644 --- a/vector/src/main/res/layout/fragment_login_terms.xml +++ b/vector/src/main/res/layout/fragment_login_terms.xml @@ -55,6 +55,8 @@