diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java index 09c8fb8..ae5d049 100644 --- a/app/src/main/java/net/micode/notes/tool/ResourceParser.java +++ b/app/src/main/java/net/micode/notes/tool/ResourceParser.java @@ -33,6 +33,7 @@ public class ResourceParser { public static final int WHITE = 2; public static final int GREEN = 3; public static final int RED = 4; + public static final int ORANGE = 5; public static final int BG_DEFAULT_COLOR = YELLOW; @@ -49,7 +50,8 @@ public class ResourceParser { R.drawable.edit_blue, R.drawable.edit_white, R.drawable.edit_green, - R.drawable.edit_red + R.drawable.edit_red, + R.drawable.edit_orange }; private final static int[] BG_EDIT_TITLE_RESOURCES = new int[]{ @@ -57,7 +59,8 @@ public class ResourceParser { R.drawable.edit_title_blue, R.drawable.edit_title_white, R.drawable.edit_title_green, - R.drawable.edit_title_red + R.drawable.edit_title_red, + R.drawable.edit_title_orange }; public static int getNoteBgResource(int id) { @@ -84,7 +87,8 @@ public class ResourceParser { R.drawable.list_blue_up, R.drawable.list_white_up, R.drawable.list_green_up, - R.drawable.list_red_up + R.drawable.list_red_up, + R.drawable.list_orange_up }; private final static int[] BG_NORMAL_RESOURCES = new int[]{ @@ -92,7 +96,8 @@ public class ResourceParser { R.drawable.list_blue_middle, R.drawable.list_white_middle, R.drawable.list_green_middle, - R.drawable.list_red_middle + R.drawable.list_red_middle, + R.drawable.list_orange_middle }; private final static int[] BG_LAST_RESOURCES = new int[]{ @@ -101,6 +106,7 @@ public class ResourceParser { R.drawable.list_white_down, R.drawable.list_green_down, R.drawable.list_red_down, + R.drawable.list_orange_down }; private final static int[] BG_SINGLE_RESOURCES = new int[]{ @@ -108,7 +114,8 @@ public class ResourceParser { R.drawable.list_blue_single, R.drawable.list_white_single, R.drawable.list_green_single, - R.drawable.list_red_single + R.drawable.list_red_single, + R.drawable.list_orange_single }; public static int getNoteBgFirstRes(int id) { @@ -139,6 +146,7 @@ public class ResourceParser { R.drawable.widget_2x_white, R.drawable.widget_2x_green, R.drawable.widget_2x_red, + R.drawable.widget_2x_orange }; public static int getWidget2xBgResource(int id) { @@ -150,7 +158,8 @@ public class ResourceParser { R.drawable.widget_4x_blue, R.drawable.widget_4x_white, R.drawable.widget_4x_green, - R.drawable.widget_4x_red + R.drawable.widget_4x_red, + R.drawable.widget_4x_orange }; public static int getWidget4xBgResource(int id) { diff --git a/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java index 22333c6..36de4b0 100644 --- a/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java +++ b/app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java @@ -99,6 +99,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); + sBgSelectorBtnsMap.put(R.id.iv_bg_orange, ResourceParser.ORANGE); } // 背景选择器Map private static final Map sBgSelectorSelectionMap = new HashMap(); @@ -109,6 +110,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); + sBgSelectorSelectionMap.put(ResourceParser.ORANGE, R.id.iv_bg_orange_select); } // 字体选择Map private static final Map sFontSizeBtnsMap = new HashMap(); diff --git a/app/src/main/res/drawable-hdpi/edit_orange.9.png b/app/src/main/res/drawable-hdpi/edit_orange.9.png new file mode 100644 index 0000000..49bda10 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/edit_orange.9.png differ diff --git a/app/src/main/res/drawable-hdpi/edit_title_orange.9.png b/app/src/main/res/drawable-hdpi/edit_title_orange.9.png new file mode 100644 index 0000000..c63b741 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/edit_title_orange.9.png differ diff --git a/app/src/main/res/drawable-hdpi/list_orange_down.9.png b/app/src/main/res/drawable-hdpi/list_orange_down.9.png new file mode 100644 index 0000000..6d19859 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/list_orange_down.9.png differ diff --git a/app/src/main/res/drawable-hdpi/list_orange_middle.9.png b/app/src/main/res/drawable-hdpi/list_orange_middle.9.png new file mode 100644 index 0000000..5dfd9b4 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/list_orange_middle.9.png differ diff --git a/app/src/main/res/drawable-hdpi/list_orange_single.9.png b/app/src/main/res/drawable-hdpi/list_orange_single.9.png new file mode 100644 index 0000000..4338b92 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/list_orange_single.9.png differ diff --git a/app/src/main/res/drawable-hdpi/list_orange_up.9.png b/app/src/main/res/drawable-hdpi/list_orange_up.9.png new file mode 100644 index 0000000..ab5a976 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/list_orange_up.9.png differ diff --git a/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png index fc49552..1408df5 100644 Binary files a/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png and b/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png differ diff --git a/app/src/main/res/drawable-hdpi/widget_2x_orange.png b/app/src/main/res/drawable-hdpi/widget_2x_orange.png new file mode 100644 index 0000000..71156b6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/widget_2x_orange.png differ diff --git a/app/src/main/res/drawable-hdpi/widget_4x_orange.png b/app/src/main/res/drawable-hdpi/widget_4x_orange.png new file mode 100644 index 0000000..f897cc2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/widget_4x_orange.png differ diff --git a/app/src/main/res/layout/note_edit.xml b/app/src/main/res/layout/note_edit.xml index 10b2aa7..5df1277 100644 --- a/app/src/main/res/layout/note_edit.xml +++ b/app/src/main/res/layout/note_edit.xml @@ -123,6 +123,7 @@ android:background="@drawable/bg_color_btn_mask" android:layout_gravity="top|right" /> + - + - + - + - + - + + + + + + + + +