解决合并冲突，完成 sy 分支合并

.idea/.name

@@ -1 +0,0 @@
-Notes-master

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/gradle.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
@@ -13,6 +11,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,44 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectInspectionProfilesVisibleTreeState">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id>Android Lint: Security</id>
-          </State>
-          <State>
-            <id>Android Lint: Usability</id>
-          </State>
-          <State>
-            <id>CodePlugin DevKit</id>
-          </State>
-          <State>
-            <id>JUnit</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Plugin DevKit</id>
-          </State>
-          <State>
-            <id>Probable bugsJava</id>
-          </State>
-          <State>
-            <id>Verbose or redundant code constructsJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>User defined</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <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">

.idea/runConfigurations.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
-</project>

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

NOTICE

@@ -1,190 +0,0 @@
-
-   Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-

README

@@ -1,23 +0,0 @@
-[中文]
-
-1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议，
-   今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。
-
-2. Bug反馈和跟踪，请访问Github,
-   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. 功能建议和综合讨论，请访问MiCode,
-   http://micode.net/forum.php?mod=forumdisplay&fid=38
-
-
-[English]
-
-1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com).
-   It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future,
-   the MiCode community will release and maintain this project.
-
-2. Regarding issue tracking, please visit Github,
-   https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open
-
-3. Regarding feature request and general discussion, please visit Micode forum,
-   http://micode.net/forum.php?mod=forumdisplay&fid=38

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle.kts

@@ -0,0 +1,73 @@
+plugins {
+    alias(libs.plugins.android.application)
+}
+
+android {
+    namespace = "net.micode.notes"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "net.micode.notes"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    flavorDimensions += "device"
+    productFlavors {
+        create("phone") {
+            dimension = "device"
+            applicationIdSuffix = ".phone"
+            versionNameSuffix = "-phone"
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            excludes += "META-INF/DEPENDENCIES"
+            excludes += "META-INF/LICENSE"
+            excludes += "META-INF/LICENSE.txt"
+            excludes += "META-INF/license.txt"
+            excludes += "META-INF/NOTICE"
+            excludes += "META-INF/NOTICE.txt"
+            excludes += "META-INF/notice.txt"
+            excludes += "META-INF/ASL2.0"
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.appcompat)
+    implementation(libs.material)
+    implementation(libs.activity)
+    implementation(libs.constraintlayout)
+    
+    // OkHttp dependencies
+    implementation("com.squareup.okhttp3:okhttp:3.14.9") {
+        exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
+        exclude(group = "org.bouncycastle", module = "bcpkix-jdk15on")
+    }
+    implementation("com.squareup.okio:okio:1.17.5")
+    
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.espresso.core)
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package net.micode.notes;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("net.micode.notes", appContext.getPackageName());
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,156 +1,155 @@
-<?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.Notesmaster"
+        android:theme="@style/Theme.Notes"
-        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 >
+            <intent-filter>
-                <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>

app/src/main/java/net/micode/notes/MainActivity.java

@@ -0,0 +1,24 @@
+package net.micode.notes;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EdgeToEdge.enable(this);
+        setContentView(R.layout.activity_main);
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
+            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
+            return insets;
+        });
+    }
+}

app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
  *
@@ -64,22 +63,26 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
     }
 
     private void showNotification(int tickerId, String content) {
-        Notification notification = new Notification(R.drawable.notification, mContext
+        Notification.Builder builder = new Notification.Builder(mContext)
-                .getString(tickerId), System.currentTimeMillis());
+                .setSmallIcon(R.drawable.notification)
-        notification.defaults = Notification.DEFAULT_LIGHTS;
+                .setTicker(mContext.getString(tickerId))
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
+                .setWhen(System.currentTimeMillis())
+                .setDefaults(Notification.DEFAULT_LIGHTS)
+                .setAutoCancel(true)
+                .setContentTitle(mContext.getString(R.string.app_name))
+                .setContentText(content);
+
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesPreferenceActivity.class), 0);
+                    NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
-
         } else {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesListActivity.class), 0);
+                    NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
         }
-        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+        builder.setContentIntent(pendingIntent);
-                pendingIntent);
+        
-        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, builder.build());
     }
 
     @Override

app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java

@@ -32,20 +32,6 @@ import net.micode.notes.gtask.exception.NetworkFailureException;
 import net.micode.notes.tool.GTaskStringUtils;
 import net.micode.notes.ui.NotesPreferenceActivity;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -54,12 +40,25 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Cookie;
+import okhttp3.CookieJar;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class GTaskClient {
     private static final String TAG = GTaskClient.class.getSimpleName();
@@ -72,7 +71,7 @@ public class GTaskClient {
 
     private static GTaskClient mInstance = null;
 
-    private DefaultHttpClient mHttpClient;
+    private OkHttpClient mHttpClient;
 
     private String mGetUrl;
 
@@ -91,7 +90,23 @@ public class GTaskClient {
     private JSONArray mUpdateArray;
 
     private GTaskClient() {
-        mHttpClient = null;
+        mHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .readTimeout(15, TimeUnit.SECONDS)
+                .cookieJar(new CookieJar() {
+                    private final List<Cookie> cookies = new ArrayList<>();
+
+                    @Override
+                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                        this.cookies.addAll(cookies);
+                    }
+
+                    @Override
+                    public List<Cookie> loadForRequest(HttpUrl url) {
+                        return cookies;
+                    }
+                })
+                .build();
         mGetUrl = GTASK_GET_URL;
         mPostUrl = GTASK_POST_URL;
         mClientVersion = -1;
@@ -228,26 +243,23 @@ public class GTaskClient {
     private boolean loginGtask(String authToken) {
         int timeoutConnection = 10000;
         int timeoutSocket = 15000;
-        HttpParams httpParameters = new BasicHttpParams();
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
-        HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
+        builder.connectTimeout(timeoutConnection, TimeUnit.MILLISECONDS);
-        HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
+        builder.readTimeout(timeoutSocket, TimeUnit.MILLISECONDS);
-        mHttpClient = new DefaultHttpClient(httpParameters);
+        mHttpClient = builder.build();
-        BasicCookieStore localBasicCookieStore = new BasicCookieStore();
-        mHttpClient.setCookieStore(localBasicCookieStore);
-        HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
 
         // login gtask
         try {
-            String loginUrl = mGetUrl + "?auth=" + authToken;
+            Request request = new Request.Builder()
-            HttpGet httpGet = new HttpGet(loginUrl);
+                    .url(mGetUrl + "?auth=" + authToken)
-            HttpResponse response = null;
+                    .build();
-            response = mHttpClient.execute(httpGet);
+            Response response = mHttpClient.newCall(request).execute();
 
             // get the cookie now
-            List<Cookie> cookies = mHttpClient.getCookieStore().getCookies();
+            List<Cookie> cookies = mHttpClient.cookieJar().loadForRequest(request.url());
             boolean hasAuthCookie = false;
             for (Cookie cookie : cookies) {
-                if (cookie.getName().contains("GTL")) {
+                if (cookie.name().contains("GTL")) {
                     hasAuthCookie = true;
                 }
             }
@@ -256,7 +268,7 @@ public class GTaskClient {
             }
 
             // get the client version
-            String resString = getResponseContent(response.getEntity());
+            String resString = getResponseContent(response.body().byteStream());
             String jsBegin = "_setup(";
             String jsEnd = ")}</script>";
             int begin = resString.indexOf(jsBegin);
@@ -284,26 +296,27 @@ public class GTaskClient {
         return mActionId++;
     }
 
-    private HttpPost createHttpPost() {
+    private Request createRequest() {
-        HttpPost httpPost = new HttpPost(mPostUrl);
+        Request.Builder builder = new Request.Builder()
-        httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+                .url(mPostUrl)
-        httpPost.setHeader("AT", "1");
+                .addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
-        return httpPost;
+                .addHeader("AT", "1");
+        return builder.build();
     }
 
-    private String getResponseContent(HttpEntity entity) throws IOException {
+    private String getResponseContent(InputStream inputStream) throws IOException {
         String contentEncoding = null;
-        if (entity.getContentEncoding() != null) {
+        if (inputStream != null) {
-            contentEncoding = entity.getContentEncoding().getValue();
+            contentEncoding = inputStream.toString();
             Log.d(TAG, "encoding: " + contentEncoding);
         }
 
-        InputStream input = entity.getContent();
+        InputStream input = inputStream;
         if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
-            input = new GZIPInputStream(entity.getContent());
+            input = new GZIPInputStream(inputStream);
         } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
             Inflater inflater = new Inflater(true);
-            input = new InflaterInputStream(entity.getContent(), inflater);
+            input = new InflaterInputStream(inputStream, inflater);
         }
 
         try {
@@ -329,22 +342,18 @@ public class GTaskClient {
             throw new ActionFailureException("not logged in");
         }
 
-        HttpPost httpPost = createHttpPost();
+        Request request = createRequest();
+        RequestBody body = new FormBody.Builder()
+                .add("r", js.toString())
+                .build();
+        Request postRequest = request.newBuilder()
+                .post(body)
+                .build();
+
         try {
-            LinkedList<BasicNameValuePair> list = new LinkedList<BasicNameValuePair>();
+            Response response = mHttpClient.newCall(postRequest).execute();
-            list.add(new BasicNameValuePair("r", js.toString()));
+            String jsString = getResponseContent(response.body().byteStream());
-            UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
-            httpPost.setEntity(entity);
-
-            // execute the post
-            HttpResponse response = mHttpClient.execute(httpPost);
-            String jsString = getResponseContent(response.getEntity());
             return new JSONObject(jsString);
-
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("postRequest failed");
         } catch (IOException e) {
             Log.e(TAG, e.toString());
             e.printStackTrace();
@@ -516,12 +525,13 @@ public class GTaskClient {
         }
 
         try {
-            HttpGet httpGet = new HttpGet(mGetUrl);
+            Request request = new Request.Builder()
-            HttpResponse response = null;
+                    .url(mGetUrl)
-            response = mHttpClient.execute(httpGet);
+                    .build();
+            Response response = mHttpClient.newCall(request).execute();
 
             // get the task list
-            String resString = getResponseContent(response.getEntity());
+            String resString = getResponseContent(response.body().byteStream());
             String jsBegin = "_setup(";
             String jsEnd = ")}</script>";
             int begin = resString.indexOf(jsBegin);
@@ -532,10 +542,6 @@ public class GTaskClient {
             }
             JSONObject js = new JSONObject(jsString);
             return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("gettasklists: httpget failed");
         } catch (IOException e) {
             Log.e(TAG, e.toString());
             e.printStackTrace();

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

@@ -507,50 +507,48 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
+        int id = item.getItemId();
-            case R.id.menu_new_note:
+        if (id == R.id.menu_new_note) {
-                createNewNote();
+            createNewNote();
-                break;
+            return true;
-            case R.id.menu_delete:
+        } else if (id == R.id.menu_delete) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(getString(R.string.alert_title_delete));
+            builder.setTitle(getString(R.string.alert_title_delete));
-                builder.setIcon(android.R.drawable.ic_dialog_alert);
+            builder.setIcon(android.R.drawable.ic_dialog_alert);
-                builder.setMessage(getString(R.string.alert_message_delete_note));
+            builder.setMessage(getString(R.string.alert_message_delete_note));
-                builder.setPositiveButton(android.R.string.ok,
+            builder.setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
+                    new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
+                        public void onClick(DialogInterface dialog, int which) {
-                                deleteCurrentNote();
+                            deleteCurrentNote();
-                                finish();
+                            finish();
-                            }
+                        }
-                        });
+                    });
-                builder.setNegativeButton(android.R.string.cancel, null);
+            builder.setNegativeButton(android.R.string.cancel, null);
-                builder.show();
+            builder.show();
-                break;
+            return true;
-            case R.id.menu_font_size:
+        } else if (id == R.id.menu_font_size) {
-                mFontSizeSelector.setVisibility(View.VISIBLE);
+            mFontSizeSelector.setVisibility(View.VISIBLE);
-                findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+            findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
-                break;
+            return true;
-            case R.id.menu_list_mode:
+        } else if (id == R.id.menu_list_mode) {
-                mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
+            mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
-                        TextNote.MODE_CHECK_LIST : 0);
+                    TextNote.MODE_CHECK_LIST : 0);
-                break;
+            return true;
-            case R.id.menu_share:
+        } else if (id == R.id.menu_share) {
-                getWorkingText();
+            getWorkingText();
-                sendTo(this, mWorkingNote.getContent());
+            sendTo(this, mWorkingNote.getContent());
-                break;
+            return true;
-            case R.id.menu_send_to_desktop:
+        } else if (id == R.id.menu_send_to_desktop) {
-                sendToDesktop();
+            sendToDesktop();
-                break;
+            return true;
-            case R.id.menu_alert:
+        } else if (id == R.id.menu_alert) {
-                setReminder();
+            setReminder();
-                break;
+            return true;
-            case R.id.menu_delete_remind:
+        } else if (id == R.id.menu_delete_remind) {
-                mWorkingNote.setAlertDate(0, false);
+            mWorkingNote.setAlertDate(0, false);
-                break;
+            return true;
-            default:
-                break;
         }
-        return true;
+        return super.onOptionsItemSelected(item);
     }
 
     private void setReminder() {

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

@@ -319,88 +319,68 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 return true;
             }
 
-            switch (item.getItemId()) {
+            int id = item.getItemId();
-                case R.id.delete:
+            if (id == R.id.delete) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+                AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(getString(R.string.alert_title_delete));
+                builder.setTitle(getString(R.string.alert_title_delete));
-                    builder.setIcon(android.R.drawable.ic_dialog_alert);
+                builder.setIcon(android.R.drawable.ic_dialog_alert);
-                    builder.setMessage(getString(R.string.alert_message_delete_notes,
+                builder.setMessage(getString(R.string.alert_message_delete_notes,
-                                             mNotesListAdapter.getSelectedCount()));
+                                         mNotesListAdapter.getSelectedCount()));
-                    builder.setPositiveButton(android.R.string.ok,
+                builder.setPositiveButton(android.R.string.ok,
-                                             new DialogInterface.OnClickListener() {
+                                         new DialogInterface.OnClickListener() {
-                                                 public void onClick(DialogInterface dialog,
+                                             public void onClick(DialogInterface dialog,
-                                                         int which) {
+                                                     int which) {
-                                                     batchDelete();
+                                                 batchDelete();
-                                                 }
+                                             }
-                                             });
+                                         });
-                    builder.setNegativeButton(android.R.string.cancel, null);
+                builder.setNegativeButton(android.R.string.cancel, null);
-                    builder.show();
+                builder.show();
-                    break;
+                return true;
-                case R.id.move:
+            } else if (id == R.id.move) {
-                    startQueryDestinationFolders();
+                startQueryDestinationFolders();
-                    break;
+                return true;
-                default:
-                    return false;
             }
-            return true;
+            return false;
         }
     }
 
     private class NewNoteOnTouchListener implements OnTouchListener {
 
         public boolean onTouch(View v, MotionEvent event) {
-            switch (event.getAction()) {
+            int action = event.getAction();
-                case MotionEvent.ACTION_DOWN: {
+            if (action == MotionEvent.ACTION_DOWN) {
-                    Display display = getWindowManager().getDefaultDisplay();
+                Display display = getWindowManager().getDefaultDisplay();
-                    int screenHeight = display.getHeight();
+                int screenHeight = display.getHeight();
-                    int newNoteViewHeight = mAddNewNote.getHeight();
+                int newNoteViewHeight = mAddNewNote.getHeight();
-                    int start = screenHeight - newNoteViewHeight;
+                int start = screenHeight - newNoteViewHeight;
-                    int eventY = start + (int) event.getY();
+                int eventY = start + (int) event.getY();
-                    /**
+                if (mState == ListEditState.SUB_FOLDER) {
-                     * Minus TitleBar's height
+                    eventY -= mTitleBar.getHeight();
-                     */
+                    start -= mTitleBar.getHeight();
-                    if (mState == ListEditState.SUB_FOLDER) {
-                        eventY -= mTitleBar.getHeight();
-                        start -= mTitleBar.getHeight();
-                    }
-                    /**
-                     * HACKME:When click the transparent part of "New Note" button, dispatch
-                     * the event to the list view behind this button. The transparent part of
-                     * "New Note" button could be expressed by formula y=-0.12x+94（Unit:pixel）
-                     * and the line top of the button. The coordinate based on left of the "New
-                     * Note" button. The 94 represents maximum height of the transparent part.
-                     * Notice that, if the background of the button changes, the formula should
-                     * also change. This is very bad, just for the UI designer's strong requirement.
-                     */
-                    if (event.getY() < (event.getX() * (-0.12) + 94)) {
-                        View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
-                                - mNotesListView.getFooterViewsCount());
-                        if (view != null && view.getBottom() > start
-                                && (view.getTop() < (start + 94))) {
-                            mOriginY = (int) event.getY();
-                            mDispatchY = eventY;
-                            event.setLocation(event.getX(), mDispatchY);
-                            mDispatch = true;
-                            return mNotesListView.dispatchTouchEvent(event);
-                        }
-                    }
-                    break;
                 }
-                case MotionEvent.ACTION_MOVE: {
+                if (event.getY() < (event.getX() * (-0.12) + 94)) {
-                    if (mDispatch) {
+                    View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
-                        mDispatchY += (int) event.getY() - mOriginY;
+                            - mNotesListView.getFooterViewsCount());
+                    if (view != null && view.getBottom() > start
+                            && (view.getTop() < (start + 94))) {
+                        mOriginY = (int) event.getY();
+                        mDispatchY = eventY;
                         event.setLocation(event.getX(), mDispatchY);
+                        mDispatch = true;
                         return mNotesListView.dispatchTouchEvent(event);
                     }
-                    break;
                 }
-                default: {
+            } else if (action == MotionEvent.ACTION_MOVE) {
-                    if (mDispatch) {
+                if (mDispatch) {
-                        event.setLocation(event.getX(), mDispatchY);
+                    mDispatchY += (int) event.getY() - mOriginY;
-                        mDispatch = false;
+                    event.setLocation(event.getX(), mDispatchY);
-                        return mNotesListView.dispatchTouchEvent(event);
+                    return mNotesListView.dispatchTouchEvent(event);
-                    }
+                }
-                    break;
+            } else {
+                if (mDispatch) {
+                    event.setLocation(event.getX(), mDispatchY);
+                    mDispatch = false;
+                    return mNotesListView.dispatchTouchEvent(event);
                 }
             }
             return false;
@@ -558,12 +538,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     public void onClick(View v) {
-        switch (v.getId()) {
+        int id = v.getId();
-            case R.id.btn_new_note:
+        if (id == R.id.btn_new_note) {
-                createNewNote();
+            createNewNote();
-                break;
-            default:
-                break;
         }
     }
 
@@ -780,42 +757,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
+        int id = item.getItemId();
-            case R.id.menu_new_folder: {
+        if (id == R.id.menu_new_folder) {
-                showCreateOrModifyFolderDialog(true);
+            showCreateOrModifyFolderDialog(true);
-                break;
+            return true;
-            }
+        } else if (id == R.id.menu_export_text) {
-            case R.id.menu_export_text: {
+            exportNoteToText();
-                exportNoteToText();
+            return true;
-                break;
+        } else if (id == R.id.menu_sync) {
-            }
+            showSyncDialog();
-            case R.id.menu_sync: {
+            return true;
-                if (isSyncMode()) {
+        } else if (id == R.id.menu_setting) {
-                    if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
+            startPreferenceActivity();
-                        GTaskSyncService.startSync(this);
+            return true;
-                    } else {
+        } else if (id == R.id.menu_new_note) {
-                        GTaskSyncService.cancelSync(this);
+            createNewNote();
-                    }
+            return true;
-                } else {
+        } else if (id == R.id.menu_search) {
-                    startPreferenceActivity();
+            onSearchRequested();
-                }
+            return true;
-                break;
-            }
-            case R.id.menu_setting: {
-                startPreferenceActivity();
-                break;
-            }
-            case R.id.menu_new_note: {
-                createNewNote();
-                break;
-            }
-            case R.id.menu_search:
-                onSearchRequested();
-                break;
-            default:
-                break;
         }
-        return true;
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
@@ -951,4 +913,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         return false;
     }
+
+    private void showSyncDialog() {
+        if (GTaskSyncService.isSyncing()) {
+            GTaskSyncService.cancelSync(this);
+        } else {
+            GTaskSyncService.startSync(this);
+        }
+    }
 }