Implement the custom style flow part 2
- Adjust custom style flow pages layout
Doc: https://docs.google.com/presentation/d/15JadcGi5k1_0znUN_XdFpU7UxeXwxjK3Y7LxvhW5ETM/edit#slide=id.g85fff7c452_6_15
Video: https://drive.google.com/file/d/1jJIx__AVBuD_p2pIE25GtDjoCZiBBQw0/view?usp=sharing
Bug: 151285666
Test: manually
Change-Id: I446f418020a3a2cedc83d52b4c5fce8311346ae3
diff --git a/res/drawable/color_chip.xml b/res/drawable/color_chip.xml
index bc09992..11301b1 100644
--- a/res/drawable/color_chip.xml
+++ b/res/drawable/color_chip.xml
@@ -18,10 +18,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
- android:drawable="@drawable/color_chip_filled" />
- <item
- android:state_activated="false"
android:drawable="@drawable/color_chip_hollow" />
<item
- android:drawable="@drawable/color_chip_hollow"/>
+ android:state_activated="false"
+ android:drawable="@drawable/color_chip_filled" />
+ <item
+ android:drawable="@drawable/color_chip_filled"/>
</selector>
\ No newline at end of file
diff --git a/res/drawable/color_chip_hollow.xml b/res/drawable/color_chip_hollow.xml
index c0eab74..699dc60 100644
--- a/res/drawable/color_chip_hollow.xml
+++ b/res/drawable/color_chip_hollow.xml
@@ -15,10 +15,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="ring"
- android:innerRadius="10dp"
- android:thickness="6dp"
- android:useLevel="false">
- <solid android:color="@android:color/black"/>
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:height="@dimen/component_color_chip_size"
+ android:width="@dimen/component_color_chip_size"
+ android:gravity="center">
+ <shape
+ android:shape="oval">
+ <solid android:color="@android:color/black" />
+ </shape>
+ </item>
+ <item
+ android:height="@dimen/component_color_chip_container_size"
+ android:width="@dimen/component_color_chip_container_size"
+ android:gravity="center">
+ <shape
+ android:shape="ring"
+ android:innerRadius="24dp"
+ android:thickness="@dimen/option_border_width"
+ android:useLevel="false">
+ <solid android:color="@android:color/black"/>
+ </shape>
+ </item>
+</layer-list>
+
diff --git a/res/layout/fragment_custom_theme_component.xml b/res/layout/fragment_custom_theme_component.xml
index 7b3549e..fb3e5b3 100644
--- a/res/layout/fragment_custom_theme_component.xml
+++ b/res/layout/fragment_custom_theme_component.xml
@@ -50,6 +50,7 @@
android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"
android:layout_marginTop="@dimen/preview_page_top_margin"/>
</FrameLayout>
+
<View
android:id="@+id/divider"
android:layout_width="match_parent"
diff --git a/res/layout/fragment_custom_theme_name.xml b/res/layout/fragment_custom_theme_name.xml
index 27a8f19..ab3c459 100644
--- a/res/layout/fragment_custom_theme_name.xml
+++ b/res/layout/fragment_custom_theme_name.xml
@@ -36,55 +36,51 @@
android:clipToPadding="false"
android:background="@color/fullscreen_preview_background"
app:layout_constrainedHeight="true"
- app:layout_constraintBottom_toTopOf="@+id/guideline"
+ app:layout_constraintBottom_toTopOf="@+id/component_options_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0">
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintHeight_percent="@dimen/preview_pager_maximum_height_ratio">
+
<include layout="@layout/theme_preview_card"/>
</FrameLayout>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_percent=".7"/>
-
<TextView
android:id="@+id/component_options_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_marginStart="10dp"
- android:layout_marginEnd="10dp"
- android:layout_marginBottom="10dp"
+ android:layout_marginVertical="18dp"
+ android:layout_marginHorizontal="16dp"
android:textAlignment="center"
android:textAppearance="@style/TitleTextAppearance"
android:textSize="@dimen/component_options_title_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/component_preview_container"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintVertical_bias=".15"/>
+ app:layout_constraintBottom_toTopOf="@+id/edit_text_container"/>
- <EditText
- android:id="@+id/custom_theme_name"
- style="@style/CustomThemeNameEditText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:importantForAutofill="no"
- android:minWidth="300dp"
- app:layout_constraintBottom_toBottomOf="parent"
+ <FrameLayout
+ android:id="@+id/edit_text_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/component_options_title"
- app:layout_constraintVertical_bias=".25"/>
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="1">
-
+ <EditText
+ android:id="@+id/custom_theme_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="16dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center|top"
+ android:importantForAutofill="no"
+ android:minWidth="300dp"
+ style="@style/CustomThemeNameEditText"/>
+ </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
-
</LinearLayout>
diff --git a/res/layout/theme_color_option.xml b/res/layout/theme_color_option.xml
index 7f03c21..9a3c4c4 100644
--- a/res/layout/theme_color_option.xml
+++ b/res/layout/theme_color_option.xml
@@ -18,12 +18,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:padding="8dp">
+ android:layout_marginTop="28dp"
+ android:layout_marginHorizontal="@dimen/component_options_margin_horizontal">
<ImageView
android:id="@+id/option_tile"
android:layout_width="@dimen/component_color_chip_container_size"
android:layout_height="@dimen/component_color_chip_container_size"
android:layout_gravity="center"
+ android:scaleType="center"
android:src="@drawable/color_chip"/>
</FrameLayout>
diff --git a/res/layout/theme_font_option.xml b/res/layout/theme_font_option.xml
index 48dcaa2..dea4f78 100644
--- a/res/layout/theme_font_option.xml
+++ b/res/layout/theme_font_option.xml
@@ -19,13 +19,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView
- android:id="@+id/option_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="@dimen/theme_option_label_margin"
- android:textAppearance="@style/OptionTitleTextAppearance"/>
<FrameLayout
android:id="@+id/option_tile"
android:layout_width="@dimen/option_tile_width"
@@ -33,6 +26,7 @@
android:layout_gravity="center_horizontal"
android:paddingHorizontal="@dimen/option_tile_padding_horizontal"
android:paddingVertical="@dimen/option_tile_padding_vertical"
+ android:layout_marginHorizontal="@dimen/component_options_margin_horizontal"
android:background="@drawable/option_border">
<TextView
android:id="@+id/thumbnail_text"
diff --git a/res/layout/theme_icon_option.xml b/res/layout/theme_icon_option.xml
index 62925ad..292b8cd 100644
--- a/res/layout/theme_icon_option.xml
+++ b/res/layout/theme_icon_option.xml
@@ -16,16 +16,9 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView
- android:id="@+id/option_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="@dimen/theme_option_label_margin"
- android:textAppearance="@style/OptionTitleTextAppearance"/>
<FrameLayout
android:id="@+id/option_tile"
android:layout_width="@dimen/option_tile_width"
@@ -33,6 +26,7 @@
android:layout_gravity="center_horizontal"
android:paddingHorizontal="@dimen/option_tile_padding_horizontal"
android:paddingVertical="@dimen/option_tile_padding_vertical"
+ android:layout_marginHorizontal="@dimen/component_options_margin_horizontal"
android:background="@drawable/option_border">
<ImageView
android:id="@+id/option_icon"
diff --git a/res/layout/theme_shape_option.xml b/res/layout/theme_shape_option.xml
index 94e31ea..c5682c0 100644
--- a/res/layout/theme_shape_option.xml
+++ b/res/layout/theme_shape_option.xml
@@ -16,15 +16,14 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/option_tile"
android:layout_width="@dimen/option_tile_width"
android:layout_height="@dimen/option_tile_width"
android:layout_gravity="center"
- android:layout_marginTop="16dp"
- android:padding="2dp">
+ android:layout_marginHorizontal="@dimen/component_options_margin_horizontal">
<ImageView
android:id="@+id/shape_thumbnail"
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 461b39e..4f78920 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -99,15 +99,16 @@
<dimen name="custom_theme_nav_height">56dp</dimen>
<!-- Note, using dp instead of sp as this is just the font thumbnail, not text -->
- <dimen name="font_comonent_option_thumbnail_size">32dp</dimen>
+ <dimen name="font_comonent_option_thumbnail_size">36dp</dimen>
<dimen name="component_icon_thumb_size">40dp</dimen>
- <dimen name="component_color_chip_size">32dp</dimen>
- <dimen name="component_color_chip_container_size">33dp</dimen>
+ <dimen name="component_color_chip_size">40dp</dimen>
+ <dimen name="component_color_chip_container_size">52dp</dimen>
<dimen name="component_shape_thumb_size">72dp</dimen>
- <dimen name="component_options_title_size">18sp</dimen>
+ <dimen name="component_options_title_size">20sp</dimen>
+ <dimen name="component_options_margin_horizontal">4dp</dimen>
<!-- For a corner radius of this size or larger, we'll preview a rounded qsb widget. -->
<dimen name="roundCornerThreshold">16dp</dimen>