diff --git a/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java index 6b35729..6f8b4b0 100644 --- a/src/main/java/net/micode/notes/tool/ResourceParser.java +++ b/src/main/java/net/micode/notes/tool/ResourceParser.java @@ -43,22 +43,22 @@ public class ResourceParser { public static class NoteBgResources { 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_yellow, + R.drawable.edit_blue, + R.drawable.edit_white, + R.drawable.edit_green, + R.drawable.edit_red, R.drawable.note_bg_photo_wangyi }; 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_yellow, + R.drawable.edit_title_blue, + R.drawable.edit_title_white, + R.drawable.edit_title_green, + R.drawable.edit_title_red, R.drawable.note_bg_photo_wangyi }; @@ -83,38 +83,38 @@ public class ResourceParser { public static class NoteItemBgResources { 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_yellow_up, + R.drawable.list_blue_up, + R.drawable.list_white_up, + R.drawable.list_green_up, + R.drawable.list_red_up, R.drawable.note_bg_photo_wangyi }; 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_yellow_middle, + R.drawable.list_blue_middle, + R.drawable.list_white_middle, + R.drawable.list_green_middle, + R.drawable.list_red_middle, R.drawable.note_bg_photo_wangyi }; 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_yellow_down, + R.drawable.list_blue_down, + R.drawable.list_white_down, + R.drawable.list_green_down, + R.drawable.list_red_down, R.drawable.note_bg_photo_wangyi }; 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_yellow_single, + R.drawable.list_blue_single, + R.drawable.list_white_single, + R.drawable.list_green_single, + R.drawable.list_red_single, R.drawable.note_bg_photo_wangyi }; @@ -141,11 +141,11 @@ public class ResourceParser { public static class WidgetBgResources { 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_yellow, + R.drawable.widget_2x_blue, + R.drawable.widget_2x_white, + R.drawable.widget_2x_green, + R.drawable.widget_2x_red, }; public static int getWidget2xBgResource(int id) { @@ -153,11 +153,11 @@ public class ResourceParser { } 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_yellow, + R.drawable.widget_4x_blue, + R.drawable.widget_4x_white, + R.drawable.widget_4x_green, + R.drawable.widget_4x_red }; public static int getWidget4xBgResource(int id) { @@ -167,10 +167,10 @@ public class ResourceParser { public static class TextAppearanceResources { private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { - R.style.TextAppearanceNormal, - R.style.TextAppearanceMedium, - R.style.TextAppearanceLarge, - R.style.TextAppearanceSuper + R.style.TextAppearanceNormal, + R.style.TextAppearanceMedium, + R.style.TextAppearanceLarge, + R.style.TextAppearanceSuper }; public static int getTexAppearanceResource(int id) { diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index ba9e8c8..b640329 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -28,7 +28,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.AssetManager; import android.graphics.Paint; +import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.Spannable; @@ -70,6 +72,7 @@ import net.micode.notes.widget.NoteWidgetProvider_4x; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -94,6 +97,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); sBgSelectorBtnsMap.put(R.id.iv_ph_duck, ResourceParser.DUCK); + } private static final Map sBgSelectorSelectionMap = new HashMap(); @@ -104,8 +108,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); sBgSelectorSelectionMap.put(ResourceParser.DUCK, R.id.iv_ph_duck_select); - } + }// + //选择便签字体大小的界选择器的吧 private static final Map sFontSizeBtnsMap = new HashMap(); static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); @@ -621,7 +626,70 @@ public class NoteEditActivity extends Activity implements OnClickListener, }); final Dialog dialog = builder.setView(view).show(); } - } + } else if (itemId==R.id.menu_select_font) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + + builder.setTitle("选择字体") + .setItems(new CharSequence[]{"默认字体", "仿宋_GB2312", "姚体", "宋体","忍者体","楷体","黑体"}, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + switch (which) { + case 0: + // 创建空的模板 +// createEmptyTemplate(); + mNoteEditor.setTypeface(Typeface.DEFAULT); + break; + case 1: + // 创建模板 1 +// createTemplate("模板 1"); +// AssetManager mgr = getAssets(); + Typeface tf1=Typeface.createFromAsset(getAssets(),"font/fs.ttf"); + mNoteEditor.setTypeface(tf1); + break; + case 2: + Typeface tf2=Typeface.createFromAsset(getAssets(),"font/fzytk.TTF"); + mNoteEditor.setTypeface(tf2); + break; + case 3: + // 创建模板 3 +// createTemplate("模板 3"); + Typeface tf3=Typeface.createFromAsset(getAssets(),"font/stsong.TTF"); + mNoteEditor.setTypeface(tf3); + break; + case 4: + Typeface tf4=Typeface.createFromAsset(getAssets(),"font/fzrzt.TTF"); + mNoteEditor.setTypeface(tf4); + break; + case 5: + Typeface tf5=Typeface.createFromAsset(getAssets(),"font/kt.ttf"); + mNoteEditor.setTypeface(tf5); + break; + case 6: + Typeface tf6=Typeface.createFromAsset(getAssets(),"font/simhei.ttf"); + mNoteEditor.setTypeface(tf6); + break; + + + } + } + }); + builder.setPositiveButton("OK", new DialogInterface.OnClickListener(){ + @Override + public void onClick(DialogInterface dialog, int which) { + Toast.makeText(NoteEditActivity.this,"字体设置成功", Toast.LENGTH_SHORT).show(); + dialog.dismiss(); + } + }); + builder.setNegativeButton("cancle", new DialogInterface.OnClickListener(){ + public void onClick(DialogInterface dialog, int which) { + Toast.makeText(NoteEditActivity.this,"字体设置失败", Toast.LENGTH_SHORT).show(); + dialog.dismiss(); + } }); + final Dialog dialog = builder.show(); + + + + + } return true; } diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index 0b1591d..40f36ff 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -635,11 +635,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }); } } else if (!TextUtils.isEmpty(name)) { + //如果在根文件夹中创建 + if (mCurrentFolderId == Notes.ID_ROOT_FOLDER){ + //创建一个ContentValues对象 ContentValues values = new ContentValues(); values.put(NoteColumns.SNIPPET, name); values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); } + //如果在子文件夹中创建 + else { + //创建一个ContentValues对象 + ContentValues values = new ContentValues(); + //将输入的文本添加到ContentValues对象中 + values.put(NoteColumns.SNIPPET, name); + values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + values.put(NoteColumns.PARENT_ID, String.valueOf(mCurrentFolderId)); + //插入新记录 + mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); + } + + } + //关闭对话框 dialog.dismiss(); } }); @@ -900,7 +917,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (item.getType() == Notes.TYPE_NOTE) { testNode(item); // openNode(item); - } else { + }else if (item.getType() == Notes.TYPE_FOLDER + || item.getType() == Notes.TYPE_SYSTEM) { + openFolder(item);} + else { Log.e(TAG, "Wrong note type in SUB_FOLDER"); } break; @@ -947,8 +967,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return false; } public void testNode(final NoteItemData item){ - if (!item.getmPassword().equals("1"))//判断是否有密码，如果没有密码，直接打开即可 -// if(item.getmPassword()!=null && !item.getmPassword().equals("")) + //if (!item.getmPassword().equals("1"))//判断是否有密码，如果没有密码，直接打开即可 + if(item.getmPassword()!=null && !item.getmPassword().equals("")) { final AlertDialog.Builder builder = new AlertDialog.Builder(this);//初始化对话框 builder.setTitle("验证密码"); diff --git a/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java index f0b64a5..9af4bd1 100644 --- a/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -87,7 +87,7 @@ public class NotesListItem extends LinearLayout { mAlert.setVisibility(View.GONE); // if(data.has) } else { - if("1".equals(data.getmPassword())){ + if(data.getmPassword()==null){ mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); }else { diff --git a/src/main/res/menu/note_edit.xml b/src/main/res/menu/note_edit.xml index e1ffb99..f8b36ea 100644 --- a/src/main/res/menu/note_edit.xml +++ b/src/main/res/menu/note_edit.xml @@ -25,6 +25,9 @@ + + \ No newline at end of file diff --git a/src/main/res/menu/sub_folder.xml b/src/main/res/menu/sub_folder.xml index b00de26..46eb577 100644 --- a/src/main/res/menu/sub_folder.xml +++ b/src/main/res/menu/sub_folder.xml @@ -21,4 +21,7 @@ - \ No newline at end of file + + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9b6fff9..f0cc981 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -126,6 +126,13 @@ Notes set cancel + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + + 玛卡巴卡斗志昂扬 LoginView 用户名: @@ -136,10 +143,5 @@ 正在登录，你给我等着 有人抢银行啦 Font mode change - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index ad0d90d..8063060 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -63,7 +63,7 @@ - \ No newline at end of file +