pma2p6wf3
/
MIUInote
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

增加了字体功能

Browse Source
pull/4/head
PickupRAIN 2 years ago
parent 10f76b6ac1
commit 4bd44cb6de
8 changed files with 155 additions and 58 deletions
Show Stats Download Patch File Download Diff File

88
src/main/java/net/micode/notes/tool/ResourceParser.java
Unescape View File

@ -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) {

72
src/main/java/net/micode/notes/ui/NoteEditActivity.java
Unescape View File

@ -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<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
@ -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<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
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;
}

26
src/main/java/net/micode/notes/ui/NotesListActivity.java
Unescape View File

@ -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("验证密码");

2
src/main/java/net/micode/notes/ui/NotesListItem.java
Unescape View File

@ -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 {

4
src/main/res/menu/note_edit.xml
Unescape View File

@ -25,6 +25,9 @@
<item
android:id="@+id/menu_delete"
android:title="@string/menu_delete"/>
<item
android:id="@+id/menu_select_font"
android:title="Select font"/>
<item
android:id="@+id/menu_font_size"
@ -54,4 +57,5 @@
android:title="Enter private mode"/>
</menu>

5
src/main/res/menu/sub_folder.xml
Unescape View File

@ -21,4 +21,7 @@
<item
android:id="@+id/menu_new_note"
android:title="@string/notelist_menu_new"/>
</menu>
<item
android:id="@+id/menu_new_folder"
android:title="@string/menu_create_folder"/>
</menu>

12
src/main/res/values/strings.xml
Unescape View File

@ -126,6 +126,13 @@
<string name="search">Notes</string>
<string name="datetime_dialog_ok">set</string>
<string name="datetime_dialog_cancel">cancel</string>
<plurals name="search_results_title">
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
<!-- Case of 0 or 2 or more results. -->
<item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
</plurals>
<string name="login_view_text">玛卡巴卡斗志昂扬</string>
<string name="activity_login_view">LoginView</string>
<string name="prompt_account">用户名:</string>
@ -136,10 +143,5 @@
<string name="Loading">正在登录，你给我等着</string>
<string name="invalid">有人抢银行啦</string>
<string name="font_mode_change">Font mode change</string>
<plurals name="search_results_title">
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
<!-- Case of 0 or 2 or more results. -->
<item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
</plurals>
</resources>

4
src/main/res/values/styles.xml
Unescape View File

@ -63,7 +63,7 @@
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions" />
<!--<item name="android:displayOptions"/>-->
<item name="android:visibility">visible</item>
</style>
</resources>
</resources>

Write Preview
Loading…
Cancel
Save