新增 3x3窗口小部件

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

@@ -20,7 +20,8 @@
     android:versionCode="1"
     android:versionName="0.1">
 
-    <uses-sdk android:minSdkVersion="14"
+    <uses-sdk
+        android:minSdkVersion="14"
         tools:ignore="GradleOverrides" />
 
 
@@ -44,11 +45,11 @@
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:windowSoftInputMode="adjustPan"
+            android:windowSoftInputMode="adjustPan">
-            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -59,14 +60,16 @@
         <activity
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/NoteTheme">
-            android:exported="true">
 
-            <intent-filter android:scheme="http"
+            <intent-filter
+                android:scheme="http"
                 tools:ignore="AppLinkUrlError">
                 <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>
@@ -74,6 +77,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
                 <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>
@@ -92,14 +96,14 @@
         <provider
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
-            android:multiprocess="true"
+            android:exported="false"
-            android:exported="false" />
+            android:multiprocess="true" />
 
 
         <receiver
             android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2"
+            android:exported="true"
-            android:exported="true">
+            android:label="@string/app_widget2x2">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -111,11 +115,27 @@
                 android:resource="@xml/widget_2x_info" />
         </receiver>
 
+        <!--新增3x3大小窗口小部件-->
+        <receiver
+            android:name=".widget.NoteWidgetProvider_3x"
+            android:exported="true"
+            android:label="@string/app_widget3x3">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_3x_info" />
+        </receiver>
+
 
         <receiver
             android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4"
+            android:exported="true"
-            android:exported="true">
+            android:label="@string/app_widget4x4">
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -129,7 +149,8 @@
         </receiver>
 
 
-        <receiver android:name=".ui.AlarmInitReceiver"
+        <receiver
+            android:name=".ui.AlarmInitReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -138,26 +159,22 @@
 
         <receiver
             android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
+            android:process=":remote"></receiver>
-        </receiver>
 
         <activity
             android:name=".ui.AlarmAlertActivity"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"></activity>
-        </activity>
 
         <activity
             android:name="net.micode.notes.ui.NotesPreferenceActivity"
             android:label="@string/preferences_title"
             android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
+            android:theme="@android:style/Theme.Holo.Light"></activity>
-        </activity>
 
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
+            android:exported="false"></service>
-        </service>
 
         <meta-data
             android:name="android.app.default_searchable"

src/Notes/app/src/main/java/net/micode/notes/tool/ResourceParser.java

@@ -141,6 +141,20 @@ public class ResourceParser {
             return BG_2X_RESOURCES[id];
         }
 //通过ID获取较小的图片
+        private final static int [] BG_3X_RESOURCES = new int [] {//通过id获得3x的小窗口背景资源
+            R.drawable.widget_2x_yellow,
+            R.drawable.widget_2x_blue,
+            R.drawable.widget_2x_white,
+            R.drawable.widget_2x_green,
+            R.drawable.widget_2x_red,
+        };
+
+        public static int getWidget3xBgResource(int id) {
+            return BG_3X_RESOURCES[id];
+        }
+//通过ID获取较小的图片
+
+
         private final static int [] BG_4X_RESOURCES = new int [] {
             R.drawable.widget_4x_yellow,
             R.drawable.widget_4x_blue,

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

@@ -63,6 +63,7 @@ import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
 import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_3x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.util.HashMap;
@@ -86,6 +87,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 //    HeadViewHolder类定义了一组视图，用于在列表或网格中显示信息。这些视图包括一个TextView用于显示修改信息，一个ImageView用于显示警报图标，另一个TextView用于显示警报日期，还有一个ImageView用于选择背景颜色。
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
         sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
@@ -95,6 +97,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
         sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
@@ -105,6 +108,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 //    sBgSelectorBtnsMap是一个HashMap，将用于选择背景颜色的ImageView视图的资源ID映射到整数值，这些整数值在ResourceParser类中定义。同样，sBgSelectorSelectionMap将整数值映射到所选ImageView视图的资源ID。
 
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
         sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
@@ -113,6 +117,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
+
     static {
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
@@ -328,7 +333,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             // 如果mWorkingNote没有闹钟提醒，则将标题栏中的提醒日期文本和提醒图标设置为不可见。
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
-        };
+        }
+        ;
     }
 
     @Override
@@ -407,7 +413,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         for (int id : sFontSizeBtnsMap.keySet()) {
             View view = findViewById(id);
             view.setOnClickListener(this);
-        };
+        }
+        ;
         mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
         /*
@@ -434,10 +441,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
             intent.setClass(this, NoteWidgetProvider_2x.class);
+        } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_3X) {
+            intent.setClass(this, NoteWidgetProvider_3x.class);
         } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
             intent.setClass(this, NoteWidgetProvider_4x.class);
         } else {
-            Log.e(TAG, "Unspported widget type");
+            Log.e(TAG, "Unsupported widget type");
             return;
         }
 
@@ -450,7 +459,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }//updateWidget()方法更新与当前笔记相关联的小部件。它创建一个意图，并根据笔记的小部件类型设置相应的小部件提供程序类。然后它发送一个广播，带有小部件ID以更新小部件。
 
 
-
     public void onClick(View v) {
         int id = v.getId();
         if (id == R.id.btn_set_bg_color) {

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

@@ -70,6 +70,7 @@ import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_3x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
 import java.io.BufferedReader;
@@ -93,7 +94,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private enum ListEditState {
         NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
-    };
+    }
+
+    ;
 
     private ListEditState mState;
 
@@ -411,7 +414,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return false;
         }
 
-    };
+    }
+
+    ;
 
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
@@ -722,10 +727,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (appWidgetType == Notes.TYPE_WIDGET_2X) {
             intent.setClass(this, NoteWidgetProvider_2x.class);
+        } else if (appWidgetType == Notes.TYPE_WIDGET_3X) {
+            intent.setClass(this, NoteWidgetProvider_3x.class);
         } else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
             intent.setClass(this, NoteWidgetProvider_4x.class);
         } else {
-            Log.e(TAG, "Unspported widget type");
+            Log.e(TAG, "Unsupported widget type");
             return;
         }
 

src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_3x.java

@@ -21,7 +21,7 @@ public class NoteWidgetProvider_3x extends NoteWidgetProvider{ // 3x3大小的
 
     @Override // 重写窗口小部件中的获取资源ID函数
     protected int getBgResourceId(int bgId) {
-        return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
+        return ResourceParser.WidgetBgResources.getWidget3xBgResource(bgId);
     }
 
     @Override // 重写窗口小部件中的获取宽度类型函数

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

@@ -19,6 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget3x3">便签3x3</string>
     <string name="app_widget4x4">便签4x4</string>
     <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
     <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>

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

@@ -19,6 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便簽</string>
     <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget3x3">便簽3x3</string>
     <string name="app_widget4x4">便簽4x4</string>
     <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
     <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>

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

@@ -19,6 +19,7 @@
     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_widget3x3" translatable="false">Notes 3x3</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
     <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>

src/Notes/app/src/main/res/xml/widget_3x_info.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget_3x"
+    android:minWidth="220dip"
+    android:minHeight="220dip">
+</appwidget-provider>