功能添加：密码锁

src/Notes-master/app/src/main/AndroidManifest.xml

@@ -20,6 +20,8 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
+    <uses-sdk android:minSdkVersion="14" />
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -136,6 +138,18 @@
             android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
+        <activity
+            android:name="net.micode.notes.ui.SetLockActivity"
+            android:label="@string/menu_set_password"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
+        </activity>
+
+        <activity
+            android:name=".ui.UnlockActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
             android:exported="false" >

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
          * <P> Type: INTEGER (long) </P>

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");
+    }
+    */
 }

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;

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

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

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("");
+    }
 }

src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -141,6 +141,7 @@ public class NotesListActivity<Params> 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<Params> 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<Params> 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();

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()));

src/Notes-master/app/src/main/res/layout/note_edit.xml

@@ -40,6 +40,14 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+            <TextView
+                android:id="@+id/text_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|center_vertical"
+                android:layout_marginRight="8dip"
+                />
+
             <ImageView
                 android:id="@+id/iv_alert_icon"
                 android:layout_width="wrap_content"
@@ -56,6 +64,15 @@
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
+            <TextView
+                android:id="@+id/tv_top_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dip"
+                android:layout_marginRight="20dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
             <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

src/Notes-master/app/src/main/res/layout/note_item.xml

@@ -75,4 +75,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
+
+    <ImageView
+        android:id="@+id/iv_lock"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center"/>
+
 </FrameLayout>

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" />
 
+
         <ListView
             android:id="@+id/notes_list"
             android:layout_width="fill_parent"

src/Notes-master/app/src/main/res/menu/call_note_edit.xml

@@ -45,4 +45,12 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_set_password"
+        android:title="@string/menu_set_password" />
+    <item
+        android:id="@+id/menu_remove_password"
+        android:title="@string/menu_remove_password" />
+
 </menu>

src/Notes-master/app/src/main/res/menu/note_edit.xml

@@ -17,11 +17,11 @@
 
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android">
-
+<!--
     <item
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
-
+-->
     <item
         android:id="@+id/menu_delete"
         android:title="@string/menu_delete"/>
@@ -49,4 +49,13 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_set_password"
+        android:title="@string/menu_set_passcode" />
+
+    <item
+        android:id="@+id/menu_remove_password"
+        android:title="@string/menu_delete_passcode" />
+
 </menu>

src/Notes-master/app/src/main/res/menu/note_list.xml

@@ -36,4 +36,5 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+
 </menu>

src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml

@@ -63,6 +63,8 @@
     <string name="menu_send_to_desktop">发送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_set_password">设置密码</string>
+    <string name="menu_remove_password">删除密码</string>
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -122,5 +124,19 @@
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
     </plurals>
+    <string name="light_mode">亮背景</string>
+    <string name="night_mode">暗背景</string>
+    <string name="settings_short_label">设置</string>
+    <string name="settings_long_label">设置</string>
+    <string name="settings_disabled_message">打开设置失败</string>
+    <string name="add_note_short_label">新建便签</string>
+    <string name="add_note_long_label">新建便签</string>
+    <string name="add_note_disabled_message">新建便签失败</string>
+    <string name="menu_set_passcode">设置密码</string>
+    <string name="menu_delete_passcode">删除密码</string>
+    <string name="note_passcode_deleted">密码已删除</string>
+    <string name="menu_set_top">设置置顶</string>
+    <string name="menu_classify">分类</string>
+    <string name="menu_cancel_classify">取消分类</string>
 
 </resources>

src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml

@@ -64,6 +64,8 @@
     <string name="menu_send_to_desktop">發送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_set_password">设置密码</string>
+    <string name="menu_remove_password">删除密码</string>
     <string name="menu_title_select_folder">選擇文件夾</string>
     <string name="menu_move_parent_folder">上一級文件夾</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -123,5 +125,19 @@
     <plurals name="search_results_title">
         <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
     </plurals>
+    <string name="light_mode">亮背景</string>
+    <string name="night_mode">暗背景</string>
+    <string name="settings_short_label">設置</string>
+    <string name="settings_long_label">設置</string>
+    <string name="settings_disabled_message">打开設置失敗</string>
+    <string name="add_note_short_label">新建便簽</string>
+    <string name="add_note_long_label">新建便簽</string>
+    <string name="add_note_disabled_message">新建便簽失敗</string>
+    <string name="menu_set_passcode">設置密码</string>
+    <string name="menu_delete_passcode">删除密码</string>
+    <string name="note_passcode_deleted">密码已删除</string>
+    <string name="menu_set_top">設置置頂</string>
+    <string name="menu_classify">分類</string>
+    <string name="menu_cancel_classify">取消分類</string>
 
 </resources>

src/Notes-master/app/src/main/res/values/colors.xml

@@ -17,4 +17,9 @@
 
 <resources>
     <color name="user_query_highlight">#335b5b5b</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+    <color name="light_blue_A200">#FF40C4FF</color>
+    <color name="light_blue_A400">#FF00B0FF</color>
+    <color name="black_overlay">#66000000</color>
 </resources>

src/Notes-master/app/src/main/res/values/strings.xml

@@ -15,8 +15,7 @@
      limitations under the License.
 -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -67,6 +66,8 @@
     <string name="menu_send_to_desktop">Send to home</string>
     <string name="menu_alert">Remind me</string>
     <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_set_password">Set password</string>
+    <string name="menu_remove_password">Remove password</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="info_note_enter_desktop">Note added to home</string>
@@ -127,9 +128,26 @@
     <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>
+        <item quantity="one"><xliff:g example="1" id="number">%1$s</xliff:g> result for \"<xliff:g example="???" id="search">%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>
+        <item quantity="other"><xliff:g example="15" id="number">%1$s</xliff:g> results for \"<xliff:g example="???" id="search">%2$s</xliff:g>\"</item>
     </plurals>
+    <string name="title_activity_splash">FullscreenActivity</string>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
+    <string name="light_mode">light mode</string>
+    <string name="night_mode">night mode</string>
+    <string name="settings_short_label">Settings</string>
+    <string name="settings_long_label">Settings</string>
+    <string name="settings_disabled_message">unavailable</string>
+    <string name="add_note_short_label">Add note</string>
+    <string name="add_note_long_label">Add note</string>
+    <string name="add_note_disabled_message">Failed to add note</string>
+    <string name="menu_set_passcode">Set passcode</string>
+    <string name="menu_delete_passcode">Delete passcode</string>
+    <string name="note_passcode_deleted">passcode deleted</string>
+    <string name="menu_set_top">Set top</string>
+    <string name="menu_classify">Classify</string>
+    <string name="menu_cancel_classify">Cancel classification</string>
 
 </resources>

src/Notes-master/app/src/main/res/values/styles.xml

@@ -16,18 +16,22 @@
 -->
 
 <resources>
+
     <style name="TextAppearanceSuper">
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
     </style>
+
     <style name="TextAppearanceLarge">
         <item name="android:textSize">@dimen/text_font_size_large</item>
         <item name="android:textColorLink">#0000ff</item>
     </style>
+
     <style name="TextAppearanceMedium">
         <item name="android:textSize">@dimen/text_font_size_medium</item>
         <item name="android:textColorLink">#0000ff</item>
     </style>
+
     <style name="TextAppearanceNormal">
         <item name="android:textSize">@dimen/text_font_size_normal</item>
         <item name="android:textColorLink">#0000ff</item>
@@ -49,7 +53,7 @@
     </style>
 
     <style name="HighlightTextAppearancePrimary">
-    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
         <item name="android:textColor">@color/primary_text_dark</item>
     </style>
 
@@ -63,7 +67,16 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+        <!--        <item name="android:displayOptions" />-->
+        <item name="android:visibility">visible</item>
+    </style>
+
+    <style name="Widget.Theme.Notesmaster.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
+        <item name="android:background">@color/black_overlay</item>
+    </style>
+
+    <style name="Widget.Theme.Notesmaster.ButtonBar.Fullscreen" parent="">
+        <item name="android:background">@color/black_overlay</item>
+        <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
     </style>
 </resources>