From 0232f42c9fe9155695e4e6590205c5c010684e85 Mon Sep 17 00:00:00 2001 From: yangtingkai <1752285001@qq.com> Date: Tue, 9 Nov 2021 10:48:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=EF=BC=9A?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/AndroidManifest.xml | 14 +++++ .../java/net/micode/notes/data/Notes.java | 1 + .../notes/data/NotesDatabaseHelper.java | 40 ++++++++++++- .../java/net/micode/notes/model/Note.java | 1 + .../net/micode/notes/model/WorkingNote.java | 26 ++++++++- .../net/micode/notes/ui/NoteEditActivity.java | 56 +++++++++++++++++++ .../net/micode/notes/ui/NoteItemData.java | 8 +++ .../micode/notes/ui/NotesListActivity.java | 7 ++- .../net/micode/notes/ui/NotesListItem.java | 18 ++++++ .../app/src/main/res/layout/note_edit.xml | 17 ++++++ .../app/src/main/res/layout/note_item.xml | 7 +++ .../app/src/main/res/layout/note_list.xml | 1 + .../app/src/main/res/menu/call_note_edit.xml | 8 +++ .../app/src/main/res/menu/note_edit.xml | 13 ++++- .../app/src/main/res/menu/note_list.xml | 1 + .../src/main/res/values-zh-rCN/strings.xml | 16 ++++++ .../src/main/res/values-zh-rTW/strings.xml | 16 ++++++ .../app/src/main/res/values/colors.xml | 5 ++ .../app/src/main/res/values/strings.xml | 26 +++++++-- .../app/src/main/res/values/styles.xml | 19 ++++++- 20 files changed, 285 insertions(+), 15 deletions(-) diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml index 2b772973..6a8cf6c1 100644 --- a/src/Notes-master/app/src/main/AndroidManifest.xml +++ b/src/Notes-master/app/src/main/AndroidManifest.xml @@ -20,6 +20,8 @@ android:versionCode="1" android:versionName="0.1" > + + @@ -136,6 +138,18 @@ android:theme="@android:style/Theme.Holo.Light" > + + + + + + diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java index f240604b..7d64db36 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java @@ -62,6 +62,7 @@ public class Notes { public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); public interface NoteColumns { + public static final String PASSCODE = "passcode"; /** * The unique ID for a row *

Type: INTEGER (long)

diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d577..729f4eb3 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -30,7 +30,7 @@ import net.micode.notes.data.Notes.NoteColumns; public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 5; public interface TABLE { public static final String NOTE = "note"; @@ -60,7 +60,8 @@ 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.VERSION + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.PASSCODE + " TEXT NOT NULL DEFAULT ''" + ")"; private static final String CREATE_DATA_TABLE_SQL = @@ -80,7 +81,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** * Increase folder's note count when move note to the folder @@ -322,6 +323,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { oldVersion++; } + if (oldVersion == 4) { + upgradeToV5(db); + oldVersion++; + } +/* + if (oldVersion == 5) { + upgradeToV6(db); + oldVersion++; + } + + if (oldVersion == 6) { + upgradeToV7(db); + oldVersion++; + }*/ + if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); @@ -359,4 +375,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); } + + private void upgradeToV5(SQLiteDatabase db) { + db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); + db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); + createNoteTable(db); + createDataTable(db); + } +/* + private void upgradeToV6(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD CLOUMN" + NoteColumns.TOP + + " INTEGER NOT NULL DEFAULT 0"); + } + + private void upgradeToV7(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD CLOUMN" + NoteColumns.CLASSIFICATION + + " INTEGER NOT NULL DEFAULT 0"); + } + */ } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java index 6706cf67..54593584 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java @@ -50,6 +50,7 @@ public class Note { values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.PASSCODE, ""); Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); long noteId = 0; diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e43..bea760dd 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -42,6 +42,9 @@ public class WorkingNote { // Note mode private int mMode; + /**记录便签已设置密码*/ + private String mPasscode; + private long mAlertDate; private long mModifiedDate; @@ -54,6 +57,7 @@ public class WorkingNote { private long mFolderId; + private Context mContext; private static final String TAG = "WorkingNote"; @@ -78,7 +82,8 @@ public class WorkingNote { NoteColumns.BG_COLOR_ID, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE + NoteColumns.MODIFIED_DATE, + NoteColumns.PASSCODE }; private static final int DATA_ID_COLUMN = 0; @@ -101,6 +106,7 @@ public class WorkingNote { private static final int NOTE_MODIFIED_DATE_COLUMN = 5; + private static final int NOTE_PASSCODE_COLUMN = 6; // New note construct private WorkingNote(Context context, long folderId) { mContext = context; @@ -112,6 +118,7 @@ public class WorkingNote { mIsDeleted = false; mMode = 0; mWidgetType = Notes.TYPE_WIDGET_INVALIDE; + mPasscode = ""; //save note's password } // Existing note construct @@ -137,6 +144,7 @@ public class WorkingNote { mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); + mPasscode = cursor.getString(NOTE_PASSCODE_COLUMN); //get password from database } cursor.close(); } else { @@ -342,6 +350,22 @@ public class WorkingNote { return mWidgetType; } + /**判断是否已经设置密码*/ + public boolean hasPasscode() { + return !mPasscode.equals(""); + } + + /**设置便签访问密码，并存入数据库*/ + public void setPasscode(String passcode) { + mPasscode = passcode; + mNote.setNoteValue(NoteColumns.PASSCODE, passcode); + } + + /**获取设置的密码*/ + public String getPasscode() { + return mPasscode; + } + public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff89..ae424d8f 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -30,9 +30,11 @@ import android.content.SharedPreferences; import android.graphics.Paint; import android.os.Bundle; import android.preference.PreferenceManager; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; +import android.text.TextWatcher; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; import android.util.Log; @@ -141,6 +143,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; + private static final int REQUEST_SET_PASSCODE = 0; + private static final int REQUEST_UNLOCK = 1; + public static final String TAG_CHECKED = String.valueOf('\u221A'); public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); @@ -148,6 +153,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; + private boolean Locked; /* 用以判断是否已解锁 */ @Override protected void onCreate(Bundle savedInstanceState) { @@ -259,6 +265,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } mWorkingNote.setOnSettingStatusChangedListener(this); + Locked = mWorkingNote.hasPasscode();//设置便签解锁状态; + if (intent.hasExtra("lock")) { + Locked = false; + } return true; } @@ -293,6 +303,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, * is not ready */ showAlertHeader(); + + //如果设置了密码，启动输入密码页面 + if (mWorkingNote.hasPasscode() && Locked) { + saveNote(); + Intent intent = new Intent(this,UnlockActivity.class); + intent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); + startActivityForResult(intent,REQUEST_SET_PASSCODE); + finish(); + } } private void showAlertHeader() { @@ -502,6 +521,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { menu.findItem(R.id.menu_delete_remind).setVisible(false); } + //如果已经设置密码，显示删除密码选项，否则，显示设置密码选项 + if (mWorkingNote.hasPasscode()) { + menu.findItem(R.id.menu_set_password).setVisible(false); + } else { + menu.findItem(R.id.menu_remove_password).setVisible(false); + } return true; } @@ -547,12 +572,43 @@ public class NoteEditActivity extends Activity implements OnClickListener, case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; + //设置密码 + case R.id.menu_set_password: + setPasscode(); + break; + //删除密码 + case R.id.menu_remove_password: + deletePasscode(); + break; default: break; } return true; } + /** + * 弹出设置密码界面 + */ + private void setPasscode() { + //确保笔记已写入数据库 + saveNote(); + //初始化一个新的意图，用以跳转至设置密码界面 + Intent intent = new Intent(this,SetLockActivity.class); + //给意图传入当前便签的id参数，便于从设置密码活动中跳转回编辑便签活动 + intent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); + startActivity(intent); + finish(); + } + + /** + * 删除便签密码 + */ + private void deletePasscode() { + mWorkingNote.setPasscode(""); + saveNote(); + Toast.makeText(NoteEditActivity.this,R.string.note_passcode_deleted,Toast.LENGTH_SHORT).show(); + } + private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 0f5a8782..46bd84bb 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -40,6 +40,7 @@ public class NoteItemData { NoteColumns.TYPE, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, + NoteColumns.PASSCODE }; private static final int ID_COLUMN = 0; @@ -54,6 +55,7 @@ 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 PASSCODE_COLUMN = 12; private long mId; private long mAlertDate; @@ -69,6 +71,7 @@ public class NoteItemData { private int mWidgetType; private String mName; private String mPhoneNumber; + private String mPasscode; private boolean mIsLastItem; private boolean mIsFirstItem; @@ -92,6 +95,7 @@ public class NoteItemData { mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); + mPasscode = cursor.getString(PASSCODE_COLUMN); mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); @@ -221,4 +225,8 @@ public class NoteItemData { public static int getNoteType(Cursor cursor) { return cursor.getInt(TYPE_COLUMN); } + + public boolean hasLock() { + return !mPasscode.equals(""); + } } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 6fedf169..3aace150 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -141,6 +141,7 @@ public class NotesListActivity extends Activity implements OnClickListen protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + //getWindow().setBackgroundDrawableResource(R.drawable.list_background_light); initResources(); /** @@ -165,9 +166,11 @@ public class NotesListActivity extends Activity implements OnClickListen if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); InputStream in = null; - try (InputStreamReader isr = new InputStreamReader(in);BufferedReader br = new BufferedReader(isr)){ + try { in = getResources().openRawResource(R.raw.introduction); //加载软件自带的第一条便签内容 if (in != null) { + InputStreamReader isr = new InputStreamReader(in); + BufferedReader br = new BufferedReader(isr); char [] buf = new char[1024]; int len = 0; while ((len = br.read(buf)) > 0) { @@ -453,7 +456,7 @@ public class NotesListActivity extends Activity implements OnClickListen mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which)); Toast.makeText( NotesListActivity.this, - getString(R.string.format_move_notes_to_folder, + getString(R.string.format_move_notes_to_folder, mNotesListAdapter.getSelectedCount(), adapter.getFolderName(NotesListActivity.this, which)), Toast.LENGTH_SHORT).show(); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 1221e808..40dea10a 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -37,6 +37,7 @@ public class NotesListItem extends LinearLayout { private TextView mCallName; private NoteItemData mItemData; private CheckBox mCheckBox; + private ImageView mLock; public NotesListItem(Context context) { super(context); @@ -46,6 +47,7 @@ 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); + mLock = (ImageView) findViewById(R.id.iv_lock); } public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { @@ -75,6 +77,14 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } + if (data.hasLock()) { + mLock.setImageResource(R.drawable.lock); + mLock.setVisibility(View.VISIBLE); + String text = "已加密"; + mTitle.setText(text); + } else { + mLock.setVisibility(View.GONE); + } } else { mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); @@ -92,6 +102,14 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } + if (data.hasLock()) { + mLock.setImageResource(R.drawable.lock); + mLock.setVisibility(View.VISIBLE); + String text = "已加密"; + mTitle.setText(text); + } else { + mLock.setVisibility(View.GONE); + } } } mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml index 10b2aa73..e2247c86 100644 --- a/src/Notes-master/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master/app/src/main/res/layout/note_edit.xml @@ -40,6 +40,14 @@ android:layout_marginRight="8dip" android:textAppearance="@style/TextAppearanceSecondaryItem" /> + + + + + + + diff --git a/src/Notes-master/app/src/main/res/layout/note_list.xml b/src/Notes-master/app/src/main/res/layout/note_list.xml index 6b25d38f..5ecbd9a9 100644 --- a/src/Notes-master/app/src/main/res/layout/note_list.xml +++ b/src/Notes-master/app/src/main/res/layout/note_list.xml @@ -37,6 +37,7 @@ android:textColor="#FFEAD1AE" android:textSize="@dimen/text_font_size_medium" /> + + + + + diff --git a/src/Notes-master/app/src/main/res/menu/note_edit.xml b/src/Notes-master/app/src/main/res/menu/note_edit.xml index 35cacd14..99af372e 100644 --- a/src/Notes-master/app/src/main/res/menu/note_edit.xml +++ b/src/Notes-master/app/src/main/res/menu/note_edit.xml @@ -17,11 +17,11 @@ - + @@ -49,4 +49,13 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master/app/src/main/res/menu/note_list.xml b/src/Notes-master/app/src/main/res/menu/note_list.xml index 42ea7363..884ec58e 100644 --- a/src/Notes-master/app/src/main/res/menu/note_list.xml +++ b/src/Notes-master/app/src/main/res/menu/note_list.xml @@ -36,4 +36,5 @@ + diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml index 09f75ed9..bde0e4f5 100644 --- a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml @@ -63,6 +63,8 @@ 发送到桌面 提醒我 删除提醒 + 设置密码 + 删除密码 选择文件夹 上一级文件夹 已添加到桌面 @@ -122,5 +124,19 @@ %1$s 条符合“%2$s”的搜索结果 + 亮背景 + 暗背景 + 设置 + 设置 + 打开设置失败 + 新建便签 + 新建便签 + 新建便签失败 + 设置密码 + 删除密码 + 密码已删除 + 设置置顶 + 分类 + 取消分类 diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml index e29b79bc..ae03dc99 100644 --- a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml @@ -64,6 +64,8 @@ 發送到桌面 提醒我 刪除提醒 + 设置密码 + 删除密码 選擇文件夾 上一級文件夾 已添加到桌面 @@ -123,5 +125,19 @@ %1$s 條符合”%2$s“的搜尋結果 + 亮背景 + 暗背景 + 設置 + 設置 + 打开設置失敗 + 新建便簽 + 新建便簽 + 新建便簽失敗 + 設置密码 + 删除密码 + 密码已删除 + 設置置頂 + 分類 + 取消分類 diff --git a/src/Notes-master/app/src/main/res/values/colors.xml b/src/Notes-master/app/src/main/res/values/colors.xml index 123ffbfb..2496c0c4 100644 --- a/src/Notes-master/app/src/main/res/values/colors.xml +++ b/src/Notes-master/app/src/main/res/values/colors.xml @@ -17,4 +17,9 @@ #335b5b5b + #FF039BE5 + #FF01579B + #FF40C4FF + #FF00B0FF + #66000000 diff --git a/src/Notes-master/app/src/main/res/values/strings.xml b/src/Notes-master/app/src/main/res/values/strings.xml index 55df8682..a26b6d82 100644 --- a/src/Notes-master/app/src/main/res/values/strings.xml +++ b/src/Notes-master/app/src/main/res/values/strings.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + Notes Notes 2x2 Notes 4x4 @@ -67,6 +66,8 @@ Send to home Remind me Delete reminder + Set password + Remove password Select folder Parent folder Note added to home @@ -127,9 +128,26 @@ set cancel - %1$s result for \"%2$s\" + %1$s result for \"%2$s\" - %1$s results for \"%2$s\" + %1$s results for \"%2$s\" + FullscreenActivity + Dummy Button + DUMMY\nCONTENT + light mode + night mode + Settings + Settings + unavailable + Add note + Add note + Failed to add note + Set passcode + Delete passcode + passcode deleted + Set top + Classify + Cancel classification diff --git a/src/Notes-master/app/src/main/res/values/styles.xml b/src/Notes-master/app/src/main/res/values/styles.xml index d750e659..f803d368 100644 --- a/src/Notes-master/app/src/main/res/values/styles.xml +++ b/src/Notes-master/app/src/main/res/values/styles.xml @@ -16,18 +16,22 @@ --> + + + + @@ -63,7 +67,16 @@ + + + + \ No newline at end of file