合并了更改背景图片和其他功能

src/main/AndroidManifest.xml

@@ -139,6 +139,13 @@
             android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
+        <activity
+            android:name="net.micode.notes.ui.BoardActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light" >
+        </activity>
+
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
             android:exported="false" >

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

@@ -1002,23 +1002,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         // DocumentProvider
         if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
             // ExternalStorageProvider
-//            if (isExternalStorageDocument(uri)) {
-//                final String docId = DocumentsContract.getDocumentId(uri);
-//                final String[] split = docId.split(":");
-//                final String type = split[0];
-//
-//                if ("primary".equalsIgnoreCase(type)) {
-//                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-//                }
-//            }
-//            // DownloadsProvider
-//            else if (isDownloadsDocument(uri)) {
-//                final String id = DocumentsContract.getDocumentId(uri);
-//                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-//                return getDataColumn(context, contentUri, null, null);
-//            }
+            if (isExternalStorageDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                if ("primary".equalsIgnoreCase(type)) {
+                   return Environment.getExternalStorageDirectory() + "/" + split[1];
+                }
+            }
+            // DownloadsProvider
+            else if (isDownloadsDocument(uri)) {
+                final String id = DocumentsContract.getDocumentId(uri);
+                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+                return getDataColumn(context, contentUri, null, null);
+            }
             // MediaProvider
-//            else
+            else
                 if (isMediaDocument(uri)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
                 final String[] split = docId.split(":");
@@ -1069,14 +1069,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
 
     //是否为外部存储文件
-//    public boolean isExternalStorageDocument(Uri uri) {
-//        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-//    }
-//
-//    //是否为下载文件
-//    public boolean isDownloadsDocument(Uri uri) {
-//        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-//    }
+    public boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+    //是否为下载文件
+    public boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
 
     //是否为媒体文件
     public boolean isMediaDocument(Uri uri) {

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

@@ -55,11 +55,13 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.GridView;
 import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.micode.notes.PaintView;
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -80,6 +82,7 @@ import java.util.HashSet;
 
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private int mode = -1;
+
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -120,6 +123,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private ModeCallback mModeCallBack;
 
+    private PaintView paintView;
+
+    private GridView paint_bottomMenu;
+
     private static final String TAG = "NotesListActivity";
 
     public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
@@ -140,7 +147,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.note_list);
-        getWindow().setBackgroundDrawableResource(R.drawable.menu_lover);
         initResources();
 
         /**
@@ -777,13 +783,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
-        if(mode == -1){
-            menu.findItem(R.id.menu_lover).setVisible(false);
-        }
-        else if(mode == 1)
-        {
-            menu.findItem(R.id.menu_young).setVisible(false);
-        }
         return true;
     }
 
@@ -801,7 +800,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 getWindow().setBackgroundDrawableResource(R.drawable.menu_lover);
                 break;
             }
-
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
                 break;
@@ -833,6 +831,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             case R.id.menu_search:
                 onSearchRequested();
                 break;
+            case R.id.menu_board: {
+
+                /* 新建一个Intent对象 */
+                Intent intent = new Intent();
+                /* 指定intent要启动的类 */
+                intent.setClass(NotesListActivity.this, BoardActivity.class);
+                /* 启动一个新的Activity */
+                startActivity(intent);
+                /* 关闭当前的Activity */
+                NotesListActivity.this.finish();
+                break;
+            }
+
             default:
                 break;
         }

src/main/res/drawable-hdpi/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

src/main/res/drawable-hdpi/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

src/main/res/drawable-hdpi/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/drawable-hdpi.iml" filepath="$PROJECT_DIR$/.idea/drawable-hdpi.iml" />
-    </modules>
-  </component>
-</project>

src/main/res/menu/note_list.xml

@@ -37,11 +37,15 @@
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
 
+    <item
+        android:id="@+id/menu_board"
+        android:title="Board"/>
+
     <item
         android:id="@+id/menu_lover"
-        android:title="@string/background_lover"/>
+        android:title="Background:lover"/>
 
     <item
         android:id="@+id/menu_young"
-        android:title="@string/background_young"/>
+        android:title="Background:young"/>
 </menu>

src/main/res/values/ids.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="menu_young" type="id">menu_young</item>
-</resources>

src/main/res/values/strings.xml

@@ -36,10 +36,10 @@
     <string name="note_link_web">Browse web</string>
     <string name="note_link_other">Open map</string>
     <!-- Text export file information -->
-    <string name="file_path" translatable="false">/MIUI/notes/</string>
-    <string name="file_name_txt_format" translatable="false">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
     <!-- notes list string -->
-    <string name="format_folder_files_count" translatable="false">(%d)</string>
+    <string name="format_folder_files_count">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_sync">Sync</string>
@@ -101,7 +101,7 @@
     <string name="preferences_account_title">Sync account</string>
     <string name="preferences_account_summary">Sync notes with google task</string>
     <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format" translatable="false">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
     <string name="preferences_add_account">Add account</string>
     <string name="preferences_menu_change_account">Change sync account</string>
     <string name="preferences_menu_remove_account">Remove sync account</string>
@@ -126,8 +126,6 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
-    <string name="background_lover" translatable="false">Background:lover</string>
-    <string name="background_young" translatable="false">Background:young</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. -->