diff options
| -rw-r--r-- | res/drawable/filtershow_color_picker_circle.xml | 24 | ||||
| -rw-r--r-- | res/drawable/filtershow_color_picker_roundrect.xml | 25 | ||||
| -rw-r--r-- | res/layout/filtershow_color_gird.xml | 203 | ||||
| -rw-r--r-- | res/layout/filtershow_color_picker.xml | 58 | ||||
| -rw-r--r-- | res/layout/filtershow_cp_custom_title.xml | 26 | ||||
| -rw-r--r-- | res/layout/filtershow_draw_button.xml | 27 | ||||
| -rw-r--r-- | res/layout/filtershow_draw_size.xml | 36 | ||||
| -rw-r--r-- | res/menu/filtershow_menu_draw.xml | 35 | ||||
| -rw-r--r-- | res/values/filtershow_color.xml | 6 | ||||
| -rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 26 |
11 files changed, 463 insertions, 4 deletions
diff --git a/res/drawable/filtershow_color_picker_circle.xml b/res/drawable/filtershow_color_picker_circle.xml new file mode 100644 index 000000000..4444e0fcf --- /dev/null +++ b/res/drawable/filtershow_color_picker_circle.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + 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="oval" > + <size android:width="20dp" android:height="20dp"/> + <corners + android:radius="10dp" /> + <solid android:color="@color/red"/> +</shape> + diff --git a/res/drawable/filtershow_color_picker_roundrect.xml b/res/drawable/filtershow_color_picker_roundrect.xml new file mode 100644 index 000000000..89add5e6f --- /dev/null +++ b/res/drawable/filtershow_color_picker_roundrect.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + 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="rectangle" > + + <size android:width="20dp" android:height="20dp"/> + <corners android:radius="10dp" /> + <solid android:color="@color/red"/> + +</shape> + diff --git a/res/layout/filtershow_color_gird.xml b/res/layout/filtershow_color_gird.xml new file mode 100644 index 000000000..2dbbc5f05 --- /dev/null +++ b/res/layout/filtershow_color_gird.xml @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/textView1" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <TableRow + android:id="@+id/tableRow1" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <Button + android:id="@+id/cp_grid_button01" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button2" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button03" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button04" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button05" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + </TableRow> + + <TableRow + android:id="@+id/tableRow2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <Button + android:id="@+id/Button06" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button07" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button08" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button09" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button10" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + </TableRow> + + <TableRow + android:id="@+id/tableRow3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <Button + android:id="@+id/Button11" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button12" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button13" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button14" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button15" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + </TableRow> + + <TableRow + android:id="@+id/tableRow4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <Button + android:id="@+id/Button16" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button17" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button18" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button19" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + + <Button + android:id="@+id/button20" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/filtershow_color_picker_circle" /> + </TableRow> + </TableLayout> + + <Button + android:id="@+id/filtershow_cp_custom" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/color_pick_select" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml new file mode 100644 index 000000000..fc4972961 --- /dev/null +++ b/res/layout/filtershow_color_picker.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/RelativeLayout1" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/default_background" + tools:context=".ColorPickerActivity" > + + <com.android.gallery3d.filtershow.colorpicker.ColorRectView + android:id="@+id/colorRectView" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginLeft="10dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:layout_marginRight="1dp" + android:layout_above="@+id/colorOpacityView" + android:layout_toLeftOf="@+id/colorValueView" /> + + <com.android.gallery3d.filtershow.colorpicker.ColorValueView + android:id="@+id/colorValueView" + android:layout_width="90dp" + android:layout_height="fill_parent" + android:layout_alignParentRight = "true" + android:layout_above="@+id/colorOpacityView" /> + + <com.android.gallery3d.filtershow.colorpicker.ColorOpacityView + android:id="@+id/colorOpacityView" + android:layout_width="match_parent" + android:layout_height="90dp" + android:layout_above="@+id/btnSelect" /> + + <Button + android:id="@+id/btnSelect" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/color_pick_select" + android:layout_alignParentBottom = "true" + /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_cp_custom_title.xml b/res/layout/filtershow_cp_custom_title.xml new file mode 100644 index 000000000..cef8b6c05 --- /dev/null +++ b/res/layout/filtershow_cp_custom_title.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/customTitle" + android:text="@string/color_pick_title" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" > +</TextView>
\ No newline at end of file diff --git a/res/layout/filtershow_draw_button.xml b/res/layout/filtershow_draw_button.xml new file mode 100644 index 000000000..dba8100ff --- /dev/null +++ b/res/layout/filtershow_draw_button.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<com.android.gallery3d.filtershow.ui.FramedTextButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawUtilityButton" + android:layout_width="84dip" + android:layout_height="84dip" + android:layout_gravity="center_vertical|left" + android:background="@drawable/filtershow_button_background" + android:scaleType="centerInside" + android:visibility="gone" + android:text="@string/draw_style" /> diff --git a/res/layout/filtershow_draw_size.xml b/res/layout/filtershow_draw_size.xml new file mode 100644 index 000000000..068493eab --- /dev/null +++ b/res/layout/filtershow_draw_size.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:dividerPadding="20dp" + android:gravity="center_horizontal" + android:orientation="vertical" > + + <SeekBar + android:id="@+id/sizeSeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <Button + android:id="@+id/sizeAcceptButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/draw_size_accept" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/menu/filtershow_menu_draw.xml b/res/menu/filtershow_menu_draw.xml new file mode 100644 index 000000000..be6dc7058 --- /dev/null +++ b/res/menu/filtershow_menu_draw.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <group android:id="@+id/curves_popupmenu" > + <item + android:id="@+id/draw_menu_style_line" + android:title="@string/draw_style_line" /> + <item + android:id="@+id/draw_menu_style_brush" + android:title="@string/draw_style_brush" /> + <item + android:id="@+id/draw_menu_size" + android:title="@string/draw_size" /> + <item + android:id="@+id/draw_menu_color" + android:title="@string/draw_color"/> + </group> + +</menu>
\ No newline at end of file diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 15bf2bc7b..175d3d3e0 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project +<!-- Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + <resources> <color name="yellow">#FFFF00</color> <color name="green">#00FF00</color> @@ -23,4 +24,7 @@ <color name="background_toolbar">#363949</color> <color name="background_main_toolbar">#232323</color> <color name="toolbar_separation_line">#333333</color> + <color name="slider_dot_color">#6464FF</color> + <color name="slider_line_color">#33B5E5</color> + </resources>
\ No newline at end of file diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index b45435dca..c444fba78 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -37,4 +37,5 @@ <item type="id" name="drawOnImageButton" /> <item type="id" name="imageCurves" /> <item type="id" name="imageZoom" /> + <item type="id" name="editorDraw" /> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 7fc0f4b32..92cc06a0f 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -147,11 +147,31 @@ <!-- Label for the curves tool, all channels (RGB) [CHAR LIMIT=3] --> <string name="curves_channel_rgb">RGB</string> - <!-- Label for the curves tool, Red color channel [CHAR LIMIT=10] --> + <!-- Label for the curves tool, Red color channel [CHAR LIMIT=14] --> <string name="curves_channel_red">Red</string> - <!-- Label for the curves tool, Green color channel [CHAR LIMIT=10] --> + <!-- Label for the curves tool, Green color channel [CHAR LIMIT=14] --> <string name="curves_channel_green">Green</string> - <!-- Label for the curves tool, Blue color channel [CHAR LIMIT=10] --> + <!-- Label for the curves tool, Blue color channel [CHAR LIMIT=14] --> <string name="curves_channel_blue">Blue</string> + <!-- Label for the The style to draw in [CHAR LIMIT=14] --> + <string name="draw_style">Style</string> + <!-- Label for the size to draw in in [CHAR LIMIT=14] --> + <string name="draw_size">Size</string> + <!-- Label for the color to draw in [CHAR LIMIT=14] --> + <string name="draw_color">Color</string> + <!-- Label for the line style of drawing in [CHAR LIMIT=14] --> + <string name="draw_style_line">Lines</string> + <!-- Label for the brush style of drawing in [CHAR LIMIT=14] --> + <string name="draw_style_brush">Brush</string> + + <!-- Label for the select the color [CHAR LIMIT=30] --> + <string name="color_pick_select">Choose custom color</string> + <!-- The title for the color pick dialog [CHAR LIMIT=20] --> + <string name="color_pick_title">Select Color</string> + <!-- The title for draw size [CHAR LIMIT=50] --> + <string name="draw_size_title">Select Size</string> + <!-- The accept the draw size [CHAR LIMIT=20] --> + <string name="draw_size_accept">OK</string> + </resources> |