Skip to content

Commit a5be5fb

Browse files
committed
Improve preview activity layout
Update preview image styles. Add theme attribute for image style in landscape mode.
1 parent 4961664 commit a5be5fb

File tree

8 files changed

+34
-15
lines changed

8 files changed

+34
-15
lines changed

dynamic-support/src/main/res/layout-land/ads_preview_image.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
<LinearLayout
3030
android:layout_width="match_parent"
31-
android:layout_height="match_parent"
32-
android:gravity="center_horizontal"
31+
android:layout_height="wrap_content"
32+
android:gravity="center"
3333
android:orientation="vertical">
3434

3535
<FrameLayout
@@ -46,11 +46,8 @@
4646
android:orientation="horizontal">
4747

4848
<com.pranavpandey.android.dynamic.support.widget.DynamicImageView
49-
style="?attr/ads_widgetImagePreview"
50-
android:id="@+id/ads_preview_image"
51-
android:layout_width="0dp"
52-
android:layout_height="wrap_content"
53-
android:layout_weight="0.45" />
49+
style="?attr/ads_widgetImagePreviewLand"
50+
android:id="@+id/ads_preview_image" />
5451

5552
<com.pranavpandey.android.dynamic.support.widget.DynamicCardView
5653
style="?attr/ads_widgetCard"

dynamic-support/src/main/res/layout/ads_preview_image.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<LinearLayout
3030
android:layout_width="match_parent"
31-
android:layout_height="match_parent"
31+
android:layout_height="wrap_content"
3232
android:gravity="center_horizontal"
3333
android:orientation="vertical">
3434

@@ -41,16 +41,11 @@
4141

4242
<com.pranavpandey.android.dynamic.support.widget.DynamicImageView
4343
style="?attr/ads_widgetImagePreview"
44-
android:id="@+id/ads_preview_image"
45-
android:layout_width="match_parent"
46-
android:layout_height="0dp"
47-
android:layout_weight="0.6"
48-
android:minHeight="@dimen/ads_preview_code_size_small" />
44+
android:id="@+id/ads_preview_image" />
4945

5046
<FrameLayout
5147
android:layout_width="match_parent"
52-
android:layout_height="0dp"
53-
android:layout_weight="0.4">
48+
android:layout_height="wrap_content">
5449

5550
<com.pranavpandey.android.dynamic.support.widget.DynamicCardView
5651
style="?attr/ads_widgetCard"

dynamic-support/src/main/res/values/attrs_theme.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@
329329
<attr name="ads_widgetImageHeaderAppBar" format="reference" />
330330
<!-- The preview image style. -->
331331
<attr name="ads_widgetImagePreview" format="reference" />
332+
<!-- The preview image style for landscape mode. -->
333+
<attr name="ads_widgetImagePreviewLand" format="reference" />
332334
<!-- The drag indicator image style. -->
333335
<attr name="ads_widgetImageDragIndicator" format="reference" />
334336
<!-- The empty image style. -->

dynamic-support/src/main/res/values/integers.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
<item name="ads_theme_preview_content_weight_start" type="integer" format="float">0.5</item>
6565
<item name="ads_theme_preview_content_weight_end" type="integer" format="float">0.3</item>
6666

67+
<!-- Preview -->
68+
<item name="ads_preview_weight_image_land" type="integer" format="float">0.45</item>
69+
6770
<!-- Toast -->
6871
<item name="ads_toast_alpha" type="integer" format="float">0.95</item>
6972

dynamic-support/src/main/res/values/styles.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,9 @@
828828
</style>
829829

830830
<style name="Widget.Dynamic.Image.Preview">
831+
<item name="android:layout_width">match_parent</item>
832+
<item name="android:layout_height">wrap_content</item>
833+
<item name="android:minHeight">@dimen/ads_preview_code_size_small</item>
831834
<item name="android:layout_marginLeft">@dimen/ads_card_view_margin_horizontal</item>
832835
<item name="android:layout_marginStart">@dimen/ads_card_view_margin_horizontal</item>
833836
<item name="android:layout_marginTop">@dimen/ads_card_view_margin_vertical</item>
@@ -836,6 +839,11 @@
836839
<item name="android:layout_marginBottom">@dimen/ads_card_view_margin_vertical</item>
837840
<item name="adt_colorType">primary</item>
838841
</style>
842+
<style name="Widget.Dynamic.Image.Preview.Land">
843+
<item name="android:layout_width">0dp</item>
844+
<item name="android:layout_height">wrap_content</item>
845+
<item name="android:layout_weight">@integer/ads_preview_weight_image_land</item>
846+
</style>
839847

840848
<style name="Widget.Dynamic.Image.DragIndicator">
841849
<item name="android:layout_width">@dimen/ads_bottom_sheet_indicator_width</item>

dynamic-support/src/main/res/values/styles_v2.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,9 @@
728728
</style>
729729

730730
<style name="Widget.Dynamic2.Image.Preview">
731+
<item name="android:layout_width">match_parent</item>
732+
<item name="android:layout_height">wrap_content</item>
733+
<item name="android:minHeight">@dimen/ads_preview_code_size_small</item>
731734
<item name="android:layout_marginLeft">@dimen/ads_card_view_margin_horizontal</item>
732735
<item name="android:layout_marginStart">@dimen/ads_card_view_margin_horizontal</item>
733736
<item name="android:layout_marginTop">@dimen/ads_card_view_margin_vertical</item>
@@ -736,6 +739,11 @@
736739
<item name="android:layout_marginBottom">@dimen/ads_card_view_margin_vertical</item>
737740
<item name="adt_colorType">primary</item>
738741
</style>
742+
<style name="Widget.Dynamic2.Image.Preview.Land">
743+
<item name="android:layout_width">0dp</item>
744+
<item name="android:layout_height">wrap_content</item>
745+
<item name="android:layout_weight">@integer/ads_preview_weight_image_land</item>
746+
</style>
739747

740748
<style name="Widget.Dynamic2.Image.DragIndicator">
741749
<item name="android:layout_width">@dimen/ads_bottom_sheet_indicator_width</item>

dynamic-support/src/main/res/values/themes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
<item name="ads_widgetImageHeader">@style/Widget.Dynamic.Image.Header</item>
209209
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic.Image.Header.AppBar</item>
210210
<item name="ads_widgetImagePreview">@style/Widget.Dynamic.Image.Preview</item>
211+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic.Image.Preview.Land</item>
211212
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic.Image.DragIndicator</item>
212213
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic.Image.Empty</item>
213214
<item name="ads_widgetImageCard">@style/Widget.Dynamic.Image.Card</item>
@@ -488,6 +489,7 @@
488489
<item name="ads_widgetImageHeader">@style/Widget.Dynamic.Image.Header</item>
489490
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic.Image.Header.AppBar</item>
490491
<item name="ads_widgetImagePreview">@style/Widget.Dynamic.Image.Preview</item>
492+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic.Image.Preview.Land</item>
491493
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic.Image.DragIndicator</item>
492494
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic.Image.Empty</item>
493495
<item name="ads_widgetImageCard">@style/Widget.Dynamic.Image.Card</item>
@@ -762,6 +764,7 @@
762764
<item name="ads_widgetImageHeader">@style/Widget.Dynamic.Image.Header</item>
763765
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic.Image.Header.AppBar</item>
764766
<item name="ads_widgetImagePreview">@style/Widget.Dynamic.Image.Preview</item>
767+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic.Image.Preview.Land</item>
765768
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic.Image.DragIndicator</item>
766769
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic.Image.Empty</item>
767770
<item name="ads_widgetImageCard">@style/Widget.Dynamic.Image.Card</item>

dynamic-support/src/main/res/values/themes_v2.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
<item name="ads_widgetImageHeader">@style/Widget.Dynamic2.Image.Header</item>
222222
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic2.Image.Header.AppBar</item>
223223
<item name="ads_widgetImagePreview">@style/Widget.Dynamic2.Image.Preview</item>
224+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic2.Image.Preview.Land</item>
224225
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic2.Image.DragIndicator</item>
225226
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic2.Image.Empty</item>
226227
<item name="ads_widgetImageCard">@style/Widget.Dynamic2.Image.Card</item>
@@ -516,6 +517,7 @@
516517
<item name="ads_widgetImageHeader">@style/Widget.Dynamic2.Image.Header</item>
517518
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic2.Image.Header.AppBar</item>
518519
<item name="ads_widgetImagePreview">@style/Widget.Dynamic2.Image.Preview</item>
520+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic2.Image.Preview.Land</item>
519521
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic2.Image.DragIndicator</item>
520522
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic2.Image.Empty</item>
521523
<item name="ads_widgetImageCard">@style/Widget.Dynamic2.Image.Card</item>
@@ -805,6 +807,7 @@
805807
<item name="ads_widgetImageHeader">@style/Widget.Dynamic2.Image.Header</item>
806808
<item name="ads_widgetImageHeaderAppBar">@style/Widget.Dynamic2.Image.Header.AppBar</item>
807809
<item name="ads_widgetImagePreview">@style/Widget.Dynamic2.Image.Preview</item>
810+
<item name="ads_widgetImagePreviewLand">@style/Widget.Dynamic2.Image.Preview.Land</item>
808811
<item name="ads_widgetImageDragIndicator">@style/Widget.Dynamic2.Image.DragIndicator</item>
809812
<item name="ads_widgetImageEmpty">@style/Widget.Dynamic2.Image.Empty</item>
810813
<item name="ads_widgetImageCard">@style/Widget.Dynamic2.Image.Card</item>

0 commit comments

Comments
 (0)