From cbb6e89952b546bdb8f0c0aeffcde926b0985bb7 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 19 Apr 2023 15:44:44 +1000 Subject: [PATCH 1/3] Update dashboard card domain to v2 Updating dashboard card domain ui to match latest v2 --- .../drawable-night/browser_address_bar.xml | 38 +++++++++++++++++++ .../main/res/drawable/browser_address_bar.xml | 38 +++++++++++++++++++ .../main/res/layout/dashboard_card_domain.xml | 26 ++++++------- .../main/res/values/dashboard_card_styles.xml | 11 +++--- WordPress/src/main/res/values/dimens.xml | 1 + WordPress/src/main/res/values/strings.xml | 2 +- 6 files changed, 97 insertions(+), 19 deletions(-) create mode 100644 WordPress/src/main/res/drawable-night/browser_address_bar.xml create mode 100644 WordPress/src/main/res/drawable/browser_address_bar.xml diff --git a/WordPress/src/main/res/drawable-night/browser_address_bar.xml b/WordPress/src/main/res/drawable-night/browser_address_bar.xml new file mode 100644 index 000000000000..7ac298d9f7fa --- /dev/null +++ b/WordPress/src/main/res/drawable-night/browser_address_bar.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/browser_address_bar.xml b/WordPress/src/main/res/drawable/browser_address_bar.xml new file mode 100644 index 000000000000..4d0168e5c8fe --- /dev/null +++ b/WordPress/src/main/res/drawable/browser_address_bar.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/layout/dashboard_card_domain.xml b/WordPress/src/main/res/layout/dashboard_card_domain.xml index 1eb8cab08a3f..fa73436f17e2 100644 --- a/WordPress/src/main/res/layout/dashboard_card_domain.xml +++ b/WordPress/src/main/res/layout/dashboard_card_domain.xml @@ -29,34 +29,34 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/dashboard_card_domain_title" - android:textAlignment="viewStart" android:textAppearance="@style/dashboard_card_title" app:layout_constraintEnd_toStartOf="@+id/dashboard_domain_card_more" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + android:paddingTop="@dimen/margin_extra_small_large" + android:importantForAccessibility="no" + android:scaleType="centerCrop" + android:src="@drawable/browser_address_bar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/dashboard_card_domain_title" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/dashboard_card_domain_image" /> diff --git a/WordPress/src/main/res/values/dashboard_card_styles.xml b/WordPress/src/main/res/values/dashboard_card_styles.xml index 9a0190e4889f..ad2e89b8d864 100644 --- a/WordPress/src/main/res/values/dashboard_card_styles.xml +++ b/WordPress/src/main/res/values/dashboard_card_styles.xml @@ -2,16 +2,17 @@ diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 6e0c28fbe240..351a23fd530b 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -115,6 +115,7 @@ 48dp 64dp 68dp + 114dp 16dp 160dp -8dp diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 9014a981c7f3..45a0c329694a 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -4457,7 +4457,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Close - Own your online identity with a custom domain + Find a custom domain Stake your claim on your corner of the web with a site address that\'s easy to find, share, and follow. Hide this From 1037d5245354b40b5c3fcad710036bd5af339fda Mon Sep 17 00:00:00 2001 From: Ravi Date: Tue, 25 Apr 2023 18:51:29 +1000 Subject: [PATCH 2/3] Update browser graphic images --- .../drawable-night/browser_address_bar.xml | 64 ++++++++++--------- .../main/res/drawable/browser_address_bar.xml | 64 ++++++++++--------- 2 files changed, 70 insertions(+), 58 deletions(-) diff --git a/WordPress/src/main/res/drawable-night/browser_address_bar.xml b/WordPress/src/main/res/drawable-night/browser_address_bar.xml index 7ac298d9f7fa..3d0f1e47a96b 100644 --- a/WordPress/src/main/res/drawable-night/browser_address_bar.xml +++ b/WordPress/src/main/res/drawable-night/browser_address_bar.xml @@ -6,33 +6,39 @@ android:viewportWidth="311" android:viewportHeight="110" tools:ignore="VectorRaster"> - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/browser_address_bar.xml b/WordPress/src/main/res/drawable/browser_address_bar.xml index 4d0168e5c8fe..ddce9484a0a4 100644 --- a/WordPress/src/main/res/drawable/browser_address_bar.xml +++ b/WordPress/src/main/res/drawable/browser_address_bar.xml @@ -6,33 +6,39 @@ android:viewportWidth="311" android:viewportHeight="110" tools:ignore="VectorRaster"> - - - - - - - - - - - + + + + + + + + + + + + + From 904bfd30234d5f7128d45984c5c7dcaa4aec67cc Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 26 Apr 2023 10:46:49 +1000 Subject: [PATCH 3/3] Handle Bold text setting Set text to Bold when Bold text seting is toggled on in system settings --- WordPress/src/main/res/layout/dashboard_card_domain.xml | 4 ++-- WordPress/src/main/res/values/dashboard_card_styles.xml | 3 +-- WordPress/src/main/res/values/dimens.xml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/res/layout/dashboard_card_domain.xml b/WordPress/src/main/res/layout/dashboard_card_domain.xml index fa73436f17e2..00e15cb5401e 100644 --- a/WordPress/src/main/res/layout/dashboard_card_domain.xml +++ b/WordPress/src/main/res/layout/dashboard_card_domain.xml @@ -26,10 +26,10 @@ @@ -48,11 +48,11 @@ diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 351a23fd530b..f754bcce055e 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -174,6 +174,7 @@ 10sp 12sp 14sp + 15sp 16sp 18sp 20sp