test

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "ru.plumsoftware.notebook"
         minSdk 27
         targetSdk 33
-        versionCode 11
-        versionName "1.2.0"
+        versionCode 14
+        versionName "1.2.6 - Bug-fix"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -34,14 +34,14 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.firebase:firebase-analytics:21.2.2'
+    implementation 'com.google.firebase:firebase-analytics:21.3.0'
     implementation 'com.google.firebase:firebase-messaging:23.1.2'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     //Yandex ads
-    implementation 'com.yandex.android:mobileads:5.8.0'
+    implementation 'com.yandex.android:mobileads:5.9.0'
     implementation 'com.yandex.android:mobmetricalib:5.2.0'
 
     //Glide

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 9,
-      "versionName": "1.1.9-C",
+      "versionCode": 14,
+      "versionName": "1.2.6 - Bug-fix",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/ru/plumsoftware/notebook/activities/AddNoteActivity.java

@@ -22,6 +22,7 @@
 import android.widget.EditText;
 import android.widget.GridView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
@@ -80,6 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
         EditText tvTitle = (EditText) findViewById(R.id.Title);
         EditText tvText = (EditText) findViewById(R.id.Text);
         cardViewBtnDone = (CardView) findViewById(R.id.cardBtnDoneUltra);
+        TextView textView5 = (TextView) findViewById(R.id.textView5);
         SQLiteDatabaseManager sqLiteDatabaseManager = new SQLiteDatabaseManager(this);
         sqLiteDatabaseNotes = sqLiteDatabaseManager.getWritableDatabase();
         noteTime = System.currentTimeMillis();
@@ -99,6 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
             cardViewBtnDone.setCardBackgroundColor(color);
             tvTitle.setText(note.getNoteName());
             tvText.setText(note.getNoteText());
+            textView5.setText("РЕДАКТИРОВАТЬ");
         } else {
             toolbar.setTitle("Добавить заметку");
             toolbar.setSubtitle(new SimpleDateFormat("dd.MM.yyyy HH.mm", Locale.getDefault()).format(new Date(noteTime)));
@@ -171,6 +174,8 @@ public void onClick(View view) {
                     note.setOpacity(opacityRes);
                     note.setAddNoteTime(noteTime);
                     updateNote(note);
+//                    deleteNote(noteTime);
+//                    saveNote(noteTitle, text, opacityRes, color, noteTime);
                     onBackPressed();
                 } else {
                     saveNote(noteTitle, text, opacityRes, color, noteTime);
@@ -230,7 +235,11 @@ private void updateNote(Note note) {
         contentValues.put(DatabaseConstants._IS_LIKED, note.getIsLiked());
         contentValues.put(DatabaseConstants._IS_PINNED, note.getIsPinned());
         contentValues.put(DatabaseConstants._ADD_NOTE_TIME, note.getAddNoteTime());
-        sqLiteDatabaseNotes.update(DatabaseConstants._NOTES_TABLE_NAME, contentValues, DatabaseConstants._ADD_NOTE_TIME + " = ?", new String[]{Long.toString(note.getAddNoteTime())});
+        sqLiteDatabaseNotes.update(DatabaseConstants._NOTES_TABLE_NAME, contentValues, DatabaseConstants._ID + " = ?", new String[]{String.valueOf(note.getId())});
+    }
+
+    private void deleteNote(long time) {
+        sqLiteDatabaseNotes.delete(DatabaseConstants._NOTES_TABLE_NAME, DatabaseConstants._ADD_NOTE_TIME + "= ?", new String[]{String.valueOf(time)});
     }
 
     @SuppressLint("NonConstantResourceId")

build.gradle

@@ -4,8 +4,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
 }
 
 task clean(type: Delete) {

gradle.properties

@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 29 00:05:39 GMT+06:00 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.2.0",
+      "versionCode": 13,
+      "versionName": "1.2.5 - Bug-fix",
       "outputFile": "app-release.apk"
     }
   ],