src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
+            android:label="Notes"
             android:launchMode="singleTop"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
@@ -43,8 +43,15 @@
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
+            android:theme="@style/NoteTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
 
+                <data android:mimeType="vnd.android.cursor.item/text_note" />
+                <data android:mimeType="vnd.android.cursor.item/call_note" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
 

src/main/java/net/micode/notes/model/WorkingNote.java

@@ -38,7 +38,7 @@ public class WorkingNote {
     // Note Id
     private long mNoteId;
     // Note content
-    public String mContent;
+    private String mContent;
     // Note mode
     private int mMode;
 

src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -31,7 +31,6 @@ import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -79,7 +78,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
-public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     //首页背景变换
     private int mode = -1;
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
@@ -127,8 +126,6 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
 
     private NoteItemData mFocusNoteDataItem;
-    //表示是否在私密模式
-    public static int secret_mode = 0;
 
     private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
 
@@ -418,35 +415,10 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
                 : NORMAL_SELECTION;
-        if(secret_mode == 0) {
-            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                    Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
-                            String.valueOf(mCurrentFolderId)
-                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
-        }
-        else{
-            String str1 = "444";
-            String [] PROJECTION = new String [] {  //定义一个新的PROJECTION数组，只换掉SNIPPET
-                    NoteColumns.ID,
-                    NoteColumns.ALERTED_DATE,
-                    NoteColumns.BG_COLOR_ID,
-                    NoteColumns.CREATED_DATE,
-                    NoteColumns.HAS_ATTACHMENT,
-                    NoteColumns.MODIFIED_DATE,
-                    NoteColumns.NOTES_COUNT,
-                    NoteColumns.PARENT_ID,
-//                    NoteColumns.SNIPPET,
-                    str1,
-                    NoteColumns.TYPE,
-                    NoteColumns.WIDGET_ID,
-                    NoteColumns.WIDGET_TYPE,
-            };
-            mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                    Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
-                            String.valueOf(mCurrentFolderId)
-                    }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
-
-        }
+        mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+                    String.valueOf(mCurrentFolderId)
+                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
     }
 
     private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -803,10 +775,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
-        if(secret_mode == 1)
-            menu.findItem(R.id.menu_secret).setVisible(false);
-        else
-            menu.findItem(R.id.menu_quit_secret).setVisible(false);
+
         if(mode==-1){//decade
             menu.findItem(R.id.menu_decade).setVisible(false);
         }
@@ -854,53 +823,6 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
             else if(item.getItemId()==R.id.menu_search) {
                 onSearchRequested();
             }
-            else if(item.getItemId()==R.id.menu_secret)
-            {//进入私密模式
-
-                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
-                dialog.setTitle("重要提醒");
-                dialog.setMessage("您确认进入私密模式吗？");
-                dialog.setCancelable(false);
-                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
-                        secret_mode = 1;
-                        startAsyncNotesListQuery();
-                    }
-                });
-                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which){}
-                });
-                dialog.show();
-                startAsyncNotesListQuery();
-
-            }
-            else if(item.getItemId()==R.id.menu_quit_secret)
-            {  //退出私密模式
-
-                AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
-                dialog.setTitle("重要提醒");
-                dialog.setMessage("您确认退出私密模式吗？");
-                dialog.setCancelable(false);
-                dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-
-                        secret_mode = 0;
-                        Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
-                        startAsyncNotesListQuery();
-                    }
-                });
-                dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which){}
-                });
-                dialog.show();
-
-            }
 
         return true;
     }

src/main/java/net/micode/notes/ui/SplashActivity.java

@@ -1,42 +0,0 @@
-package net.micode.notes.ui;
-
-import android.annotation.SuppressLint;
-
-import android.content.Intent;
-
-import android.support.v7.app.ActionBar;
-
-import android.support.v7.app.AppCompatActivity;
-
-import android.os.Build;
-
-import android.os.Bundle;
-
-import android.os.Handler;
-
-import android.view.MotionEvent;
-
-import android.view.View;
-
-import android.view.WindowInsets;
-
-import net.micode.notes.R;
-
-public class SplashActivity extends AppCompatActivity {
-    Handler mHandler=new Handler();
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState); //加载启动界面
-        setContentView(R.layout.activity_splash); //加载启动图片
-        // 当计时结束时，跳转至NotesListActivity
-        mHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                Intent intent=new Intent();
-                intent.setClass(SplashActivity.this, NotesListActivity.class);
-                startActivity(intent);
-                finish(); //销毁
-            }
-        }, 3000); // 3秒后跳转
-    }
-}

src/main/res/layout/activity_splash.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/fullscreenBackgroundColor"
-    android:theme="@style/ThemeOverlay.Notesmaster.FullscreenContainer"
-    tools:context=".ui.SplashActivity">
-
-    <!-- The primary full-screen view. This can be replaced with whatever view
-         is needed to present your content, e.g. VideoView, SurfaceView,
-         TextureView, etc. -->
-    <TextView
-        android:id="@+id/fullscreen_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/splash"
-        android:gravity="center"
-        android:keepScreenOn="true"
-        android:text="@string/dummy_content"
-        android:textColor="?attr/fullscreenTextColor"
-        android:textSize="50sp"
-        android:textStyle="bold" />
-
-    <!-- This FrameLayout insets its children based on system windows using
-         android:fitsSystemWindows. -->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
-
-        <LinearLayout
-            android:id="@+id/fullscreen_content_controls"
-            style="@style/Widget.Theme.Notesmaster.ButtonBar.Fullscreen"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UselessParent">
-
-            <Button
-                android:id="@+id/dummy_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/dummy_button" />
-
-        </LinearLayout>
-
-<!--        <TextView
-            android:id="@+id/fullscreen_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/splash"
-            android:gravity="center"
-            android:keepScreenOn="true"
-            android:text="@string/dummy_content"
-            android:textSize="50sp"
-            android:textStyle="bold"/>           -->
-    </FrameLayout>
-
-</FrameLayout>

src/main/res/layout/note_edit.xml

@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:tools="http://schemas.android.com/tools"
+<FrameLayout
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/list_background"
@@ -61,7 +61,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/bg_btn_set_color" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -397,17 +396,5 @@
                 android:layout_marginBottom="-7dip"
                 android:src="@drawable/selected" />
         </FrameLayout>
-
     </LinearLayout>
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:background="@android:drawable/ic_menu_camera"
-        android:visibility="visible"
-        tools:visibility="visible" />
-
 </FrameLayout>

src/main/res/menu/note_list.xml

@@ -44,12 +44,4 @@
     <item
         android:id="@+id/menu_zio"
         android:title="@string/menu_zio"/>
-
-    <item
-        android:id="@+id/menu_secret"
-        android:title="@string/menu_secret"/>
-
-    <item
-        android:id="@+id/menu_quit_secret"
-        android:title="@string/menu_quit_secret"/>
 </menu>

src/main/res/menu/sub_folder.xml

@@ -21,11 +21,4 @@
     <item
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
-    <item
-        android:id="@+id/menu_secret"
-        android:title="@string/menu_secret"/>
-
-    <item
-        android:id="@+id/menu_quit_secret"
-        android:title="@string/menu_quit_secret"/>
 </menu>

src/main/res/values-night/themes.xml

@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="ThemeOverlay.Notesmaster.FullscreenContainer" parent="">
-        <item name="fullscreenBackgroundColor">@color/light_blue_900</item>
-        <item name="fullscreenTextColor">@color/light_blue_A400</item>
-    </style>
-</resources>

src/main/res/values/attrs.xml

@@ -1,6 +0,0 @@
-<resources>
-    <declare-styleable name="FullscreenAttrs">
-        <attr name="fullscreenBackgroundColor" format="color" />
-        <attr name="fullscreenTextColor" format="color" />
-    </declare-styleable>
-</resources>

src/main/res/values/strings.xml

@@ -40,8 +40,6 @@
     <!-- notes list string -->
 
     <!--首页背景切换-->
-    <string name="menu_secret">secret model</string>
-    <string name="menu_quit_secret">quit secret model</string>
     <string name="menu_decade">Background: decade</string>
     <string name="menu_zio">Background: zio</string>
 

src/main/res/values/themes.xml

@@ -1,16 +0,0 @@
-<resources>
-
-    <style name="Theme.Notesmaster" parent="Theme.AppCompat.Light" />
-
-    <style name="Theme.Notesmaster.Fullscreen" parent="Theme.Notesmaster">
-        <item name="android:actionBarStyle">@style/Widget.Theme.Notesmaster.ActionBar.Fullscreen
-        </item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowBackground">@null</item>
-    </style>
-
-    <style name="ThemeOverlay.Notesmaster.FullscreenContainer" parent="">
-        <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
-        <item name="fullscreenTextColor">@color/light_blue_A200</item>
-    </style>
-</resources>