Compare commits
	
		
			7 Commits 
		
	
	
		
			master
			...
			fxy_branch
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  | 8a1197d22d | 5 months ago | 
|  | 103e3ed27c | 5 months ago | 
|  | c5e7f9b340 | 5 months ago | 
|  | d26d32c872 | 6 months ago | 
|  | 6e6f27160c | 6 months ago | 
|  | 167eca197e | 6 months ago | 
|  | d0f9bc2dd9 | 6 months ago | 
| @ -1,3 +1,3 @@ | |||||||
| # 默认忽略的文件 | # 默认忽略的文件 | ||||||
| /shelf/ | /shelf/ | ||||||
| /workspace.xml | /workspace.xml | ||||||
| @ -0,0 +1 @@ | |||||||
|  | My Application | ||||||
| @ -1,6 +1,6 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="CompilerConfiguration"> |   <component name="CompilerConfiguration"> | ||||||
|     <bytecodeTargetLevel target="21" /> |     <bytecodeTargetLevel target="21" /> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -0,0 +1,10 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  | <project version="4"> | ||||||
|  |   <component name="deploymentTargetSelector"> | ||||||
|  |     <selectionStates> | ||||||
|  |       <SelectionState runConfigName="app"> | ||||||
|  |         <option name="selectionMode" value="DROPDOWN" /> | ||||||
|  |       </SelectionState> | ||||||
|  |     </selectionStates> | ||||||
|  |   </component> | ||||||
|  | </project> | ||||||
| @ -1,20 +1,20 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="GradleMigrationSettings" migrationVersion="1" /> |   <component name="GradleMigrationSettings" migrationVersion="1" /> | ||||||
|   <component name="GradleSettings"> |   <component name="GradleSettings"> | ||||||
|     <option name="linkedExternalProjectsSettings"> |     <option name="linkedExternalProjectsSettings"> | ||||||
|       <GradleProjectSettings> |       <GradleProjectSettings> | ||||||
|         <option name="testRunner" value="CHOOSE_PER_TEST" /> |         <option name="testRunner" value="CHOOSE_PER_TEST" /> | ||||||
|         <option name="externalProjectPath" value="$PROJECT_DIR$" /> |         <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||||||
|         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> |         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> | ||||||
|         <option name="modules"> |         <option name="modules"> | ||||||
|           <set> |           <set> | ||||||
|             <option value="$PROJECT_DIR$" /> |             <option value="$PROJECT_DIR$" /> | ||||||
|             <option value="$PROJECT_DIR$/app" /> |             <option value="$PROJECT_DIR$/app" /> | ||||||
|           </set> |           </set> | ||||||
|         </option> |         </option> | ||||||
|         <option name="resolveExternalAnnotations" value="false" /> |         <option name="resolveExternalAnnotations" value="false" /> | ||||||
|       </GradleProjectSettings> |       </GradleProjectSettings> | ||||||
|     </option> |     </option> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -1,10 +1,10 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="ProjectMigrations"> |   <component name="ProjectMigrations"> | ||||||
|     <option name="MigrateToGradleLocalJavaHome"> |     <option name="MigrateToGradleLocalJavaHome"> | ||||||
|       <set> |       <set> | ||||||
|         <option value="$PROJECT_DIR$" /> |         <option value="$PROJECT_DIR$" /> | ||||||
|       </set> |       </set> | ||||||
|     </option> |     </option> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -0,0 +1,9 @@ | |||||||
|  | <project version="4"> | ||||||
|  |   <component name="ExternalStorageConfigurationManager" enabled="true" /> | ||||||
|  |   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK"> | ||||||
|  |     <output url="file://$PROJECT_DIR$/build/classes" /> | ||||||
|  |   </component> | ||||||
|  |   <component name="ProjectType"> | ||||||
|  |     <option name="id" value="Android" /> | ||||||
|  |   </component> | ||||||
|  | </project> | ||||||
| @ -1,13 +1,13 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="RunConfigurationProducerService"> |   <component name="RunConfigurationProducerService"> | ||||||
|     <option name="ignoredProducers"> |     <option name="ignoredProducers"> | ||||||
|       <set> |       <set> | ||||||
|         <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" /> |         <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" /> | ||||||
|         <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" /> |         <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" /> | ||||||
|         <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" /> |         <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" /> | ||||||
|         <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" /> |         <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" /> | ||||||
|       </set> |       </set> | ||||||
|     </option> |     </option> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -1,156 +1,156 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|     xmlns:tools="http://schemas.android.com/tools"> |     xmlns:tools="http://schemas.android.com/tools"> | ||||||
| 
 | 
 | ||||||
|     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> |     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | ||||||
|     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> |     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> | ||||||
|     <uses-permission android:name="android.permission.INTERNET" /> |     <uses-permission android:name="android.permission.INTERNET" /> | ||||||
|     <uses-permission android:name="android.permission.READ_CONTACTS" /> |     <uses-permission android:name="android.permission.READ_CONTACTS" /> | ||||||
|     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> |     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> | ||||||
|     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> |     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> | ||||||
|     <uses-permission android:name="android.permission.GET_ACCOUNTS" /> |     <uses-permission android:name="android.permission.GET_ACCOUNTS" /> | ||||||
|     <uses-permission android:name="android.permission.USE_CREDENTIALS" /> |     <uses-permission android:name="android.permission.USE_CREDENTIALS" /> | ||||||
|     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> |     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> | ||||||
| 
 | 
 | ||||||
|     <application |     <application | ||||||
|         android:allowBackup="true" |         android:allowBackup="true" | ||||||
|         android:dataExtractionRules="@xml/data_extraction_rules" |         android:dataExtractionRules="@xml/data_extraction_rules" | ||||||
|         android:fullBackupContent="@xml/backup_rules" |         android:fullBackupContent="@xml/backup_rules" | ||||||
|         android:icon="@mipmap/ic_launcher" |         android:icon="@mipmap/ic_launcher" | ||||||
|         android:label="@string/app_name" |         android:label="@string/app_name" | ||||||
|         android:roundIcon="@mipmap/ic_launcher_round" |         android:roundIcon="@mipmap/ic_launcher_round" | ||||||
|         android:supportsRtl="true" |         android:supportsRtl="true" | ||||||
|         android:theme="@style/Theme.MyApplication" |         android:theme="@style/Theme.MyApplication" | ||||||
|         tools:targetApi="31"> |         tools:targetApi="31"> | ||||||
| 
 | 
 | ||||||
|         <activity |         <activity | ||||||
|             android:name=".ui.NotesListActivity" |             android:name=".ui.NotesListActivity" | ||||||
|             android:configChanges="keyboardHidden|orientation|screenSize" |             android:configChanges="keyboardHidden|orientation|screenSize" | ||||||
|             android:label="@string/app_name" |             android:label="@string/app_name" | ||||||
|             android:launchMode="singleTop" |             android:launchMode="singleTop" | ||||||
|             android:theme="@style/NoteTheme" |             android:theme="@style/NoteTheme" | ||||||
|             android:uiOptions="splitActionBarWhenNarrow" |             android:uiOptions="splitActionBarWhenNarrow" | ||||||
|             android:windowSoftInputMode="adjustPan" |             android:windowSoftInputMode="adjustPan" | ||||||
|             android:exported="true"> |             android:exported="true"> | ||||||
| 
 | 
 | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.intent.action.MAIN" /> |                 <action android:name="android.intent.action.MAIN" /> | ||||||
|                 <category android:name="android.intent.category.LAUNCHER" /> |                 <category android:name="android.intent.category.LAUNCHER" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
|         </activity> |         </activity> | ||||||
| 
 | 
 | ||||||
|         <activity |         <activity | ||||||
|             android:name=".ui.NoteEditActivity" |             android:name=".ui.NoteEditActivity" | ||||||
|             android:configChanges="keyboardHidden|orientation|screenSize" |             android:configChanges="keyboardHidden|orientation|screenSize" | ||||||
|             android:launchMode="singleTop" |             android:launchMode="singleTop" | ||||||
|             android:theme="@style/NoteTheme" |             android:theme="@style/NoteTheme" | ||||||
|             android:exported="true"> |             android:exported="true"> | ||||||
| 
 | 
 | ||||||
|             <intent-filter tools:ignore="AppLinkUrlError"> |             <intent-filter tools:ignore="AppLinkUrlError"> | ||||||
|                 <action android:name="android.intent.action.VIEW" /> |                 <action android:name="android.intent.action.VIEW" /> | ||||||
|                 <category android:name="android.intent.category.DEFAULT" /> |                 <category android:name="android.intent.category.DEFAULT" /> | ||||||
|                 <data android:mimeType="vnd.android.cursor.item/text_note" /> |                 <data android:mimeType="vnd.android.cursor.item/text_note" /> | ||||||
|                 <data android:mimeType="vnd.android.cursor.item/call_note" /> |                 <data android:mimeType="vnd.android.cursor.item/call_note" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
| 
 | 
 | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.intent.action.INSERT_OR_EDIT" /> |                 <action android:name="android.intent.action.INSERT_OR_EDIT" /> | ||||||
|                 <category android:name="android.intent.category.DEFAULT" /> |                 <category android:name="android.intent.category.DEFAULT" /> | ||||||
|                 <data android:mimeType="vnd.android.cursor.item/text_note" /> |                 <data android:mimeType="vnd.android.cursor.item/text_note" /> | ||||||
|                 <data android:mimeType="vnd.android.cursor.item/call_note" /> |                 <data android:mimeType="vnd.android.cursor.item/call_note" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
| 
 | 
 | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.intent.action.SEARCH" /> |                 <action android:name="android.intent.action.SEARCH" /> | ||||||
|                 <category android:name="android.intent.category.DEFAULT" /> |                 <category android:name="android.intent.category.DEFAULT" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
| 
 | 
 | ||||||
|             <meta-data |             <meta-data | ||||||
|                 android:name="android.app.searchable" |                 android:name="android.app.searchable" | ||||||
|                 android:resource="@xml/searchable" /> |                 android:resource="@xml/searchable" /> | ||||||
|         </activity> |         </activity> | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         <provider |         <provider | ||||||
|             android:name="net.micode.notes.data.NotesProvider" |             android:name="net.micode.notes.data.NotesProvider" | ||||||
|             android:authorities="micode_notes" |             android:authorities="micode_notes" | ||||||
|             android:multiprocess="true" /> |             android:multiprocess="true" /> | ||||||
| 
 | 
 | ||||||
|         <receiver |         <receiver | ||||||
|             android:name=".widget.NoteWidgetProvider_2x" |             android:name=".widget.NoteWidgetProvider_2x" | ||||||
|             android:label="@string/app_widget2x2" |             android:label="@string/app_widget2x2" | ||||||
|             android:exported="true"> |             android:exported="true"> | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> |                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> | ||||||
|                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> |                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> | ||||||
|                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> |                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
| 
 | 
 | ||||||
|             <meta-data |             <meta-data | ||||||
|                 android:name="android.appwidget.provider" |                 android:name="android.appwidget.provider" | ||||||
|                 android:resource="@xml/widget_2x_info" /> |                 android:resource="@xml/widget_2x_info" /> | ||||||
|         </receiver> |         </receiver> | ||||||
|         <receiver |         <receiver | ||||||
|             android:name=".widget.NoteWidgetProvider_4x" |             android:name=".widget.NoteWidgetProvider_4x" | ||||||
|             android:label="@string/app_widget4x4" |             android:label="@string/app_widget4x4" | ||||||
|             android:exported="true"> |             android:exported="true"> | ||||||
| 
 | 
 | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> |                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> | ||||||
|                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> |                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> | ||||||
|                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> |                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
| 
 | 
 | ||||||
|             <meta-data |             <meta-data | ||||||
|                 android:name="android.appwidget.provider" |                 android:name="android.appwidget.provider" | ||||||
|                 android:resource="@xml/widget_4x_info" /> |                 android:resource="@xml/widget_4x_info" /> | ||||||
|         </receiver> |         </receiver> | ||||||
| 
 | 
 | ||||||
|         <receiver android:name=".ui.AlarmInitReceiver" |         <receiver android:name=".ui.AlarmInitReceiver" | ||||||
|             android:exported="true"> |             android:exported="true"> | ||||||
|             <intent-filter> |             <intent-filter> | ||||||
|                 <action android:name="android.intent.action.BOOT_COMPLETED" /> |                 <action android:name="android.intent.action.BOOT_COMPLETED" /> | ||||||
|             </intent-filter> |             </intent-filter> | ||||||
|         </receiver> |         </receiver> | ||||||
| 
 | 
 | ||||||
|         <receiver |         <receiver | ||||||
|             android:name="net.micode.notes.ui.AlarmReceiver" |             android:name="net.micode.notes.ui.AlarmReceiver" | ||||||
|             android:process=":remote" > |             android:process=":remote" > | ||||||
|         </receiver> |         </receiver> | ||||||
| 
 | 
 | ||||||
|         <activity |         <activity | ||||||
|             android:name=".ui.AlarmAlertActivity" |             android:name=".ui.AlarmAlertActivity" | ||||||
|             android:label="@string/app_name" |             android:label="@string/app_name" | ||||||
|             android:launchMode="singleInstance" |             android:launchMode="singleInstance" | ||||||
|             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > |             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > | ||||||
|         </activity> |         </activity> | ||||||
| 
 | 
 | ||||||
|         <activity |         <activity | ||||||
|             android:name="net.micode.notes.ui.NotesPreferenceActivity" |             android:name="net.micode.notes.ui.NotesPreferenceActivity" | ||||||
|             android:label="@string/preferences_title" |             android:label="@string/preferences_title" | ||||||
|             android:launchMode="singleTop" |             android:launchMode="singleTop" | ||||||
|             android:theme="@android:style/Theme.Holo.Light" > |             android:theme="@android:style/Theme.Holo.Light" > | ||||||
|         </activity> |         </activity> | ||||||
| 
 | 
 | ||||||
|         <service |         <service | ||||||
|             android:name="net.micode.notes.gtask.remote.GTaskSyncService" |             android:name="net.micode.notes.gtask.remote.GTaskSyncService" | ||||||
|             android:exported="false" > |             android:exported="false" > | ||||||
|         </service> |         </service> | ||||||
| 
 | 
 | ||||||
|         <meta-data |         <meta-data | ||||||
|             android:name="android.app.default_searchable" |             android:name="android.app.default_searchable" | ||||||
|             android:value=".ui.NoteEditActivity" /> |             android:value=".ui.NoteEditActivity" /> | ||||||
| 
 | 
 | ||||||
|         <!--        <activity--> |         <!--        <activity--> | ||||||
|         <!--            android:name=".MainActivity"--> |         <!--            android:name=".MainActivity"--> | ||||||
|         <!--            android:exported="true">--> |         <!--            android:exported="true">--> | ||||||
|         <!--            <intent-filter>--> |         <!--            <intent-filter>--> | ||||||
|         <!--                <action android:name="android.intent.action.MAIN" />--> |         <!--                <action android:name="android.intent.action.MAIN" />--> | ||||||
| 
 | 
 | ||||||
|         <!--                <category android:name="android.intent.category.LAUNCHER" />--> |         <!--                <category android:name="android.intent.category.LAUNCHER" />--> | ||||||
|         <!--            </intent-filter>--> |         <!--            </intent-filter>--> | ||||||
|         <!--        </activity>--> |         <!--        </activity>--> | ||||||
| 
 | 
 | ||||||
|     </application> |     </application> | ||||||
| 
 | 
 | ||||||
| </manifest> | </manifest> | ||||||
| Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB | 
| Before Width: | Height: | Size: 245 B After Width: | Height: | Size: 245 B | 
| Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB | 
| Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB | 
| Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB | 
| Before Width: | Height: | Size: 443 B After Width: | Height: | Size: 443 B | 
| Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB | 
| Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB | 
| Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB | 
| Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB | 
| Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB | 
| Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB | 
| Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB | 
| Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB | 
| Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB | 
| Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB | 
| Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB | 
| Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB | 
| Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB | 
| Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB | 
| Before Width: | Height: | Size: 554 KiB After Width: | Height: | Size: 554 KiB | 
| Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB | 
| Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB | 
| Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB | 
| Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB | 
| Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB | 
| Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB | 
| Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB | 
| Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB | 
| Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |