Merge pull request '分支合并' (#6) from develop into master

2 years ago · c45c740f9b
parent a707363e54 8b89a3d3ad
commit c45c740f9b
62 changed files with 1923 additions and 2 deletions
--- a/111.txt
+++ b/111.txt
@ -1,2 +0,0 @@
-111
-develop1
--- a/doc/软件设计规格说明书.docx
+++ b/doc/软件设计规格说明书.docx
--- a/doc/软件需求规格说明书.docx
+++ b/doc/软件需求规格说明书.docx
--- a/0
+++ b/0
--- a/src/NoteApp281/.gitignore
+++ b/src/NoteApp281/.gitignore
@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
--- a/src/NoteApp281/.idea/.gitignore
+++ b/src/NoteApp281/.idea/.gitignore
@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/src/NoteApp281/.idea/compiler.xml
+++ b/src/NoteApp281/.idea/compiler.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
--- a/src/NoteApp281/.idea/gradle.xml
+++ b/src/NoteApp281/.idea/gradle.xml
@ -0,0 +1,20 @@
+<?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="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/src/NoteApp281/.idea/jarRepositories.xml
+++ b/src/NoteApp281/.idea/jarRepositories.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://maven.aliyun.com/repository/google" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://maven.aliyun.com/repository/jcenter" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
--- a/src/NoteApp281/.idea/misc.xml
+++ b/src/NoteApp281/.idea/misc.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/src/NoteApp281/app/.gitignore
+++ b/src/NoteApp281/app/.gitignore
@ -0,0 +1 @@
+/build
--- a/src/NoteApp281/app/build.gradle
+++ b/src/NoteApp281/app/build.gradle
@ -0,0 +1,39 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        applicationId "com.example.noteapp281"
+        minSdkVersion 19
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+}
--- a/src/NoteApp281/app/proguard-rules.pro
+++ b/src/NoteApp281/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
--- a/src/NoteApp281/app/src/androidTest/java/com/example/noteapp281/ExampleInstrumentedTest.java
+++ b/src/NoteApp281/app/src/androidTest/java/com/example/noteapp281/ExampleInstrumentedTest.java
@ -0,0 +1,26 @@
+package com.example.noteapp281;
+
+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("com.example.noteapp281", appContext.getPackageName());
+    }
+}
--- a/src/NoteApp281/app/src/main/AndroidManifest.xml
+++ b/src/NoteApp281/app/src/main/AndroidManifest.xml
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.noteapp281">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.MyApplicationBase">
+        <activity android:name=".EditActivity"
+            android:label="编辑公告"
+            android:parentActivityName=".MainActivity"
+            ></activity>
+        <activity
+            android:name=".AddActivity"
+            android:label="添加公告"
+            android:parentActivityName=".MainActivity" />
+        <activity
+            android:name=".MainActivity"
+            android:label="公告栏">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/AddActivity.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/AddActivity.java
@ -0,0 +1,61 @@
+package com.example.noteapp281;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+
+import com.example.noteapp281.bean.Note;
+import com.example.noteapp281.util.ToastUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class AddActivity extends AppCompatActivity {
+
+    private EditText etTitle,etContent;
+
+    private NoteDbOpenHelper mNoteDbOpenHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add);
+
+        etTitle = findViewById(R.id.et_title);
+        etContent = findViewById(R.id.et_content);
+        mNoteDbOpenHelper = new NoteDbOpenHelper(this);
+
+    }
+
+    public void add(View view) {
+        String title = etTitle.getText().toString();
+        String content = etContent.getText().toString();
+        if (TextUtils.isEmpty(title)) {
+            ToastUtil.toastShort(this, "标题不能为空！");
+            return;
+        }
+
+        Note note = new Note();
+
+        note.setTitle(title);
+        note.setContent(content);
+        note.setCreatedTime(getCurrentTimeFormat());
+        long row = mNoteDbOpenHelper.insertData(note);
+        if (row != -1) {
+            ToastUtil.toastShort(this,"添加成功！");
+            this.finish();
+        }else {
+            ToastUtil.toastShort(this,"添加失败！");
+        }
+
+    }
+
+    private String getCurrentTimeFormat() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY年MM月dd HH:mm:ss");
+        Date date = new Date();
+        return simpleDateFormat.format(date);
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/EditActivity.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/EditActivity.java
@ -0,0 +1,71 @@
+package com.example.noteapp281;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+
+import com.example.noteapp281.bean.Note;
+import com.example.noteapp281.util.ToastUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class EditActivity extends AppCompatActivity {
+
+    private Note note;
+    private EditText etTitle,etContent;
+
+    private NoteDbOpenHelper mNoteDbOpenHelper;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_edit);
+
+        etTitle = findViewById(R.id.et_title);
+        etContent = findViewById(R.id.et_content);
+
+        initData();
+
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        note = (Note) intent.getSerializableExtra("note");
+        if (note != null) {
+            etTitle.setText(note.getTitle());
+            etContent.setText(note.getContent());
+        }
+        mNoteDbOpenHelper = new NoteDbOpenHelper(this);
+    }
+
+    public void save(View view) {
+        String title = etTitle.getText().toString();
+        String content = etContent.getText().toString();
+        if (TextUtils.isEmpty(title)) {
+            ToastUtil.toastShort(this, "标题不能为空！");
+            return;
+        }
+
+        note.setTitle(title);
+        note.setContent(content);
+        note.setCreatedTime(getCurrentTimeFormat());
+        long rowId = mNoteDbOpenHelper.updateData(note);
+        if (rowId != -1) {
+            ToastUtil.toastShort(this, "修改成功！");
+            this.finish();
+        }else{
+            ToastUtil.toastShort(this, "修改失败！");
+        }
+
+    }
+
+    private String getCurrentTimeFormat() {
+        SimpleDateFormat sdf = new SimpleDateFormat("YYYY年MM月dd日 HH:mm:ss");
+        Date date = new Date();
+        return sdf.format(date);
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/MainActivity.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/MainActivity.java
@ -0,0 +1,191 @@
+package com.example.noteapp281;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.noteapp281.adapter.MyAdapter;
+import com.example.noteapp281.bean.Note;
+import com.example.noteapp281.util.SpfUtil;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MainActivity extends AppCompatActivity {
+
+    private RecyclerView mRecyclerView;
+    private FloatingActionButton mBtnAdd;
+    private List<Note> mNotes;
+    private MyAdapter mMyAdapter;
+
+    private NoteDbOpenHelper mNoteDbOpenHelper;
+
+    public static final int MODE_LINEAR = 0;
+    public static final int MODE_GRID = 1;
+
+    public static final String KEY_LAYOUT_MODE = "key_layout_mode";
+
+    private int currentListLayoutMode = MODE_LINEAR;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        initView();
+        initData();
+        initEvent();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshDataFromDb();
+        setListLayout();
+    }
+
+    private void setListLayout() {
+        currentListLayoutMode = SpfUtil.getIntWithDefault(this, KEY_LAYOUT_MODE, MODE_LINEAR);
+        if (currentListLayoutMode == MODE_LINEAR) {
+            setToLinearList();
+        }else{
+            setToGridList();
+        }
+    }
+
+    private void refreshDataFromDb() {
+        mNotes = getDataFromDB();
+        mMyAdapter.refreshData(mNotes);
+    }
+
+    private void initEvent() {
+        mMyAdapter = new MyAdapter(this, mNotes);
+        mRecyclerView.setAdapter(mMyAdapter);
+//        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+//        mRecyclerView.setLayoutManager(linearLayoutManager);
+//        mMyAdapter.setViewType(MyAdapter.TYPE_LINEAR_LAYOUT);
+        setListLayout();
+
+    }
+
+    private void initData() {
+        mNotes = new ArrayList<>();
+        mNoteDbOpenHelper = new NoteDbOpenHelper(this);
+//
+//        for (int i = 0; i < 30; i++) {
+//            Note note = new Note();
+//            note.setTitle("这是标题"+i);
+//            note.setContent("这是内容"+i);
+//            note.setCreatedTime(getCurrentTimeFormat());
+//            mNotes.add(note);
+//        }
+
+//        mNotes = getDataFromDB();
+
+    }
+
+    private List<Note> getDataFromDB() {
+       return mNoteDbOpenHelper.queryAllFromDb();
+    }
+
+    private String getCurrentTimeFormat() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd HH:mm:ss");
+        Date date = new Date();
+        return simpleDateFormat.format(date);
+    }
+
+    private void initView() {
+        mRecyclerView = findViewById(R.id.rlv);
+    }
+
+
+    public void add(View view) {
+        Intent intent = new Intent(this, AddActivity.class);
+        startActivity(intent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                mNotes = mNoteDbOpenHelper.queryFromDbByTitle(newText);
+                mMyAdapter.refreshData(mNotes);
+                return true;
+            }
+        });
+        return super.onCreateOptionsMenu(menu);
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        item.setChecked(true);
+
+        switch (item.getItemId()) {
+
+            case R.id.menu_linear:
+                setToLinearList();
+                currentListLayoutMode = MODE_LINEAR;
+                SpfUtil.saveInt(this,KEY_LAYOUT_MODE,MODE_LINEAR);
+
+                return true;
+            case R.id.menu_grid:
+
+                setToGridList();
+                currentListLayoutMode = MODE_GRID;
+                SpfUtil.saveInt(this,KEY_LAYOUT_MODE,MODE_GRID);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+
+        }
+    }
+
+    private void setToLinearList() {
+        RecyclerView.LayoutManager linearLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+        mRecyclerView.setLayoutManager(linearLayoutManager);
+        mMyAdapter.setViewType(MyAdapter.TYPE_LINEAR_LAYOUT);
+        mMyAdapter.notifyDataSetChanged();
+    }
+
+
+    private void setToGridList() {
+        RecyclerView.LayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
+        mRecyclerView.setLayoutManager(gridLayoutManager);
+        mMyAdapter.setViewType(MyAdapter.TYPE_GRID_LAYOUT);
+        mMyAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (currentListLayoutMode == MODE_LINEAR) {
+            MenuItem item = menu.findItem(R.id.menu_linear);
+            item.setChecked(true);
+        } else {
+            menu.findItem(R.id.menu_grid).setChecked(true);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/NoteDbOpenHelper.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/NoteDbOpenHelper.java
@ -0,0 +1,130 @@
+package com.example.noteapp281;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.text.TextUtils;
+
+import com.example.noteapp281.bean.Note;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NoteDbOpenHelper extends SQLiteOpenHelper {
+
+    private static final String DB_NAME = "noteSQLite.db";
+    private static final String TABLE_NAME_NOTE = "note";
+
+    private static final String CREATE_TABLE_SQL = "create table " + TABLE_NAME_NOTE + " (id integer primary key autoincrement, title text, content text, create_time text)";
+
+
+    public NoteDbOpenHelper(Context context) {
+        super(context, DB_NAME, null, 1);
+    }
+
+
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(CREATE_TABLE_SQL);
+
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+
+    }
+
+    public long insertData(Note note) {
+
+        SQLiteDatabase db = getWritableDatabase();
+
+        ContentValues values = new ContentValues();
+        values.put("title", note.getTitle());
+        values.put("content", note.getContent());
+        values.put("create_time", note.getCreatedTime());
+
+        return db.insert(TABLE_NAME_NOTE, null, values);
+    }
+
+    public int deleteFromDbById(String id) {
+        SQLiteDatabase db = getWritableDatabase();
+//        return db.delete(TABLE_NAME_NOTE, "id = ?", new String[]{id});
+//        return db.delete(TABLE_NAME_NOTE, "id is ?", new String[]{id});
+        return db.delete(TABLE_NAME_NOTE, "id like ?", new String[]{id});
+    }
+
+    public int updateData(Note note) {
+
+        SQLiteDatabase db = getWritableDatabase();
+
+        ContentValues values = new ContentValues();
+        values.put("title", note.getTitle());
+        values.put("content", note.getContent());
+        values.put("create_time", note.getCreatedTime());
+
+        return db.update(TABLE_NAME_NOTE, values, "id like ?", new String[]{note.getId()});
+    }
+
+    public List<Note> queryAllFromDb() {
+
+        SQLiteDatabase db = getWritableDatabase();
+        List<Note> noteList = new ArrayList<>();
+
+        Cursor cursor = db.query(TABLE_NAME_NOTE, null, null, null, null, null, null);
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                String id = cursor.getString(cursor.getColumnIndex("id"));
+                String title = cursor.getString(cursor.getColumnIndex("title"));
+                String content = cursor.getString(cursor.getColumnIndex("content"));
+                String createTime = cursor.getString(cursor.getColumnIndex("create_time"));
+
+                Note note = new Note();
+                note.setId(id);
+                note.setTitle(title);
+                note.setContent(content);
+                note.setCreatedTime(createTime);
+
+                noteList.add(note);
+            }
+            cursor.close();
+        }
+
+        return noteList;
+
+    }
+
+    public List<Note> queryFromDbByTitle(String title) {
+        if (TextUtils.isEmpty(title)) {
+            return queryAllFromDb();
+        }
+
+        SQLiteDatabase db = getWritableDatabase();
+        List<Note> noteList = new ArrayList<>();
+
+        Cursor cursor = db.query(TABLE_NAME_NOTE, null, "title like ?", new String[]{"%"+title+"%"}, null, null, null);
+
+        if (cursor != null) {
+
+            while (cursor.moveToNext()) {
+                String id = cursor.getString(cursor.getColumnIndex("id"));
+                String title2 = cursor.getString(cursor.getColumnIndex("title"));
+                String content = cursor.getString(cursor.getColumnIndex("content"));
+                String createTime = cursor.getString(cursor.getColumnIndex("create_time"));
+
+                Note note = new Note();
+                note.setId(id);
+                note.setTitle(title2);
+                note.setContent(content);
+                note.setCreatedTime(createTime);
+                noteList.add(note);
+            }
+            cursor.close();
+        }
+        return noteList;
+    }
+
+
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/adapter/MyAdapter.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/adapter/MyAdapter.java
@ -0,0 +1,230 @@
+package com.example.noteapp281.adapter;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.noteapp281.EditActivity;
+import com.example.noteapp281.NoteDbOpenHelper;
+import com.example.noteapp281.R;
+import com.example.noteapp281.bean.Note;
+import com.example.noteapp281.util.ToastUtil;
+
+import java.util.List;
+
+public class MyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private List<Note> mBeanList;
+    private LayoutInflater mLayoutInflater;
+    private Context mContext;
+
+    private NoteDbOpenHelper mNoteDbOpenHelper;
+
+    private int viewType;
+
+    public static int TYPE_LINEAR_LAYOUT = 0;
+    public static int TYPE_GRID_LAYOUT = 1;
+
+    public MyAdapter(Context context, List<Note> mBeanList){
+        this.mBeanList = mBeanList;
+        this.mContext = context;
+        mLayoutInflater = LayoutInflater.from(mContext);
+        mNoteDbOpenHelper = new NoteDbOpenHelper(mContext);
+    }
+
+    public void setViewType(int viewType) {
+        this.viewType = viewType;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return viewType;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if(viewType == TYPE_LINEAR_LAYOUT){
+            View view = mLayoutInflater.inflate(R.layout.list_item_layout, parent, false);
+            MyViewHolder myViewHolder = new MyViewHolder(view);
+            return myViewHolder;
+        }else if(viewType == TYPE_GRID_LAYOUT){
+            View view = mLayoutInflater.inflate(R.layout.list_item_grid_layout, parent, false);
+            MyGridViewHolder myGridViewHolder = new MyGridViewHolder(view);
+            return myGridViewHolder;
+        }
+
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (holder == null) {
+            return;
+        }
+        if(holder instanceof MyViewHolder){
+            bindMyViewHolder((MyViewHolder) holder, position);
+        } else if (holder instanceof MyGridViewHolder) {
+            bindGridViewHolder((MyGridViewHolder) holder, position);
+        }
+    }
+
+    private void bindMyViewHolder(MyViewHolder holder, int position) {
+        Note note = mBeanList.get(position);
+        holder.mTvTitle.setText(note.getTitle());
+        holder.mTvContent.setText(note.getContent());
+        holder.mTvTime.setText(note.getCreatedTime());
+        holder.rlContainer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent = new Intent(mContext, EditActivity.class);
+                intent.putExtra("note", note);
+                mContext.startActivity(intent);
+            }
+        });
+
+        holder.rlContainer.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                // 弹出弹窗
+                Dialog dialog = new Dialog(mContext, android.R.style.ThemeOverlay_Material_Dialog_Alert);
+                View dialogView = mLayoutInflater.inflate(R.layout.list_item_dialog_layout, null);
+                TextView tvDelete = dialogView.findViewById(R.id.tv_delete);
+                TextView tvEdit = dialogView.findViewById(R.id.tv_edit);
+
+                tvDelete.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        int row = mNoteDbOpenHelper.deleteFromDbById(note.getId());
+                        if (row > 0) {
+                            removeData(position);
+                        }
+                        dialog.dismiss();
+                    }
+                });
+
+
+                tvEdit.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(mContext, EditActivity.class);
+                        intent.putExtra("note", note);
+                        mContext.startActivity(intent);
+                        dialog.dismiss();
+                    }
+                });
+                dialog.setContentView(dialogView);
+                dialog.setCanceledOnTouchOutside(true);
+                dialog.show();
+                return true;
+            }
+        });
+    }
+
+
+    private void bindGridViewHolder(MyGridViewHolder holder, int position) {
+        Note note = mBeanList.get(position);
+        holder.mTvTitle.setText(note.getTitle());
+        holder.mTvContent.setText(note.getContent());
+        holder.mTvTime.setText(note.getCreatedTime());
+        holder.rlContainer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent = new Intent(mContext, EditActivity.class);
+                intent.putExtra("note", note);
+                mContext.startActivity(intent);
+            }
+        });
+
+        holder.rlContainer.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                // 弹出弹窗
+                Dialog dialog = new Dialog(mContext, android.R.style.ThemeOverlay_Material_Dialog_Alert);
+                View dialogView = mLayoutInflater.inflate(R.layout.list_item_dialog_layout, null);
+                TextView tvDelete = dialogView.findViewById(R.id.tv_delete);
+                TextView tvEdit = dialogView.findViewById(R.id.tv_edit);
+
+                tvDelete.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        int row = mNoteDbOpenHelper.deleteFromDbById(note.getId());
+                        if (row > 0) {
+                            removeData(position);
+                        }
+                        dialog.dismiss();
+                    }
+                });
+
+
+                tvEdit.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent(mContext, EditActivity.class);
+                        intent.putExtra("note", note);
+                        mContext.startActivity(intent);
+                        dialog.dismiss();
+                    }
+                });
+                dialog.setContentView(dialogView);
+                dialog.setCanceledOnTouchOutside(true);
+                dialog.show();
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mBeanList.size();
+    }
+
+    public void refreshData(List<Note> notes) {
+        this.mBeanList = notes;
+        notifyDataSetChanged();
+    }
+
+    public void removeData(int pos) {
+        mBeanList.remove(pos);
+        notifyItemRemoved(pos);
+    }
+
+    class MyViewHolder extends RecyclerView.ViewHolder{
+        TextView mTvTitle;
+        TextView mTvContent;
+        TextView mTvTime;
+        ViewGroup rlContainer;
+        public MyViewHolder(@NonNull View itemView) {
+            super(itemView);
+            this.mTvTitle = itemView.findViewById(R.id.tv_title);
+            this.mTvContent = itemView.findViewById(R.id.tv_content);
+            this.mTvTime = itemView.findViewById(R.id.tv_time);
+            this.rlContainer = itemView.findViewById(R.id.rl_item_container);
+        }
+    }
+
+    class MyGridViewHolder extends RecyclerView.ViewHolder{
+
+        TextView mTvTitle;
+        TextView mTvContent;
+        TextView mTvTime;
+        ViewGroup rlContainer;
+
+        public MyGridViewHolder(@NonNull View itemView) {
+            super(itemView);
+            this.mTvTitle = itemView.findViewById(R.id.tv_title);
+            this.mTvContent = itemView.findViewById(R.id.tv_content);
+            this.mTvTime = itemView.findViewById(R.id.tv_time);
+            this.rlContainer = itemView.findViewById(R.id.rl_item_container);
+        }
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/bean/Note.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/bean/Note.java
@ -0,0 +1,54 @@
+package com.example.noteapp281.bean;
+
+import java.io.Serializable;
+
+public class Note implements Serializable {
+
+    private String title;
+    private String content;
+    private String createdTime;
+    private String id;
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "Note{" +
+                "title='" + title + '\'' +
+                ", content='" + content + '\'' +
+                ", createdTime='" + createdTime + '\'' +
+                ", id='" + id + '\'' +
+                '}';
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/util/SpfUtil.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/util/SpfUtil.java
@ -0,0 +1,38 @@
+package com.example.noteapp281.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class SpfUtil {
+
+    private static String SPF_NAME = "noteSpf";
+
+    public static void saveString(Context context, String key, String value) {
+        SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = spf.edit();
+        edit.putString(key, value);
+        edit.apply();
+    }
+
+    public static String getString(Context context, String key) {
+        SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
+        return spf.getString(key, "");
+    }
+
+    public static void saveInt(Context context, String key, int value) {
+        SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = spf.edit();
+        edit.putInt(key, value);
+        edit.apply();
+    }
+
+    public static int getInt(Context context, String key) {
+        SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
+        return spf.getInt(key, -1);
+    }
+
+    public static int getIntWithDefault(Context context, String key, int defValue) {
+        SharedPreferences spf = context.getSharedPreferences(SPF_NAME, Context.MODE_PRIVATE);
+        return spf.getInt(key, defValue);
+    }
+}
--- a/src/NoteApp281/app/src/main/java/com/example/noteapp281/util/ToastUtil.java
+++ b/src/NoteApp281/app/src/main/java/com/example/noteapp281/util/ToastUtil.java
@ -0,0 +1,15 @@
+package com.example.noteapp281.util;
+
+import android.content.Context;
+import android.widget.Toast;
+
+public class ToastUtil {
+
+    public static void toastShort(Context context, String msg) {
+        Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+    }
+
+    public static void toastLong(Context context, String msg) {
+        Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
+    }
+}
--- a/src/NoteApp281/app/src/main/res/drawable-v24/btn_bg_selector.xml
+++ b/src/NoteApp281/app/src/main/res/drawable-v24/btn_bg_selector.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@color/colorPrimary"/>
+    <item android:state_pressed="false" android:drawable="@color/colorPrimaryDark"/>
+</selector>
--- a/src/NoteApp281/app/src/main/res/drawable-v24/edit_text_bg.xml
+++ b/src/NoteApp281/app/src/main/res/drawable-v24/edit_text_bg.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+    <stroke android:width="3dp" android:color="#083684"/>
+
+    <corners android:radius="10dp" />
+</shape>
--- a/src/NoteApp281/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/src/NoteApp281/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/src/NoteApp281/app/src/main/res/drawable/btn_bg_selector.xml
+++ b/src/NoteApp281/app/src/main/res/drawable/btn_bg_selector.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@color/mycolor"/>
+    <item android:state_pressed="false" android:drawable="@color/colorPrimaryDark"/>
+</selector>
--- a/src/NoteApp281/app/src/main/res/drawable/edit_text_bg.xml
+++ b/src/NoteApp281/app/src/main/res/drawable/edit_text_bg.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+    <stroke android:width="3dp" android:color="#083684"/>
+
+    <corners android:radius="10dp" />
+</shape>
--- a/src/NoteApp281/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ b/src/NoteApp281/app/src/main/res/drawable/ic_baseline_search_24.xml
@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
--- a/src/NoteApp281/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/src/NoteApp281/app/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#083684"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/src/NoteApp281/app/src/main/res/layout/activity_add.xml
+++ b/src/NoteApp281/app/src/main/res/layout/activity_add.xml
@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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"
+    android:orientation="vertical"
+    tools:context=".AddActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/MyTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="标题" />
+
+            <EditText
+                android:id="@+id/et_title"
+                style="@style/MyEditStyle"
+                android:maxLines="1"
+                android:layout_width="match_parent"
+                android:layout_marginLeft="5dp" />
+        </LinearLayout>
+
+        <TextView
+            style="@style/MyTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="内容" />
+
+        <EditText
+            android:id="@+id/et_content"
+            style="@style/MyEditStyle"
+            android:layout_width="match_parent"
+            android:gravity="left"
+            android:layout_height="300dp"
+            android:layout_marginTop="5dp" />
+
+        <Button
+            style="@style/MyBtnStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="add"
+            android:text="添加" />
+    </LinearLayout>
+
+
+</ScrollView>
--- a/src/NoteApp281/app/src/main/res/layout/activity_edit.xml
+++ b/src/NoteApp281/app/src/main/res/layout/activity_edit.xml
@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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"
+    android:orientation="vertical"
+    tools:context=".EditActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/MyTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="标题" />
+
+            <EditText
+                android:id="@+id/et_title"
+                style="@style/MyEditStyle"
+                android:maxLines="1"
+                android:layout_width="match_parent"
+                android:layout_marginLeft="5dp" />
+        </LinearLayout>
+
+        <TextView
+            style="@style/MyTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="内容" />
+
+        <EditText
+            android:id="@+id/et_content"
+            style="@style/MyEditStyle"
+            android:layout_width="match_parent"
+            android:gravity="left"
+            android:layout_height="300dp"
+            android:layout_marginTop="5dp" />
+
+        <Button
+            style="@style/MyBtnStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="save"
+            android:text="保存" />
+    </LinearLayout>
+
+
+</ScrollView>
--- a/src/NoteApp281/app/src/main/res/layout/activity_main.xml
+++ b/src/NoteApp281/app/src/main/res/layout/activity_main.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    tools:context=".MainActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rlv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@android:drawable/ic_input_add"
+        android:layout_gravity="right|bottom"
+        android:layout_margin="20dp"
+        android:onClick="add"
+        android:backgroundTint="#083684"
+
+        />
+
+
+</FrameLayout>
--- a/src/NoteApp281/app/src/main/res/layout/list_item_dialog_layout.xml
+++ b/src/NoteApp281/app/src/main/res/layout/list_item_dialog_layout.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:id="@+id/tv_delete"
+        android:text="删除"
+        style="@style/MyTextStyle"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:id="@+id/tv_edit"
+        android:text="编辑"
+        style="@style/MyTextStyle"
+        />
+</LinearLayout>
--- a/src/NoteApp281/app/src/main/res/layout/list_item_grid_layout.xml
+++ b/src/NoteApp281/app/src/main/res/layout/list_item_grid_layout.xml
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:id="@+id/rl_item_container"
+    android:padding="10dp">
+
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:gravity="left"
+        android:text="你好"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        />
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text="你好拉拉拉拉谁在用琵琶弹奏一曲东风破"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="2021-5-30 22:40:34"
+        android:textSize="14sp" />
+</LinearLayout>
--- a/src/NoteApp281/app/src/main/res/layout/list_item_layout.xml
+++ b/src/NoteApp281/app/src/main/res/layout/list_item_layout.xml
@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/rl_item_container"
+    android:padding="10dp">
+
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:gravity="left"
+        android:layout_toLeftOf="@id/tv_time"
+        android:text="你好"
+        android:layout_alignParentLeft="true"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        />
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_title"
+        android:layout_marginTop="5dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text="你好拉拉拉拉谁在用琵琶弹奏一曲东风破"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/tv_title"
+        android:layout_alignParentRight="true"
+        android:gravity="center"
+        android:text="2021-5-30 22:40:34"
+        android:textSize="14sp" />
+</RelativeLayout>
--- a/src/NoteApp281/app/src/main/res/menu/menu_main.xml
+++ b/src/NoteApp281/app/src/main/res/menu/menu_main.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_search"
+        android:title="搜索"
+        app:showAsAction="always"
+        android:icon="@drawable/ic_baseline_search_24"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+
+
+    <group android:checkableBehavior="single" >
+
+    <item android:id="@+id/menu_linear"
+        android:title="列表布局"
+        app:showAsAction="never"
+        />
+    <item android:id="@+id/menu_grid"
+        android:title="网格布局"
+        app:showAsAction="never"
+        />
+    </group>
+</menu>
--- a/src/NoteApp281/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/src/NoteApp281/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/src/NoteApp281/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/src/NoteApp281/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/src/NoteApp281/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/src/NoteApp281/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/src/NoteApp281/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/src/NoteApp281/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/src/NoteApp281/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/src/NoteApp281/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/src/NoteApp281/app/src/main/res/values-night/themes.xml
+++ b/src/NoteApp281/app/src/main/res/values-night/themes.xml
@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.MyApplicationBase" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/src/NoteApp281/app/src/main/res/values/colors.xml
+++ b/src/NoteApp281/app/src/main/res/values/colors.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@color/green_500</color>
+    <color name="colorPrimaryDark">@color/green_700</color>
+    <color name="colorAccent">#F4511E</color>
+
+
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+
+    <color name="green_200">#C5E1A5</color>
+    <color name="green_500">#8BC34A</color>
+    <color name="green_700">#689F38</color>
+    <color name="mycolor">#083684</color>
+    <color name="titlecolor">#00008b</color>
+</resources>
--- a/src/NoteApp281/app/src/main/res/values/strings.xml
+++ b/src/NoteApp281/app/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">MyApplicationBase</string>
+</resources>
--- a/src/NoteApp281/app/src/main/res/values/style.xml
+++ b/src/NoteApp281/app/src/main/res/values/style.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+    <style name="MyBtnStyle">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:background">@drawable/btn_bg_selector</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
+    </style>
+
+    <style name="MyEditStyle">
+        <item name="android:textSize">18sp</item>
+        <item name="android:background">@drawable/edit_text_bg</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:layout_height">50dp</item>
+    </style>
+
+    <style name="MyTextStyle">
+        <item name="android:textSize">20sp</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:gravity">center</item>
+    </style>
+</resources>
--- a/src/NoteApp281/app/src/main/res/values/themes.xml
+++ b/src/NoteApp281/app/src/main/res/values/themes.xml
@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.MyApplicationBase" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/mycolor</item>
+        <item name="colorPrimaryVariant">@color/titlecolor</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/src/NoteApp281/app/src/test/java/com/example/noteapp281/ExampleUnitTest.java
+++ b/src/NoteApp281/app/src/test/java/com/example/noteapp281/ExampleUnitTest.java
@ -0,0 +1,17 @@
+package com.example.noteapp281;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
--- a/src/NoteApp281/build.gradle
+++ b/src/NoteApp281/build.gradle
@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:4.1.2"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
--- a/src/NoteApp281/gradle.properties
+++ b/src/NoteApp281/gradle.properties
@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
--- a/src/NoteApp281/gradle/wrapper/gradle-wrapper.jar
+++ b/src/NoteApp281/gradle/wrapper/gradle-wrapper.jar
--- a/src/NoteApp281/gradle/wrapper/gradle-wrapper.properties
+++ b/src/NoteApp281/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Sun May 09 13:24:37 CST 2021
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
--- a/src/NoteApp281/gradlew
+++ b/src/NoteApp281/gradlew
@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
--- a/src/NoteApp281/gradlew.bat
+++ b/src/NoteApp281/gradlew.bat
@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/src/NoteApp281/settings.gradle
+++ b/src/NoteApp281/settings.gradle
@ -0,0 +1,2 @@
+include ':app'
+rootProject.name = "NoteApp281"