-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #140 from wordpress-mobile/issue/18-format-bar-tablet
Issue #18: Format bar (tablet)
- Loading branch information
Showing
12 changed files
with
175 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+723 Bytes
WordPressEditor/src/main/res/drawable-sw600dp-hdpi/format_bar_button_html.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+828 Bytes
...ditor/src/main/res/drawable-sw600dp-hdpi/format_bar_button_html_highlighted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.08 KB
WordPressEditor/src/main/res/drawable-sw600dp-xhdpi/format_bar_button_html.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+882 Bytes
...itor/src/main/res/drawable-sw600dp-xhdpi/format_bar_button_html_highlighted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.56 KB
WordPressEditor/src/main/res/drawable-sw600dp-xxhdpi/format_bar_button_html.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.45 KB
...tor/src/main/res/drawable-sw600dp-xxhdpi/format_bar_button_html_highlighted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions
16
WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<layer-list | ||
xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item> | ||
<bitmap | ||
android:src="@drawable/format_bar_button_strikethrough_highlighted" | ||
android:gravity="center"/> | ||
</item> | ||
<item android:top="@dimen/format_bar_button_highlighted_underline_top"> | ||
<shape android:shape="line"> | ||
<stroke | ||
android:width="@dimen/format_bar_button_highlighted_underline_width" | ||
android:color="@color/format_bar_button_highlighted_color"/> | ||
</shape> | ||
</item> | ||
</layer-list> |
10 changes: 10 additions & 0 deletions
10
WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item android:state_checked="true" android:drawable="@drawable/format_bar_button_strikethrough_selected_state"/> | ||
<item android:state_pressed="true" android:drawable="@drawable/format_bar_button_strikethrough_selected_state"/> | ||
<item> | ||
<bitmap | ||
android:src="@drawable/format_bar_button_strikethrough" | ||
android:gravity="center"/> | ||
</item> | ||
</selector> |
129 changes: 129 additions & 0 deletions
129
WordPressEditor/src/main/res/layout-sw600dp/fragment_editor.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
tools:context="org.wordpress.android.editor.EditorFragment"> | ||
|
||
<include | ||
layout="@layout/editor_webview" | ||
android:id="@+id/webview" /> | ||
|
||
<LinearLayout | ||
android:id="@+id/format_bar" | ||
android:layout_width="fill_parent" | ||
android:layout_height="@dimen/format_bar_height" | ||
android:layout_gravity="bottom" | ||
android:background="@android:color/white" | ||
android:orientation="vertical"> | ||
|
||
<View | ||
android:id="@+id/format_bar_horizontal_divider" | ||
android:layout_width="fill_parent" | ||
android:layout_height="@dimen/format_bar_horizontal_divider_height" | ||
style="@style/Divider"/> | ||
|
||
<LinearLayout | ||
android:id="@+id/format_bar_buttons" | ||
android:layout_width="fill_parent" | ||
android:layout_height="@dimen/format_bar_height" | ||
android:layout_gravity="bottom" | ||
android:gravity="center" | ||
android:orientation="horizontal" | ||
tools:ignore="RtlHardcoded"> | ||
|
||
<LinearLayout | ||
style="@style/FormatBarTabletGroup" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent"> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_media" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_media_selector"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
style="@style/FormatBarTabletGroup" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent"> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_bold" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_bold_selector"/> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_italic" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_italic_selector"/> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_strikethrough" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_strikethrough_selector"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
style="@style/FormatBarTabletGroup" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent"> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_link" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_link_selector"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
style="@style/FormatBarTabletGroup" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent"> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_ul" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_ul_selector"/> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_ol" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_ol_selector"/> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_quote" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_quote_selector"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
style="@style/FormatBarTabletGroup" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent"> | ||
|
||
<ToggleButton | ||
android:id="@+id/format_bar_button_html" | ||
style="@style/FormatBarButtonTablet" | ||
android:layout_width="wrap_content" | ||
android:layout_height="fill_parent" | ||
android:background="@drawable/format_bar_button_html_selector"/> | ||
</LinearLayout> | ||
</LinearLayout> | ||
</LinearLayout> | ||
|
||
</FrameLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters