Fixed fab button not changing color bug and some other improvements in user experience.

Author: RealOkabe

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.madscientistapps.mynotes"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 4
-        versionName "1.4"
+        versionCode 5
+        versionName "1.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:theme="@style/AppTheme"
         android:name=".MyApplication">
         <activity android:name=".addNoteActivity"
-            android:theme="@style/Theme.Cyanea.Dark.reference">
+            android:theme="@style/Theme.Cyanea.Dark">
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -21,7 +21,7 @@
 
         </activity>
         <activity android:name=".MainActivity"
-            android:theme="@style/Theme.Cyanea.Dark.reference">
+            android:theme="@style/Theme.Cyanea.Dark">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/example/mynotes/MainActivity.kt

@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.SimpleCursorAdapter
-import android.widget.Toast
 import androidx.annotation.RequiresApi
 import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity
 import com.jaredrummler.cyanea.prefs.CyaneaSettingsActivity
@@ -58,11 +57,10 @@ class MainActivity : CyaneaAppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         if (item.itemId == R.id.donate) {
-            val browserIntent =
-                Intent(Intent.ACTION_VIEW, Uri.parse("https://paypal.me/AnmolAgrawal"))
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://paypal.me/AnmolAgrawal"))
             startActivity(browserIntent)
-            Toast.makeText(this, "Thanks for donating!", Toast.LENGTH_LONG).show()
-        } else {
+        }
+        else {
 
             val inten = Intent(this, CyaneaSettingsActivity::class.java)
             startActivity(inten)

app/src/main/java/com/example/mynotes/addNoteActivity.kt

@@ -52,16 +52,24 @@ class addNoteActivity : CyaneaAppCompatActivity() {
 
     }
 
+    fun deleteNote(noteId:Int) {
+
+        db?.delete("myNotes", "_id=?", arrayOf(noteId.toString()))
+        Toast.makeText(this, "Note deleted successfully!", Toast.LENGTH_LONG).show()
+        finish()
+
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         if(item.itemId == R.id.delete_note) {
 
-            db?.delete("myNotes", "_id=?", arrayOf(noteId.toString()))
-            Toast.makeText(this, "Note deleted successfully!", Toast.LENGTH_LONG).show()
-            finish()
+            deleteNote(noteId!!)
+
 
         }
-        onBackPressed()
+        else
+            onBackPressed()
         return super.onOptionsItemSelected(item)
 
 
@@ -79,8 +87,15 @@ class addNoteActivity : CyaneaAppCompatActivity() {
     }
 
     private fun updateNote(noteValues: ContentValues) {
-        db?.update("myNotes", noteValues, "_id=?", arrayOf(noteId.toString()))
-        Toast.makeText(this, "Note updated successfully!", Toast.LENGTH_LONG).show()
+
+        if (cursor?.getString(0) == noteTitleText.text.toString() &&
+            cursor?.getString(1) == fullNoteText.text.toString())
+            finish()
+        else {
+
+            db?.update("myNotes", noteValues, "_id=?", arrayOf(noteId.toString()))
+            Toast.makeText(this, "Note updated successfully!", Toast.LENGTH_LONG).show()
+        }
     }
 
     override fun onDestroy() {
@@ -100,20 +115,24 @@ class addNoteActivity : CyaneaAppCompatActivity() {
 
         val noteValues = ContentValues()
 
-        if (noteTitleText.text.toString() == "")
-            noteValues.put("noteTitle", "Untitled Note")
-        else
-            noteValues.put("noteTitle", noteTitleText.text.toString())
+        if (fullNoteText.text.toString() == "" && noteTitleText.text.toString() == "")
+            deleteNote(noteId!!)
+        else {
 
-        noteValues.put("fullNote", fullNoteText.text.toString())
+            if (noteTitleText.text.toString() == "" && fullNoteText.text.toString() != "")
+                noteValues.put("noteTitle", "Untitled Note")
+            else
+                noteValues.put("noteTitle", noteTitleText.text.toString())
 
-        if(noteId == 0)
-            addNote(noteValues)
-        else
-            updateNote(noteValues)
+            noteValues.put("fullNote", fullNoteText.text.toString())
 
-        super.onBackPressed()
-        finish()
+            if (noteId == 0)
+                addNote(noteValues)
+            else
+                updateNote(noteValues)
 
+            super.onBackPressed()
+            finish()
+        }
     }
 }

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

@@ -11,8 +11,10 @@
         android:id="@+id/addNoteButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:borderWidth="0dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="32dp"
+        android:backgroundTint="@color/cyanea_accent"
         android:clickable="true"
         android:focusable="true"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -29,5 +31,6 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        android:divider="@color/cyanea_accent"
         app:layout_constraintVertical_bias="0.0" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -9,6 +9,5 @@
         <item name="android:textColor">#FFFFFF</item>
         <item name="android:itemBackground">#000000</item>
     </style>
-    <style name="Theme.Cyanea.Dark.reference"></style>
 
 </resources>