Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
|
b4aae9a018 | 2 years ago |
|
4ca3a62578 | 2 years ago |
|
0d9b8b3307 | 2 years ago |
|
e878f7a4d2 | 2 years ago |
|
70311863ba | 2 years ago |
@ -1,20 +0,0 @@
|
||||
apply {
|
||||
plugin 'com.android.application'
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 14
|
||||
buildToolsVersion "33.0.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.micode.notes"
|
||||
targetSdkVersion 14
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
}
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 44 KiB |
@ -0,0 +1,133 @@
|
||||
ResourceParser.java
|
||||
|
||||
public static final int ORANGE = 5;
|
||||
|
||||
private final static int[] BG_EDIT_RESOURCES = new int[]{
|
||||
R.drawable.edit_yellow,
|
||||
R.drawable.edit_blue,
|
||||
R.drawable.edit_white,
|
||||
R.drawable.edit_green,
|
||||
R.drawable.edit_red,
|
||||
R.drawable.edit_orange
|
||||
};
|
||||
|
||||
private final static int[] BG_EDIT_TITLE_RESOURCES = new int[]{
|
||||
R.drawable.edit_title_yellow,
|
||||
R.drawable.edit_title_blue,
|
||||
R.drawable.edit_title_white,
|
||||
R.drawable.edit_title_green,
|
||||
R.drawable.edit_title_red,
|
||||
R.drawable.edit_title_orange
|
||||
};
|
||||
|
||||
private final static int[] BG_FIRST_RESOURCES = new int[]{
|
||||
R.drawable.list_yellow_up,
|
||||
R.drawable.list_blue_up,
|
||||
R.drawable.list_white_up,
|
||||
R.drawable.list_green_up,
|
||||
R.drawable.list_red_up,
|
||||
R.drawable.list_orange_up
|
||||
};
|
||||
|
||||
private final static int[] BG_NORMAL_RESOURCES = new int[]{
|
||||
R.drawable.list_yellow_middle,
|
||||
R.drawable.list_blue_middle,
|
||||
R.drawable.list_white_middle,
|
||||
R.drawable.list_green_middle,
|
||||
R.drawable.list_red_middle,
|
||||
R.drawable.list_orange_middle
|
||||
};
|
||||
|
||||
private final static int[] BG_LAST_RESOURCES = new int[]{
|
||||
R.drawable.list_yellow_down,
|
||||
R.drawable.list_blue_down,
|
||||
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[]{
|
||||
R.drawable.list_yellow_single,
|
||||
R.drawable.list_blue_single,
|
||||
R.drawable.list_white_single,
|
||||
R.drawable.list_green_single,
|
||||
R.drawable.list_red_single,
|
||||
R.drawable.list_orange_single
|
||||
};
|
||||
|
||||
private final static int[] BG_2X_RESOURCES = new int[]{
|
||||
R.drawable.widget_2x_yellow,
|
||||
R.drawable.widget_2x_blue,
|
||||
R.drawable.widget_2x_white,
|
||||
R.drawable.widget_2x_green,
|
||||
R.drawable.widget_2x_red,
|
||||
R.drawable.widget_2x_orange
|
||||
};
|
||||
|
||||
private final static int[] BG_4X_RESOURCES = new int[]{
|
||||
R.drawable.widget_4x_yellow,
|
||||
R.drawable.widget_4x_blue,
|
||||
R.drawable.widget_4x_white,
|
||||
R.drawable.widget_4x_green,
|
||||
R.drawable.widget_4x_red,
|
||||
R.drawable.widget_4x_orange
|
||||
};
|
||||
|
||||
NoteEditActivity.java
|
||||
|
||||
static {
|
||||
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
|
||||
sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
|
||||
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);
|
||||
}
|
||||
|
||||
static {
|
||||
sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
|
||||
sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
|
||||
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);
|
||||
}
|
||||
|
||||
新增了美术素材
|
||||
|
||||
edit_orange.9.png
|
||||
edit_title_orange.9.png
|
||||
list_orange_down.9.png
|
||||
list_orange_middle.9.png
|
||||
list_orange_single.9.png
|
||||
list_orange_up.9.png
|
||||
note_edit_color_selector_panel.png
|
||||
widget_2x_orange.png
|
||||
widget_4x_orange.png
|
||||
|
||||
调整了布局文件
|
||||
|
||||
note_eidt.xml
|
||||
|
||||
<!-- 橙色背景(自定义)-->
|
||||
<FrameLayout
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_bg_orange"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_bg_orange_select"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|right"
|
||||
android:focusable="false"
|
||||
android:visibility="gone"
|
||||
android:layout_marginRight="2dip"
|
||||
android:src="@drawable/selected" />
|
||||
</FrameLayout>
|
@ -1 +0,0 @@
|
||||
include ':app'
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 245 B After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 443 B After Width: | Height: | Size: 443 B |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 554 KiB After Width: | Height: | Size: 554 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |