diff --git a/src/main/java/data/Notes.java b/src/main/java/data/Notes.java
index a15bf19..fb90c63 100644
--- a/src/main/java/data/Notes.java
+++ b/src/main/java/data/Notes.java
@@ -16,6 +16,7 @@
package net.micode.notes.data;
+import android.content.ContentUris;
import android.net.Uri;
// Notes 类中定义了很多常量，这些常量大多是int型和string型
public class Notes {
@@ -192,12 +193,6 @@ AUTHORITY + "/data");//定义查找数据的指针。
* Type : INTEGER (long)
*/
public static final String VERSION = "version";
- /**
- *passwored
- *
- */
- public static final String PASSWORD = "set_password";//设置密码的什么东西啊？
- public static final String TAG_PASSWORD = "set_tag";
}//这些常量主要是定义便签的属性的。
// 定义DataColumns的常量,用于后面创建数据库的表头
diff --git a/src/main/java/data/NotesDatabaseHelper.java b/src/main/java/data/NotesDatabaseHelper.java
index 274458b..5761f90 100644
--- a/src/main/java/data/NotesDatabaseHelper.java
+++ b/src/main/java/data/NotesDatabaseHelper.java
@@ -60,9 +60,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
- NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT ''," +
- NoteColumns.TAG_PASSWORD + " TEXT NOT NULL DEFAULT ''" +
+ NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
")";//数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容。
private static final String CREATE_DATA_TABLE_SQL =
@@ -327,16 +325,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
oldVersion++;
}
- if(oldVersion == 4){
- upgradeToV5(db);
- oldVersion++;
- }
-
- if(oldVersion == 5){
- upgradeToV6(db);
- oldVersion++;
- }
-
if (reCreateTriggers) {
reCreateNoteTableTriggers(db);
reCreateDataTableTriggers(db);
@@ -374,14 +362,4 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");
}//更新到V4版本,但是不知道V2、V3、V4是什么意思
-
- private void upgradeToV5(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PASSWORD
- + " INTEGER NOT NULL DEFAULT 0");
- }
-
- private void upgradeToV6(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TAG_PASSWORD
- + " INTEGER NOT NULL DEFAULT 0");
- }
}
diff --git a/src/main/java/model/WorkingNote.java b/src/main/java/model/WorkingNote.java
index 637da5b..0886c78 100644
--- a/src/main/java/model/WorkingNote.java
+++ b/src/main/java/model/WorkingNote.java
@@ -40,9 +40,6 @@ public class WorkingNote {
// Note content
private String mContent;
// Note mode
- private String mPassword = "";
- private String mTag = "";
- //note password,initial = 0
private int mMode;
private long mAlertDate;
@@ -83,9 +80,7 @@ public class WorkingNote {
NoteColumns.BG_COLOR_ID,
NoteColumns.WIDGET_ID,
NoteColumns.WIDGET_TYPE,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.PASSWORD,
- NoteColumns.TAG_PASSWORD
+ NoteColumns.MODIFIED_DATE
};
private static final int DATA_ID_COLUMN = 0;
@@ -108,10 +103,6 @@ public class WorkingNote {
private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
- private static final int NOTE_PASSWORD_COLUMN = 6;
-
- private static final int NOTE_TAG_PASSWORD_COLUMN = 7;
-
// New note construct
public WorkingNote(Context context, long folderId) {
mContext = context;
@@ -152,8 +143,6 @@ public class WorkingNote {
mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
- mPassword = cursor.getString(NOTE_PASSWORD_COLUMN);
- mTag = cursor.getString(NOTE_TAG_PASSWORD_COLUMN);
}
cursor.close();
// 若不存在，报错
@@ -429,16 +418,4 @@ public class WorkingNote {
*/
void onCheckListModeChanged(int oldMode, int newMode);
}
-
- /**设置便签的密码
- *
- * @param password 访问密码
- */
- public void setPassword(String password,String tag){
- mPassword = password;
- mTag = tag;
- mNote.setNoteValue(NoteColumns.PASSWORD,String.valueOf(mPassword));
- mNote.setNoteValue(NoteColumns.TAG_PASSWORD,String.valueOf(mTag));
- }
-
}
diff --git a/src/main/java/ui/NoteEditActivity.java b/src/main/java/ui/NoteEditActivity.java
index 5c0e18a..aa5db14 100644
--- a/src/main/java/ui/NoteEditActivity.java
+++ b/src/main/java/ui/NoteEditActivity.java
@@ -17,10 +17,10 @@
package net.micode.notes.ui;
import android.Manifest;
+
import android.speech.tts.TextToSpeech.OnInitListener;
import android.app.AlarmManager;
import android.app.AlertDialog;
-import android.app.Dialog;
import android.app.PendingIntent;
import android.app.SearchManager;
import android.appwidget.AppWidgetManager;
@@ -50,11 +50,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
-<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java
-import android.view.inputmethod.InputMethodManager;
-=======
import android.widget.Button;
->>>>>>> 8c352e6399667edb8fde9a423fcc254e47cee228:src/main/java/ui/NoteEditActivity.java
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -100,7 +96,9 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
public ImageView ibSetBgColor;
}
//使用Map实现数据存储
-
+ final String[] mPermissionList = new String[]{
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.READ_EXTERNAL_STORAGE};
private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -309,8 +307,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
}
private void initNoteScreen() {
-
- //对便签的初始化操作
+ //对界面的初始化操作
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
//设置外观
@@ -583,60 +580,14 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
//根据菜单的id来编剧相关项目
-<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java
- case R.id.locker:
- //为便签上锁
- final AlertDialog.Builder create_password = new AlertDialog.Builder(this);
- //创建关于上锁操作的对话框
- final View view = LayoutInflater.from(this).inflate(R.layout.buttom,null);
- //???
- final EditText etName = (EditText)view.findViewById(R.id.password);
- final EditText etTag = (EditText)view.findViewById(R.id.tag);
- //???
- etName.setText("");
- etName.setHint(" Please input your password");
- etTag.setText("");
- etTag.setHint(" Please input your tag");
- create_password.setTitle(getString(R.string.alert_set_password));
- //设置标题为Set your password
- create_password.setNegativeButton("OK", new DialogInterface.OnClickListener() {//设置监听，获取输入的字符串
- @Override
- public void onClick(DialogInterface dialog, int which) {
- String password = etName.getText().toString();
- String tag = etTag.getText().toString();
- //获取输入的字符串
- mWorkingNote.setPassword(password,tag);
- //设置密码
- Toast.makeText(NoteEditActivity.this,"Password created successfully",Toast.LENGTH_SHORT).show();
- //设置密码成功的消息弹窗
- InputMethodManager inputMethodManager = (InputMethodManager)
- getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
- //关闭软键盘
- dialog.dismiss();
- //关闭dialog
- }
- });
- create_password.setPositiveButton("Cancel", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- //关闭软键盘
- Toast.makeText(NoteEditActivity.this,"Canceling...",Toast.LENGTH_SHORT).show();
- InputMethodManager inputMethodManager = (InputMethodManager)
- getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
- }
- });
- final Dialog dialog = create_password.setView(view).show();//error
- dialog.show();
- break;
- case R.id.unlocker:
- mWorkingNote.setPassword("","");
- Toast.makeText(NoteEditActivity.this,"Password unlocked successfully",Toast.LENGTH_SHORT).show();
+ case R.id.action_insert_image:
+ //绑定按钮的点击响应，获取危险权限，这里的100是申请码，可以自己定义，整数即可
+ ActivityCompat.requestPermissions(NoteEditActivity.this, mPermissionList, 100);
+//用于获取焦点，否则插入图片时没有响应
+ mNoteEditor.getFocusable();
+ mNoteEditor.insertImage(realPathFromUri, realPathFromUri + "\" style=\"max-width:100%");
break;
-=======
->>>>>>> 8c352e6399667edb8fde9a423fcc254e47cee228:src/main/java/ui/NoteEditActivity.java
case R.id.menu_new_note:
//创建一个新的便签
createNewNote();
@@ -1255,4 +1206,5 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
// mNoteEditor.focusEditor();
// }
// });
+
}
diff --git a/src/main/java/ui/NoteItemData.java b/src/main/java/ui/NoteItemData.java
index f424958..ad1de5e 100644
--- a/src/main/java/ui/NoteItemData.java
+++ b/src/main/java/ui/NoteItemData.java
@@ -40,8 +40,6 @@ public class NoteItemData {
NoteColumns.TYPE,
NoteColumns.WIDGET_ID,
NoteColumns.WIDGET_TYPE,
- NoteColumns.PASSWORD,
- NoteColumns.TAG_PASSWORD
};
//常量标记和数据就不一一标记了，意义翻译基本就知道
private static final int ID_COLUMN = 0;
@@ -56,8 +54,6 @@ public class NoteItemData {
private static final int TYPE_COLUMN = 9;
private static final int WIDGET_ID_COLUMN = 10;
private static final int WIDGET_TYPE_COLUMN = 11;
- private static final int PASSWORD_COLUMN = 12;
- private static final int TAG_PASSWORD_COLUMN = 13;
private long mId;
private long mAlertDate;
@@ -71,8 +67,6 @@ public class NoteItemData {
private int mType;
private int mWidgetId;
private int mWidgetType;
- private String mPassword;
- private String mTAG;
private String mName;
private String mPhoneNumber;
@@ -98,8 +92,6 @@ public class NoteItemData {
mType = cursor.getInt(TYPE_COLUMN);
mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
- mPassword = cursor.getString(PASSWORD_COLUMN);
- mTAG = cursor.getString(TAG_PASSWORD_COLUMN);
//初始化电话号码的信息
mPhoneNumber = "";
@@ -128,7 +120,7 @@ public class NoteItemData {
mIsMultiNotesFollowingFolder = false;
mIsOneNoteFollowingFolder = false;
- //主要是设置上述2个标记
+ //主要是设置上诉2标记
if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
if (cursor.moveToPrevious()) {//获取光标位置后看上一行
@@ -227,8 +219,6 @@ public class NoteItemData {
return (mAlertDate > 0);
}
- public String getPassword() { return mPassword;}
-
//若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
@@ -237,8 +227,4 @@ public class NoteItemData {
public static int getNoteType(Cursor cursor) {
return cursor.getInt(TYPE_COLUMN);
}
-
- public boolean hasPassword() { return mPassword.equals("") ;}
-
- public String getmTAG() {return mTAG;}
}
diff --git a/src/main/java/ui/NotesListActivity.java b/src/main/java/ui/NotesListActivity.java
index 93c406e..0bf0bf2 100644
--- a/src/main/java/ui/NotesListActivity.java
+++ b/src/main/java/ui/NotesListActivity.java
@@ -160,8 +160,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
@Override
// 返回一些子模块完成的数据交给主Activity处理
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- // 结果值 和 要求值 符合要求
- if (resultCode == RESULT_OK
+ // 结果值 和 要求值 符合要求
+ if (resultCode == RESULT_OK
&& (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
mNotesListAdapter.changeCursor(null);
} else {
@@ -171,15 +171,15 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
}
private void setAppInfoFromRawRes() {
- // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
+ // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
StringBuilder sb = new StringBuilder();
InputStream in = null;
try {
// 把资源文件放到应用程序的/raw/raw下，那么就可以在应用中使用getResources获取资源后,
- // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。
- in = getResources().openRawResource(R.raw.introduction);
+ // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。
+ in = getResources().openRawResource(R.raw.introduction);
if (in != null) {
InputStreamReader isr = new InputStreamReader(in);
BufferedReader br = new BufferedReader(isr);
@@ -205,14 +205,14 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
}
}
}
-
+
// 创建空的WorkingNote
WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
ResourceParser.RED);
note.setWorkingText(sb.toString());
if (note.saveNote()) {
- // 更新保存note的信息
+ // 更新保存note的信息
sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
} else {
Log.e(TAG, "Save introduction note error");
@@ -232,7 +232,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
mContentResolver = this.getContentResolver(); // 获取应用程序的数据，得到类似数据表的东西
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-
+
// findViewById 是安卓编程的定位函数，主要是引用.R文件里的引用名
mNotesListView = (ListView) findViewById(R.id.notes_list); // 绑定XML中的ListView，作为Item的容器
mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
@@ -330,7 +330,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
}
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
- boolean checked) {
+ boolean checked) {
mNotesListAdapter.setCheckedItem(position, checked);
updateMenu();
}
@@ -348,14 +348,14 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_notes,
- mNotesListAdapter.getSelectedCount()));
+ mNotesListAdapter.getSelectedCount()));
builder.setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int which) {
- batchDelete();
- }
- });
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+ batchDelete();
+ }
+ });
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
break;
@@ -436,7 +436,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
: NORMAL_SELECTION;
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
- String.valueOf(mCurrentFolderId)
+ String.valueOf(mCurrentFolderId)
}, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
}
@@ -647,7 +647,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
values.put(NoteColumns.LOCAL_MODIFIED, 1);
mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
+ "=?", new String[] {
- String.valueOf(mFocusNoteDataItem.getId())
+ String.valueOf(mFocusNoteDataItem.getId())
});
}
} else if (!TextUtils.isEmpty(name)) {
@@ -693,25 +693,25 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
*/
@Override
public void onBackPressed() { switch (mState) {
- case SUB_FOLDER:
- mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mState = ListEditState.NOTE_LIST;
- startAsyncNotesListQuery();
- mTitleBar.setVisibility(View.GONE);
- break;
- case CALL_RECORD_FOLDER:
- mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mState = ListEditState.NOTE_LIST;
- mAddNewNote.setVisibility(View.VISIBLE);
- mTitleBar.setVisibility(View.GONE);
- startAsyncNotesListQuery();
- break;
- case NOTE_LIST:
- super.onBackPressed();
- break;
- default:
- break;
- }
+ case SUB_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ startAsyncNotesListQuery();
+ mTitleBar.setVisibility(View.GONE);
+ break;
+ case CALL_RECORD_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ mAddNewNote.setVisibility(View.VISIBLE);
+ mTitleBar.setVisibility(View.GONE);
+ startAsyncNotesListQuery();
+ break;
+ case NOTE_LIST:
+ super.onBackPressed();
+ break;
+ default:
+ break;
+ }
}
/**
@@ -731,7 +731,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- appWidgetId
+ appWidgetId
});
sendBroadcast(intent);
@@ -936,7 +936,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
public void onItemClick(AdapterView parent, View view, int position, long id) {
if (view instanceof NotesListItem) {
- final NoteItemData item = ((NotesListItem) view).getItemData();
+ NoteItemData item = ((NotesListItem) view).getItemData();
if (mNotesListAdapter.isInChoiceMode()) {
if (item.getType() == Notes.TYPE_NOTE) {
position = position - mNotesListView.getHeaderViewsCount();
@@ -952,46 +952,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
|| item.getType() == Notes.TYPE_SYSTEM) {
openFolder(item);
} else if (item.getType() == Notes.TYPE_NOTE) {
- final AlertDialog.Builder check_password = new AlertDialog.Builder(NotesListActivity.this);
- //this is what???
- final View view_check = LayoutInflater.from(NotesListActivity.this).inflate(R.layout.dialog_edit_text,null);
- final EditText etName = (EditText)view_check.findViewById(R.id.et_foler_name);
- if (item.hasPassword()){
- openNode(item);
- }
- else{
- etName.setText("");
- etName.setHint(" Input the right password");
- check_password.setTitle("Check your password");
- check_password.setPositiveButton("Cancel", new DialogInterface.OnClickListener() {//设置Cancel按钮
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Toast.makeText(NotesListActivity.this,"Canceling...",Toast.LENGTH_SHORT).show();
- InputMethodManager inputMethodManager = (InputMethodManager)
- getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
- }
- });
- check_password.setNegativeButton("OK", new DialogInterface.OnClickListener() {//设置OK按钮
- @Override
- public void onClick(DialogInterface dialog, int which) {
- String password = etName.getText().toString();
- if (password.equals(item.getPassword())){
- Toast.makeText(NotesListActivity.this,"Oh!!!You are right!",Toast.LENGTH_SHORT).show();
- InputMethodManager inputMethodManager = (InputMethodManager)
- getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
- dialog.dismiss();
- openNode(item);
- }
- else {
- Toast.makeText(NotesListActivity.this,"You are wrong...",Toast.LENGTH_SHORT).show();
- }
- }
- });
- final Dialog dialog = check_password.setView(view_check).show();//view is wrong
- dialog.show();
- }
+ openNode(item);
} else {
Log.e(TAG, "Wrong note type in NOTE_LIST");
}
@@ -1018,7 +979,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
private void startQueryDestinationFolders() {
String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
selection = (mState == ListEditState.NOTE_LIST) ? selection:
- "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
+ "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
null,
diff --git a/src/main/java/ui/NotesListItem.java b/src/main/java/ui/NotesListItem.java
index 9f0f5f2..e5af6ce 100644
--- a/src/main/java/ui/NotesListItem.java
+++ b/src/main/java/ui/NotesListItem.java
@@ -38,7 +38,6 @@ public class NotesListItem extends LinearLayout {
private TextView mCallName; //
private NoteItemData mItemData; //标签数据
private CheckBox mCheckBox; //打钩框
- private ImageView mLocker;//锁图片
/*初始化基本信息*/
public NotesListItem(Context context) {
@@ -50,7 +49,6 @@ public class NotesListItem extends LinearLayout {
mTime = (TextView) findViewById(R.id.tv_time);
mCallName = (TextView) findViewById(R.id.tv_name);
mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
- mLocker = (ImageView) findViewById(R.id.iv_locker);
}
///根据data的属性对各个控件的属性的控制，主要是可见性Visibility，内容setText，格式setTextAppearance
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
@@ -60,8 +58,8 @@ public class NotesListItem extends LinearLayout {
} else {
mCheckBox.setVisibility(View.GONE);
}
- mItemData = data;
+ mItemData = data;
///设置控件属性，一共三种情况，由data的id和父id是否与保存到文件夹的id一致来决定
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mCallName.setVisibility(View.GONE);
@@ -84,7 +82,6 @@ public class NotesListItem extends LinearLayout {
} else {
mAlert.setVisibility(View.GONE);
}
-
} else {
mCallName.setVisibility(View.GONE);
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
@@ -104,16 +101,6 @@ public class NotesListItem extends LinearLayout {
}
}
}
- mLocker.setImageResource(R.drawable.title_locker);
- if (data.hasPassword()){
- mLocker.setVisibility(GONE);
- }
- else {
- mLocker.setVisibility(VISIBLE);
- String text = " 不给你看哟~" + " (tag:" + data.getmTAG() + ")";
- mTitle.setText(text);
- }
-
///设置内容，获取相关时间，从data里编辑的日期中获取
mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
diff --git a/src/main/res/drawable-hdpi/title_locker.png b/src/main/res/drawable-hdpi/title_locker.png
deleted file mode 100644
index 5ea1e0e..0000000
Binary files a/src/main/res/drawable-hdpi/title_locker.png and /dev/null differ
diff --git a/src/main/res/layout/buttom.xml b/src/main/res/layout/buttom.xml
deleted file mode 100644
index cba74a0..0000000
--- a/src/main/res/layout/buttom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
index ab52f5a..9a562c4 100644
--- a/src/main/res/layout/note_edit.xml
+++ b/src/main/res/layout/note_edit.xml
@@ -72,13 +72,8 @@
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="8dip" />
-
>>>>>> 8c352e6399667edb8fde9a423fcc254e47cee228
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
@@ -108,11 +103,11 @@
+ android:layout_gravity="left|top"
+ android:fadingEdgeLength="0dip">
-
diff --git a/src/main/res/layout/note_item.xml b/src/main/res/layout/note_item.xml
index 394229f..d541f6a 100644
--- a/src/main/res/layout/note_item.xml
+++ b/src/main/res/layout/note_item.xml
@@ -69,12 +69,6 @@
android:clickable="false"
android:visibility="gone" />
-
-