Merge pull request #1

.github/workflows/android lint.yml

@@ -0,0 +1,35 @@
+name: android lint
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  android-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 21
+          cache: gradle
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Create local.properties
+        run: |
+            echo "sdk.dir=$(pwd)/android-sdk" >> local.properties
+      - run: ./gradlew :app:lint
+      - uses: yutailang0119/action-android-lint@v4
+        with:
+          report-path: build/reports/*.xml
+          ignore-warnings: true
+        continue-on-error: false
+#I love android!

.gitignore

@@ -1,15 +1,27 @@
-*.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
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+*.aab
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Android Profiling
+*.hprof

README.md

@@ -0,0 +1,14 @@
+# О проекте
+Этот проект начал историю, когда я ещё учился в старших классах школы. Суть простая - создаёшь заметки, ставишь напоминаянию и всё.
+
+# Стек технологий
+- Java
+- XML android UI
+- Foreground service
+- MVP
+- Clean architecture
+- Glide
+- РСЯ
+- FCM
+
+__Переменные для local.properties не требуются__

app-data/.gitignore

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

app-data/build.gradle.kts

@@ -0,0 +1,38 @@
+plugins {
+    id("com.android.library")
+}
+
+android {
+    namespace = "ru.plumsoftware.data"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 22
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = 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.7.0")
+    implementation("com.google.android.material:material:1.12.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+}

app-data/proguard-rules.pro

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

app-data/src/androidTest/java/ru/plumsoftware/data/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package ru.plumsoftware.data;
+
+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("ru.plumsoftware.data.test", appContext.getPackageName());
+    }
+}

app-data/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

app-data/src/main/java/ru/plumsoftware/data/database/SQLiteDatabaseManager.java

@@ -0,0 +1,41 @@
+package ru.plumsoftware.data.database;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import ru.plumsoftware.data.model.database.DatabaseConstants;
+
+public class SQLiteDatabaseManager extends SQLiteOpenHelper {
+    private static final int DATABASE_VERSION = 5;
+    private static final String DATABASE_NAME = DatabaseConstants.DATABASE_NAME;
+
+    public SQLiteDatabaseManager(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(DatabaseConstants.CREATE_NOTES_TABLE);
+        db.execSQL(DatabaseConstants.CREATE_GROUPS_TABLE);
+    }
+
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (newVersion > oldVersion) {
+            String tempTable = "temp_table";
+            db.execSQL("CREATE TABLE " + tempTable + " AS SELECT * FROM " + DatabaseConstants._NOTES_TABLE_NAME);
+            db.execSQL(DatabaseConstants.DELETE_NOTES_TABLE);
+            db.execSQL(DatabaseConstants.CREATE_NOTES_TABLE);
+
+            db.execSQL("ALTER TABLE " + tempTable + " ADD " + DatabaseConstants._CHANNEL_ID + " TEXT;");
+            db.execSQL("ALTER TABLE " + tempTable + " ADD " + DatabaseConstants._IS_NOTIFY + " INTEGER;");
+
+            db.execSQL("INSERT INTO " + DatabaseConstants._NOTES_TABLE_NAME + " SELECT * FROM " + tempTable);
+
+            db.execSQL("DROP TABLE IF EXISTS " + tempTable);
+        }
+    }
+
+    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        onUpgrade(db, oldVersion, newVersion);
+    }
+}

app/src/main/java/ru/plumsoftware/notebook/databases/DatabaseConstants.java → app-data/src/main/java/ru/plumsoftware/data/model/database/DatabaseConstants.java

@@ -1,4 +1,4 @@
-package ru.plumsoftware.notebook.databases;
+package ru.plumsoftware.data.model.database;
 
 import android.provider.BaseColumns;
 
@@ -16,6 +16,9 @@ public class DatabaseConstants implements BaseColumns {
     public static final String _IS_PINNED = "_is_pinned";
     public static final String _IS_LIKED = "_is_liked";
 
+    public static final String _CHANNEL_ID = "_notification_channel_id";
+    public static final String _IS_NOTIFY = "_is_notify";
+
     public static final String CREATE_NOTES_TABLE =
             "CREATE TABLE IF NOT EXISTS " + DatabaseConstants._NOTES_TABLE_NAME +
                     " (" + DatabaseConstants._ID + " INTEGER PRIMARY KEY," +
@@ -25,7 +28,9 @@ public class DatabaseConstants implements BaseColumns {
                     DatabaseConstants._NOTE_PROMO + " INTEGER," +
                     DatabaseConstants._IS_PINNED + " INTEGER," +
                     DatabaseConstants._NOTE_COLOR + " INTEGER," +
-                    DatabaseConstants._IS_LIKED + " INTEGER)";
+                    DatabaseConstants._IS_LIKED + " INTEGER," +
+                    DatabaseConstants._CHANNEL_ID + " TEXT," +
+                    DatabaseConstants._IS_NOTIFY + " INTEGER)";
 
     public static final String CREATE_GROUPS_TABLE =
             "CREATE TABLE IF NOT EXISTS " + DatabaseConstants._GROUPS_TABLE_NAME +

app/src/main/java/ru/plumsoftware/notebook/data/items/Colors.java → app-data/src/main/java/ru/plumsoftware/data/model/ui/Colors.java

@@ -1,7 +1,9 @@
-package ru.plumsoftware.notebook.data.items;
+package ru.plumsoftware.data.model.ui;
+
+import androidx.annotation.ColorRes;
 
 public class Colors {
-    private int colorRes;
+    @ColorRes private final int colorRes;
 
     public Colors(int colorRes) {
         this.colorRes = colorRes;