Skip to content

Commit e5b670f

Browse files
philliphsuphilliphsu
committed
Update sw820dp and sw600dp dimens for grid time picker
1 parent 0673a2a commit e5b670f

File tree

9 files changed

+117
-20
lines changed

9 files changed

+117
-20
lines changed

‎bottomsheetpickers/src/main/res/layout-sw600dp-land/dialog_time_picker_grid.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2016 Phillip Hsu
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<LinearLayout
19+
xmlns:android="http://schemas.android.com/apk/res/android"
20+
android:id="@+id/time_picker_dialog"
21+
android:layout_width="match_parent"
22+
android:layout_height="wrap_content"
23+
android:orientation="horizontal"
24+
android:focusable="true" >
25+
26+
<FrameLayout
27+
android:id="@+id/time_display_background"
28+
android:layout_width="@dimen/left_side_width"
29+
android:layout_height="match_parent"
30+
android:background="@android:color/white" >
31+
<include
32+
layout="@layout/time_header_label"
33+
android:layout_width="match_parent"
34+
android:layout_height="match_parent"
35+
android:layout_gravity="center" />
36+
</FrameLayout>
37+
38+
<LinearLayout
39+
android:layout_width="match_parent"
40+
android:layout_height="@dimen/time_picker_pad_height"
41+
android:orientation="horizontal">
42+
43+
<com.philliphsu.bottomsheetpickers.time.grid.GridPickerLayout
44+
android:id="@+id/time_picker"
45+
style="@style/PadLayoutStyle.Numeric"/>
46+
47+
<include layout="@layout/pad_time_picker_sidebar" />
48+
49+
</LinearLayout>
50+
51+
</LinearLayout>

‎bottomsheetpickers/src/main/res/values-sw600dp-land/calculator_styles.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<item name="android:textSize">48sp</item>
3535
</style>
3636

37+
<!--TODO: Delete-->
3738
<style name="PadButtonStyle.Advanced">
3839
<item name="android:layout_margin">6dip</item>
3940
<item name="android:background">@drawable/pad_button_advanced_background</item>
@@ -50,6 +51,10 @@
5051
<item name="android:visibility">gone</item>
5152
</style>
5253

54+
<style name="PadButtonStyle.Numeric.Minute">
55+
<item name="android:textSize">30sp</item>
56+
</style>
57+
5358
<style name="PadButtonStyle.Operator">
5459
<item name="android:layout_margin">6dip</item>
5560
<item name="android:textSize">36sp</item>
@@ -60,6 +65,7 @@
6065
<item name="android:textSize">24sp</item>
6166
</style>
6267

68+
<!--TODO: Delete-->
6369
<style name="PadLayoutStyle.Advanced">
6470
<item name="android:layout_width">0dip</item>
6571
<item name="android:layout_weight">508</item>
@@ -73,20 +79,24 @@
7379

7480
<style name="PadLayoutStyle.Numeric">
7581
<item name="android:layout_width">0dip</item>
76-
<item name="android:layout_weight">532</item>
82+
<item name="android:layout_weight">592</item>
7783
<item name="android:paddingTop">10dip</item>
7884
<item name="android:paddingBottom">10dip</item>
7985
<item name="android:paddingStart">22dip</item>
8086
<item name="android:paddingEnd">18dip</item>
87+
<item name="android:paddingLeft">22dip</item>
88+
<item name="android:paddingRight">18dip</item>
8189
</style>
8290

8391
<style name="PadLayoutStyle.Operator">
8492
<item name="android:layout_width">0dip</item>
85-
<item name="android:layout_weight">240</item>
93+
<item name="android:layout_weight">180</item>
8694
<item name="android:paddingTop">10dip</item>
8795
<item name="android:paddingBottom">10dip</item>
8896
<item name="android:paddingStart">18dip</item>
8997
<item name="android:paddingEnd">18dip</item>
98+
<item name="android:paddingLeft">18dip</item>
99+
<item name="android:paddingRight">18dip</item>
90100
</style>
91101

92102
</resources>

‎bottomsheetpickers/src/main/res/values-sw600dp-land/dimens.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
-->
1919

2020
<resources>
21-
<dimen name="bottom_sheet_width">600dp</dimen>
21+
<dimen name="left_side_width">300dp</dimen>
22+
<dimen name="bottom_sheet_width">720dp</dimen>
2223
</resources>

‎bottomsheetpickers/src/main/res/values-sw600dp-port/calculator_styles.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<item name="android:textSize">48sp</item>
3838
</style>
3939

40+
<!--TODO: Delete-->
4041
<style name="PadButtonStyle.Advanced">
4142
<item name="android:layout_marginTop">8dip</item>
4243
<item name="android:layout_marginBottom">8dip</item>
@@ -56,11 +57,17 @@
5657
<item name="android:visibility">gone</item>
5758
</style>
5859

60+
<style name="PadButtonStyle.Numeric.Minute">
61+
<item name="android:textSize">30sp</item>
62+
</style>
63+
5964
<style name="PadButtonStyle.Operator">
6065
<item name="android:layout_marginTop">8dip</item>
6166
<item name="android:layout_marginBottom">8dip</item>
6267
<item name="android:layout_marginStart">16dip</item>
6368
<item name="android:layout_marginEnd">16dip</item>
69+
<item name="android:layout_marginLeft">16dip</item>
70+
<item name="android:layout_marginRight">16dip</item>
6471
<item name="android:textSize">36sp</item>
6572
</style>
6673

@@ -69,6 +76,7 @@
6976
<item name="android:textSize">24sp</item>
7077
</style>
7178

79+
<!--TODO: Delete-->
7280
<style name="PadLayoutStyle.Advanced">
7381
<item name="android:layout_height">0dip</item>
7482
<item name="android:layout_weight">256</item>
@@ -82,20 +90,24 @@
8290

8391
<style name="PadLayoutStyle.Numeric">
8492
<item name="android:layout_width">0dip</item>
85-
<item name="android:layout_weight">532</item>
93+
<item name="android:layout_weight">592</item>
8694
<item name="android:paddingTop">8dip</item>
8795
<item name="android:paddingBottom">8dip</item>
8896
<item name="android:paddingStart">16dip</item>
8997
<item name="android:paddingEnd">16dip</item>
98+
<item name="android:paddingLeft">16dip</item>
99+
<item name="android:paddingRight">16dip</item>
90100
</style>
91101

92102
<style name="PadLayoutStyle.Operator">
93103
<item name="android:layout_width">0dip</item>
94-
<item name="android:layout_weight">240</item>
104+
<item name="android:layout_weight">180</item>
95105
<item name="android:paddingTop">8dip</item>
96106
<item name="android:paddingBottom">8dip</item>
97107
<item name="android:paddingStart">0dip</item>
98108
<item name="android:paddingEnd">8dip</item>
109+
<item name="android:paddingLeft">0dip</item>
110+
<item name="android:paddingRight">8dip</item>
99111
</style>
100112

101113
<style name="PadLinearLayoutStyle">

‎bottomsheetpickers/src/main/res/values-sw600dp/dimens.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
<item name="text_size_multiplier_outer" format="float" type="string">0.11</item>
3030

3131

32-
<dimen name="time_label_size">60sp</dimen>
32+
<dimen name="time_label_size">75sp</dimen>
3333
<dimen name="extra_time_label_margin">-30dp</dimen>
34-
<dimen name="ampm_label_size">16sp</dimen>
34+
<dimen name="ampm_label_size">20sp</dimen>
3535
<dimen name="done_label_size">14sp</dimen>
36-
<dimen name="ampm_left_padding">6dip</dimen>
36+
<dimen name="ampm_left_padding">8dip</dimen>
3737
<dimen name="separator_padding">4dip</dimen>
38-
<dimen name="header_height">96dip</dimen>
38+
<dimen name="header_height">128dip</dimen>
3939
<dimen name="footer_height">48dip</dimen>
4040
<dimen name="minimum_margin_sides">48dip</dimen>
4141
<dimen name="minimum_margin_top_bottom">24dip</dimen>
@@ -87,7 +87,7 @@
8787
<!-- GridTimePickerDialog -->
8888
<dimen name="number_grid_24_hour_item_primary_text_size">30sp</dimen>
8989
<dimen name="number_grid_minute_text_size">28sp</dimen>
90-
<dimen name="time_picker_pad_height">336dp</dimen>
90+
<dimen name="time_picker_pad_height">440dp</dimen>
9191

9292
<!-- Bottom sheet specs -->
9393
<dimen name="bottom_sheet_edge_margin">32dp</dimen>

‎bottomsheetpickers/src/main/res/values-sw800dp-land/calculator_styles.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<item name="android:textSize">56sp</item>
3737
</style>
3838

39+
<!--TODO: Delete-->
3940
<style name="PadButtonStyle.Advanced">
4041
<item name="android:layout_margin">6dip</item>
4142
<item name="android:background">@drawable/pad_button_advanced_background</item>
@@ -52,6 +53,10 @@
5253
<item name="android:visibility">gone</item>
5354
</style>
5455

56+
<style name="PadButtonStyle.Numeric.Minute">
57+
<item name="android:textSize">36sp</item>
58+
</style>
59+
5560
<style name="PadButtonStyle.Operator">
5661
<item name="android:layout_margin">6dip</item>
5762
<item name="android:textSize">48sp</item>
@@ -62,6 +67,7 @@
6267
<item name="android:textSize">32sp</item>
6368
</style>
6469

70+
<!--TODO: Delete-->
6571
<style name="PadLayoutStyle.Advanced">
6672
<item name="android:layout_width">0dip</item>
6773
<item name="android:layout_weight">508</item>
@@ -75,20 +81,24 @@
7581

7682
<style name="PadLayoutStyle.Numeric">
7783
<item name="android:layout_width">0dip</item>
78-
<item name="android:layout_weight">532</item>
84+
<item name="android:layout_weight">592</item>
7985
<item name="android:paddingTop">10dip</item>
8086
<item name="android:paddingBottom">10dip</item>
8187
<item name="android:paddingStart">22dip</item>
8288
<item name="android:paddingEnd">18dip</item>
89+
<item name="android:paddingLeft">22dip</item>
90+
<item name="android:paddingRight">18dip</item>
8391
</style>
8492

8593
<style name="PadLayoutStyle.Operator">
8694
<item name="android:layout_width">0dip</item>
87-
<item name="android:layout_weight">240</item>
95+
<item name="android:layout_weight">180</item>
8896
<item name="android:paddingTop">10dip</item>
8997
<item name="android:paddingBottom">10dip</item>
9098
<item name="android:paddingStart">18dip</item>
9199
<item name="android:paddingEnd">18dip</item>
100+
<item name="android:paddingLeft">18dip</item>
101+
<item name="android:paddingRight">18dip</item>
92102
</style>
93103

94104
</resources>

‎bottomsheetpickers/src/main/res/values-sw800dp-port/calculator_styles.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<item name="android:textSize">56sp</item>
3737
</style>
3838

39+
<!--TODO: Delete-->
3940
<style name="PadButtonStyle.Advanced">
4041
<item name="android:layout_marginTop">8dip</item>
4142
<item name="android:layout_marginBottom">8dip</item>
@@ -55,11 +56,17 @@
5556
<item name="android:visibility">gone</item>
5657
</style>
5758

59+
<style name="PadButtonStyle.Numeric.Minute">
60+
<item name="android:textSize">36sp</item>
61+
</style>
62+
5863
<style name="PadButtonStyle.Operator">
5964
<item name="android:layout_marginTop">8dip</item>
6065
<item name="android:layout_marginBottom">8dip</item>
6166
<item name="android:layout_marginStart">16dip</item>
6267
<item name="android:layout_marginEnd">16dip</item>
68+
<item name="android:layout_marginLeft">16dip</item>
69+
<item name="android:layout_marginRight">16dip</item>
6370
<item name="android:textSize">48sp</item>
6471
</style>
6572

@@ -68,6 +75,7 @@
6875
<item name="android:textSize">32sp</item>
6976
</style>
7077

78+
<!--TODO: Delete-->
7179
<style name="PadLayoutStyle.Advanced">
7280
<item name="android:layout_height">0dip</item>
7381
<item name="android:layout_weight">256</item>
@@ -81,20 +89,24 @@
8189

8290
<style name="PadLayoutStyle.Numeric">
8391
<item name="android:layout_width">0dip</item>
84-
<item name="android:layout_weight">532</item>
92+
<item name="android:layout_weight">592</item>
8593
<item name="android:paddingTop">8dip</item>
8694
<item name="android:paddingBottom">8dip</item>
8795
<item name="android:paddingStart">16dip</item>
8896
<item name="android:paddingEnd">16dip</item>
97+
<item name="android:paddingLeft">16dip</item>
98+
<item name="android:paddingRight">16dip</item>
8999
</style>
90100

91101
<style name="PadLayoutStyle.Operator">
92102
<item name="android:layout_width">0dip</item>
93-
<item name="android:layout_weight">240</item>
103+
<item name="android:layout_weight">180</item>
94104
<item name="android:paddingTop">8dip</item>
95105
<item name="android:paddingBottom">8dip</item>
96106
<item name="android:paddingStart">0dip</item>
97107
<item name="android:paddingEnd">8dip</item>
108+
<item name="android:paddingLeft">0dip</item>
109+
<item name="android:paddingRight">8dip</item>
98110
</style>
99111

100112
<style name="PadLinearLayoutStyle">

‎bottomsheetpickers/src/main/res/values-sw820dp-land/dimens.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<dimen name="bottom_sheet_width">800dp</dimen>
3+
<dimen name="left_side_width">320dp</dimen>
4+
<dimen name="bottom_sheet_width">900dp</dimen>
45
</resources>

‎bottomsheetpickers/src/main/res/values-sw820dp/dimens.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
<item name="text_size_multiplier_outer" format="float" type="string">0.11</item>
3030

3131

32-
<dimen name="time_label_size">60sp</dimen>
32+
<dimen name="time_label_size">90sp</dimen>
3333
<dimen name="extra_time_label_margin">-30dp</dimen>
34-
<dimen name="ampm_label_size">16sp</dimen>
34+
<dimen name="ampm_label_size">24sp</dimen>
3535
<dimen name="done_label_size">14sp</dimen>
36-
<dimen name="ampm_left_padding">6dip</dimen>
36+
<dimen name="ampm_left_padding">10dip</dimen>
3737
<dimen name="separator_padding">4dip</dimen>
38-
<dimen name="header_height">96dip</dimen>
38+
<dimen name="header_height">144dip</dimen>
3939
<dimen name="footer_height">48dip</dimen>
4040
<dimen name="minimum_margin_sides">48dip</dimen>
4141
<dimen name="minimum_margin_top_bottom">24dip</dimen>
@@ -87,7 +87,7 @@
8787
<!-- GridTimePickerDialog -->
8888
<dimen name="number_grid_24_hour_item_primary_text_size">30sp</dimen>
8989
<dimen name="number_grid_minute_text_size">28sp</dimen>
90-
<dimen name="time_picker_pad_height">336dp</dimen>
90+
<dimen name="time_picker_pad_height">480dp</dimen>
9191

9292
<!-- Bottom sheet specs -->
9393
<dimen name="bottom_sheet_edge_margin">40dp</dimen>

0 commit comments

Comments
 (0)