app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "net.micode.notes"
-        minSdkVersion 14
+        minSdkVersion 19
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 30
     }
@@ -21,13 +21,17 @@ android {
 
     dependencies {
         implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1'
+        implementation group: 'androidx.appcompat', name: 'appcompat', version: '1.6.0'
+        implementation 'com.google.android.material:material:1.7.0'
+        implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+        implementation 'com.android.support:support-annotations:28.0.0'
+        testImplementation 'junit:junit:4.13.2'
+        androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+        androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
     }
 
     packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/*'
     }
 }
+

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
 

app/src/main/java/net/micode/notes/data/Contact.java

@@ -30,8 +30,8 @@ public class Contact {
     private static final String TAG = "Contact";
 
     private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
-    + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
-    + " AND " + Data.RAW_CONTACT_ID + " IN "
+            + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+            + " AND " + Data.RAW_CONTACT_ID + " IN "
             + "(SELECT raw_contact_id "
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";

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

@@ -42,29 +42,18 @@ import org.apache.hc.client5.http.cookie.CookieStore;
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.hc.core5.net.URIBuilder;
 import org.apache.hc.core5.util.Timeout;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
 
 
 public class GTaskClient {
@@ -149,8 +138,8 @@ public class GTaskClient {
             int index = mAccount.name.indexOf('@') + 1;
             String suffix = mAccount.name.substring(index);
             url.append(suffix + "/");
-            mGetUrl = url.toString() + "ig";
-            mPostUrl = url.toString() + "r/ig";
+            mGetUrl = url + "ig";
+            mPostUrl = url + "r/ig";
 
             if (tryToLoginGtask(activity, authToken)) {
                 mLoggedin = true;

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

@@ -42,7 +42,7 @@ public class GTaskSyncService extends Service {
 
     private static String mSyncProgress = "";
 
-    private void startSync() {
+    private synchronized void startSync() {
         if (mSyncTask == null) {
             mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
                 public void onComplete() {

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

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

app/src/main/java/net/micode/notes/tool/BackupUtils.java

@@ -168,7 +168,7 @@ public class BackupUtils {
         private void exportNoteToText(String noteId, PrintStream ps) {
             Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
                     DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
-                        noteId
+                            noteId
                     }, null);
 
             if (dataCursor != null) {
@@ -215,6 +215,7 @@ public class BackupUtils {
             }
         }
 
+
         /**
          * Note will be exported as text which is user readable
          */
@@ -290,23 +291,19 @@ public class BackupUtils {
                     R.string.file_name_txt_format);
             if (file == null) {
                 Log.e(TAG, "create file to exported failed");
-                return null;
-            }
+                return null;    }
             mFileName = file.getName();
             mFileDirectory = mContext.getString(R.string.file_path);
             PrintStream ps = null;
             try {
                 FileOutputStream fos = new FileOutputStream(file);
                 ps = new PrintStream(fos);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                return null;
-            } catch (NullPointerException e) {
+            } catch (FileNotFoundException | NullPointerException e) {
                 e.printStackTrace();
-                return null;
-            }
+                return null;    }
             return ps;
         }
+
     }
 
     /**

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

@@ -27,14 +27,18 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
+import android.text.style.ImageSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -149,10 +153,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private String mUserQuery;
     private Pattern mPattern;
 
+    private static final int PHOTO_REQUEST = 2;// 从相册中选择
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.note_edit);
+//        setContentView(R.layout.activity_main);
 
         if (savedInstanceState == null && !initActivityState(getIntent())) {
             finish();
@@ -430,7 +437,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+                    View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -505,6 +512,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return true;
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -870,4 +878,49 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
+
+
+    //路径字符串格式 转换为 图片image格式
+    private void convertToImage() {
+        NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
+        Editable editable = noteEditText.getText();//1.获取text
+        String noteText = editable.toString(); //2.将note内容转换为字符串
+        int length = editable.length(); //内容的长度
+        //3.截取img片段 [local]+uri+[local]，提取uri
+        for(int i = 0; i < length; i++) {
+            for(int j = i; j < length; j++) {
+                String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段
+                if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
+                    int limit = 7;  //[local]为7个字符
+                    //[local][/local]共15个字符，剩下的为真正的path长度
+                    int len = img_fragment.length()-15;
+                    //从[local]之后的len个字符就是path
+                    String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
+                    Bitmap bitmap = null;
+                    Log.d(TAG, "图片的路径是："+path);
+                    try {
+                        bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if(bitmap!=null){  //若图片存在
+                        Log.d(TAG, "图片不为null");
+                        ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+                        //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
+                        String ss = "[local]" + path + "[/local]";
+                        SpannableString spannableString = new SpannableString(ss);
+                        //5.将指定的标记对象附加到文本的开始...结束范围
+                        spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        Log.d(TAG, "Create spannable string success!");
+                        Editable edit_text = noteEditText.getEditableText();
+                        edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
+                        edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
+                    }
+                }
+            }
+        }
+    }
+
+
+
 }

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

@@ -31,6 +31,7 @@ import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -78,7 +79,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -93,7 +94,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private enum ListEditState {
         NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
-    };
+    }
 
     private ListEditState mState;
 
@@ -198,7 +199,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
             } else {
                 Log.e(TAG, "Save introduction note error");
-                return;
             }
         }
     }

app/src/main/res/color/primary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 

app/src/main/res/color/secondary_text_dark.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 

app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <EditText
+        android:id="@+id/editTextTextPersonName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:ems="10"
+        android:hint="@string/edit_message"
+        android:inputType="textPersonName"
+        app:layout_constraintEnd_toStartOf="@+id/button"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+
+        android:text="@string/button_send"
+        app:layout_constraintBaseline_toBaselineOf="@+id/editTextTextPersonName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/editTextTextPersonName" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fingerprint_dialog.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/ic_fp_40px"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"
+        android:text="请验证指纹解锁"
+        android:textColor="#000"
+        android:textSize="16sp"
+        />
+
+    <TextView
+        android:id="@+id/error_msg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="5dp"
+        android:maxLines="1"
+        android:textSize="12sp"
+        android:textColor="#f45"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="10dp"
+        android:background="#ccc"
+        />
+
+    <TextView
+        android:id="@+id/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:gravity="center"
+        android:text="取消"
+        android:textColor="#5d7883"
+        android:textSize="16sp"
+        />
+
+</LinearLayout>

app/src/main/res/layout/note_edit.xml

@@ -26,10 +26,25 @@
         android:layout_height="fill_parent"
         android:orientation="vertical">
 
+
         <LinearLayout
             android:id="@+id/note_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
+            <ImageButton
+                android:id="@+id/tv_locked"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onChangeLock"
+                android:background="@drawable/lock" />
+            <ImageButton
+                android:id="@+id/tv_unlocked"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onChangeLock"
+                android:background="@drawable/unlock" />
 
             <TextView
                 android:id="@+id/tv_modified_date"
@@ -61,6 +76,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/bg_btn_set_color" />
+
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/note_item.xml

@@ -15,11 +15,12 @@
      limitations under the License.
 -->
 
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/note_item"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    >
+
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -65,8 +66,8 @@
             android:id="@android:id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:focusable="false"
             android:clickable="false"
+            android:focusable="false"
             android:visibility="gone" />
     </LinearLayout>
 
@@ -74,5 +75,5 @@
         android:id="@+id/iv_alert_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|right"/>
+        android:layout_gravity="top|right" />
 </FrameLayout>

app/src/main/res/layout/note_list.xml

@@ -19,7 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/list_background">
+    android:background="#C1F5FFF9"
+    >
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -50,9 +51,12 @@
 
     <Button
         android:id="@+id/btn_new_note"
-        android:background="@drawable/new_note"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_gravity="bottom" />
+        android:layout_width="200px"
+        android:layout_height="200px"
+        android:layout_gravity="bottom|right"
+        android:layout_marginBottom="80px"
+        android:layout_marginRight="80px"
+        android:background="@drawable/add_node"
+        android:focusable="auto"
+        android:visibility="visible" />
 </FrameLayout>

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

@@ -17,6 +17,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="edit_message">编辑信息</string>
+    <string name="button_send">发送</string>
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
@@ -71,10 +73,16 @@
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
     <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="forbidden_move_to_trash">禁止移动到垃圾箱</string>
+    <string name="forbidden_delete_trash">禁止删除垃圾箱</string>
+    <string name="forbidden_add_in_trash">禁止在垃圾箱中新建便签</string>
+    <string name="forbidden_change_trash_name">禁止更改垃圾箱的名字</string>
+    <string name="trash_name">回收站</string>
+    <string name="menu_folder_move_out">恢复文件夹</string>
     <!-- export text -->
     <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
     <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_note_not_exist">禁止在垃圾箱中打开便签</string>
     <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
     <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
     <string name="success_sdcard_export">导出成功</string>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 
@@ -17,6 +17,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="edit_message">編輯信息</string>
+    <string name="button_send">發送</string>
     <string name="app_name">便簽</string>
     <string name="app_widget2x2">便簽2x2</string>
     <string name="app_widget4x4">便簽4x4</string>
@@ -71,6 +73,12 @@
     <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
     <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
     <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="forbidden_move_to_trash">禁止移動到垃圾箱</string>
+    <string name="forbidden_delete_trash">禁止刪除垃圾箱</string>
+    <string name="forbidden_add_in_trash">禁止在垃圾箱中新建便籤</string>
+    <string name="forbidden_change_trash_name">禁止更改垃圾箱名字</string>
+    <string name="menu_folder_move_out">恢復文件夾</string>
+    <string name="trash_name">回收站</string>
     <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
     <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
     <string name="error_note_not_exist">要查看的便籤不存在</string>

app/src/main/res/values/NoteTheme.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light">
+        <item name="colorPrimary">#C1F5FFF9</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="UI.AppTheme" parent="AppTheme.Base">
+    </style>
+</resources>

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

@@ -17,6 +17,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="edit_message">Enter a message</string>
+    <string name="button_send">Send</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -36,10 +38,10 @@
     <string name="note_link_web">Browse web</string>
     <string name="note_link_other">Open map</string>
     <!-- Text export file information -->
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path" translatable="false">/MIUI/notes/</string>
+    <string name="file_name_txt_format" translatable="false">notes_%s.txt</string>
     <!-- notes list string -->
-    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_folder_files_count" translatable="false">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_sync">Sync</string>
@@ -75,10 +77,16 @@
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="forbidden_move_to_trash">Forbidden move to trash folder</string>
+    <string name="forbidden_delete_trash">Forbidden delete trash folder</string>
+    <string name="forbidden_add_in_trash">Forbidden add in trash folder</string>
+    <string name="forbidden_change_trash_name">Forbidden change trash folder name</string>
+    <string name="menu_folder_move_out">Move out folder</string>
+    <string name="trash_name">TRASH</string>
     <!-- Error information -->
     <string name="error_sdcard_unmounted">SD card busy, not available now</string>
     <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_note_not_exist">Forbidden open note in trash</string>
     <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
     <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
     <string name="success_sdcard_export">Export successful</string>
@@ -101,7 +109,7 @@
     <string name="preferences_account_title">Sync account</string>
     <string name="preferences_account_summary">Sync notes with google task</string>
     <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_last_sync_time_format" translatable="false">yyyy-MM-dd hh:mm:ss</string>
     <string name="preferences_add_account">Add account</string>
     <string name="preferences_menu_change_account">Change sync account</string>
     <string name="preferences_menu_remove_account">Remove sync account</string>

build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.1'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true