Skip to content

Commit efcde28

Browse files
aforcieraforcier
committed
Added editor layout for tablets (sw600dp)
1 parent 5e59531 commit efcde28

File tree

3 files changed

+140
-3
lines changed

3 files changed

+140
-3
lines changed

‎WordPressEditor/src/main/res/layout-sw600dp/fragment_editor.xml‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
tools:context="org.wordpress.android.editor.EditorFragment">
6+
7+
<include
8+
layout="@layout/editor_webview"
9+
android:id="@+id/webview" />
10+
11+
<LinearLayout
12+
android:id="@+id/format_bar"
13+
android:layout_width="fill_parent"
14+
android:layout_height="@dimen/format_bar_height"
15+
android:layout_gravity="bottom"
16+
android:background="@android:color/white"
17+
android:orientation="vertical">
18+
19+
<View
20+
android:id="@+id/format_bar_horizontal_divider"
21+
android:layout_width="fill_parent"
22+
android:layout_height="@dimen/format_bar_horizontal_divider_height"
23+
style="@style/Divider"/>
24+
25+
<LinearLayout
26+
android:id="@+id/format_bar_buttons"
27+
android:layout_width="fill_parent"
28+
android:layout_height="@dimen/format_bar_height"
29+
android:layout_gravity="bottom"
30+
android:gravity="center"
31+
android:orientation="horizontal"
32+
tools:ignore="RtlHardcoded">
33+
34+
<LinearLayout
35+
style="@style/FormatBarTabletGroup"
36+
android:layout_width="wrap_content"
37+
android:layout_height="fill_parent">
38+
39+
<ToggleButton
40+
android:id="@+id/format_bar_button_media"
41+
style="@style/FormatBarButtonTablet"
42+
android:layout_width="wrap_content"
43+
android:layout_height="fill_parent"
44+
android:background="@drawable/format_bar_button_media_selector"/>
45+
</LinearLayout>
46+
47+
<LinearLayout
48+
style="@style/FormatBarTabletGroup"
49+
android:layout_width="wrap_content"
50+
android:layout_height="fill_parent">
51+
52+
<ToggleButton
53+
android:id="@+id/format_bar_button_bold"
54+
style="@style/FormatBarButtonTablet"
55+
android:layout_width="wrap_content"
56+
android:layout_height="fill_parent"
57+
android:background="@drawable/format_bar_button_bold_selector"/>
58+
59+
<ToggleButton
60+
android:id="@+id/format_bar_button_italic"
61+
style="@style/FormatBarButtonTablet"
62+
android:layout_width="wrap_content"
63+
android:layout_height="fill_parent"
64+
android:background="@drawable/format_bar_button_italic_selector"/>
65+
66+
<ToggleButton
67+
android:id="@+id/format_bar_button_strikethrough"
68+
style="@style/FormatBarButtonTablet"
69+
android:layout_width="wrap_content"
70+
android:layout_height="fill_parent"
71+
android:background="@drawable/format_bar_button_strikethrough_selector"/>
72+
</LinearLayout>
73+
74+
<LinearLayout
75+
style="@style/FormatBarTabletGroup"
76+
android:layout_width="wrap_content"
77+
android:layout_height="fill_parent">
78+
79+
<ToggleButton
80+
android:id="@+id/format_bar_button_link"
81+
style="@style/FormatBarButtonTablet"
82+
android:layout_width="wrap_content"
83+
android:layout_height="fill_parent"
84+
android:background="@drawable/format_bar_button_link_selector"/>
85+
</LinearLayout>
86+
87+
<LinearLayout
88+
style="@style/FormatBarTabletGroup"
89+
android:layout_width="wrap_content"
90+
android:layout_height="fill_parent">
91+
92+
<ToggleButton
93+
android:id="@+id/format_bar_button_ul"
94+
style="@style/FormatBarButtonTablet"
95+
android:layout_width="wrap_content"
96+
android:layout_height="fill_parent"
97+
android:background="@drawable/format_bar_button_ul_selector"/>
98+
99+
<ToggleButton
100+
android:id="@+id/format_bar_button_ol"
101+
style="@style/FormatBarButtonTablet"
102+
android:layout_width="wrap_content"
103+
android:layout_height="fill_parent"
104+
android:background="@drawable/format_bar_button_ol_selector"/>
105+
106+
<ToggleButton
107+
android:id="@+id/format_bar_button_quote"
108+
style="@style/FormatBarButtonTablet"
109+
android:layout_width="wrap_content"
110+
android:layout_height="fill_parent"
111+
android:background="@drawable/format_bar_button_quote_selector"/>
112+
</LinearLayout>
113+
114+
<LinearLayout
115+
style="@style/FormatBarTabletGroup"
116+
android:layout_width="wrap_content"
117+
android:layout_height="fill_parent">
118+
119+
<ToggleButton
120+
android:id="@+id/format_bar_button_html"
121+
style="@style/FormatBarButtonTablet"
122+
android:layout_width="wrap_content"
123+
android:layout_height="fill_parent"
124+
android:background="@drawable/format_bar_button_html_selector"/>
125+
</LinearLayout>
126+
</LinearLayout>
127+
</LinearLayout>
128+
129+
</FrameLayout>

‎WordPressEditor/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
<dimen name="format_bar_button_right_margin">4dp</dimen>
77
<dimen name="format_bar_html_button_left_margin">3dp</dimen>
88

9-
<dimen name="format_bar_left_margin_tablet">5dp</dimen>
10-
<dimen name="format_bar_right_margin_tablet">9dp</dimen>
11-
<dimen name="format_bar_html_button_left_margin_tablet">9dp</dimen>
9+
<dimen name="format_bar_button_margin_tablet">2dp</dimen>
1210

1311
<dimen name="format_bar_horizontal_divider_height">1dp</dimen>
1412
<dimen name="format_bar_vertical_divider_width">0.6dp</dimen>

‎WordPressEditor/src/main/res/values/styles.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<item name="android:textOff">""</item>
1515
</style>
1616

17+
<style name="FormatBarButtonTablet" parent="FormatBarButton">
18+
<item name="android:layout_marginRight">@dimen/format_bar_button_margin_tablet</item>
19+
<item name="android:layout_marginLeft">@dimen/format_bar_button_margin_tablet</item>
20+
</style>
21+
1722
<style name="FormatBarScrollViewButton" parent="FormatBarButton">
1823
<item name="android:layout_marginRight">@dimen/format_bar_button_right_margin</item>
1924
</style>
@@ -26,4 +31,9 @@
2631
<item name="android:background">@color/wp_gray</item>
2732
<item name="android:alpha">0.5</item>
2833
</style>
34+
35+
<style name="FormatBarTabletGroup">
36+
<item name="android:layout_marginLeft">20dp</item>
37+
<item name="android:layout_marginRight">20dp</item>
38+
</style>
2939
</resources>

0 commit comments

Comments
 (0)