Merge pull request #52 from PhilKes/release/6.0

Release 6.0

README.md

@@ -1,35 +1,45 @@
-<h1 align="center">
-    <img src="fastlane/metadata/android/en-US/images/icon.png" alt="icon" />
+<h2 align="center">
+    <img src="fastlane/metadata/android/en-US/images/icon.png" alt="icon" width="90"/>
     <br />
     <b>NotallyX | Minimalistic note taking app</b>
-</h1>
 
-[Notally](https://github.com/OmGodse/Notally), but eXtended
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="70"/>](https://f-droid.org/packages/com.philkes.notallyx/)
+</h2>
+
+<div style="display: flex; justify-content: space-between; width: 100%;">
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Image 6" style="width: 32%;"/>
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Image 2" style="width: 32%;"/>
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Image 3" style="width: 32%;"/>
+</div>
 
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="250"/>
+<div style="display: flex; justify-content: space-between; width: 100%;">
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Image 4" style="width: 32%;"/>
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Image 5" style="width: 32%;"/>
+  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/7.png" alt="Image 7" style="width: 32%;"/>
+</div>
 
-### Additional Features
-* Order Tasks with Subtasks
-* Attach any file to a note (also included in backups)
-* Sort notes by title, last modified date, creation date
-* Many minor improvements such as option to removing all checked tasks, smoother navigation,...
+### Features
+[Notally](https://github.com/OmGodse/Notally), but eXtended
 
-### Included Features from the original Notally App
-* Widgets
-* Auto backup
-* Adjustable text size
+* Create **rich text** notes with support for bold, italics, mono space and strike-through
+* Create **task lists** and order them with subtasks
+* Complement your notes with any type of file such as **pictures**, PDFs, etc.
+* **Sort notes** by title, last modified date, creation date
+* **Color, pin and label** your notes for quick organisation
+* Add **clickable links** to notes with support for phone numbers, email addresses and web urls
+* **Undo/Redo actions**
+* Use **Home Screen Widget** to access important notes fast
+* **Lock your notes via Biometric/PIN**
+* Configurable **auto-backups**
+* Display the notes either in a **List or Grid**
+* Quickly share notes by text
+* Extensive preferences to adjust views to your liking
+* Actions to quickly remove checked tasks
+* Adaptive android app icon
 * Support for Lollipop devices and up
-* APK size of 1.4 MB (1.8 MB uncompressed)
-* Color, pin and label your notes for quick organisation
-* Complement your notes with pictures (JPG, PNG, WEBP)
-* Export notes as TXT, JSON, HTML or PDF files with formatting
-* Create rich text notes with support for bold, italics, mono space and strike-through
-* Add clickable links to notes with support for phone numbers, email addresses and web urls
 
-### Releases
-Currently the App is only released on Github, see [NotallyX/Releases](https://github.com/PhilKes/NotallyX/releases)
 
-In the future I might also publish new versions on the Google Play Store under the NotallyX name.
+---
 
 ### Translations
 All translations are crowd sourced. To contribute, follow these [guidelines](https://m2.material.io/design/communication/writing.html) and open a pull request.
@@ -43,5 +53,6 @@ The project is a default Android project written in Kotlin.
 Before submitting your proposed changes as a Pull-Request, make sure all tests are still working, and run `./gradlew ktfmtFormat` for common formatting.
 
 ### Attribution
-The original Notally project was developed by [OmGodse](https://github.com/OmGodse) under the [GPL 3.0 License](https://github.com/OmGodse/Notally/blob/master/LICENSE.md)
-In accordance to GPL 3.0, this project is licensed under the same [GPL 3.0 License](https://github.com/PhilKes/NotallyX/blob/master/LICENSE.md)
+The original Notally project was developed by [OmGodse](https://github.com/OmGodse) under the [GPL 3.0 License](https://github.com/OmGodse/Notally/blob/master/LICENSE.md).
+
+In accordance to GPL 3.0, this project is licensed under the same [GPL 3.0 License](https://github.com/PhilKes/NotallyX/blob/master/LICENSE.md).

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/SettingsFragment.kt

@@ -1,7 +1,6 @@
 package com.philkes.notallyx.presentation.activity.main.fragment
 
 import android.app.Activity
-import android.app.Application
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.hardware.biometrics.BiometricManager
@@ -14,7 +13,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
 import androidx.documentfile.provider.DocumentFile
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -46,7 +44,6 @@ import com.philkes.notallyx.presentation.view.misc.SortDirection
 import com.philkes.notallyx.presentation.view.misc.TextSize
 import com.philkes.notallyx.presentation.view.misc.Theme
 import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
-import com.philkes.notallyx.utils.Operations
 import com.philkes.notallyx.utils.backup.BackupProgress
 import com.philkes.notallyx.utils.backup.scheduleAutoBackup
 import com.philkes.notallyx.utils.canAuthenticateWithBiometrics
@@ -121,7 +118,7 @@ class SettingsFragment : Fragment() {
             openLink("https://play.google.com/store/apps/details?id=com.philkes.notallyx")
         }
 
-        binding.SendFeedback.setOnClickListener { sendEmailWithLog() }
+        binding.SendFeedback.setOnClickListener { sendFeedback() }
     }
 
     override fun onCreateView(
@@ -199,27 +196,16 @@ class SettingsFragment : Fragment() {
         }
     }
 
-    private fun sendEmailWithLog() {
+    private fun sendFeedback() {
         val intent =
-            Intent(Intent.ACTION_SEND).apply {
-                selector = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
-
-                // TODO: replace with github issue create link?
-                putExtra(Intent.EXTRA_EMAIL, arrayOf("omgodseapps@gmail.com"))
-                putExtra(Intent.EXTRA_SUBJECT, "NotallyX [Feedback]")
-            }
-
-        val app = requireContext().applicationContext as Application
-        val log = Operations.getLog(app)
-        if (log.exists()) {
-            val uri = FileProvider.getUriForFile(app, "${app.packageName}.provider", log)
-            intent.putExtra(Intent.EXTRA_STREAM, uri)
-        }
-
+            Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://github.com/PhilKes/NotallyX/issues/new/choose"),
+            )
         try {
             startActivity(intent)
         } catch (exception: ActivityNotFoundException) {
-            Toast.makeText(requireContext(), R.string.install_an_email, Toast.LENGTH_LONG).show()
+            Toast.makeText(requireContext(), R.string.install_a_browser, Toast.LENGTH_LONG).show()
         }
     }
 
@@ -232,23 +218,22 @@ class SettingsFragment : Fragment() {
                 "Work Manager",
                 "Subsampling Scale ImageView",
                 "Material Components for Android",
+                "SQLCipher",
             )
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.libraries)
             .setItems(libraries) { _, which ->
                 when (which) {
                     0 -> openLink("https://github.com/bumptech/glide")
                     1 -> openLink("https://github.com/ocpsoft/prettytime")
-                    2 ->
-                        openLink(
-                            "https://github.com/rambler-digital-solutions/swipe-layout-android"
-                        )
+                    2 -> openLink("https://github.com/zerobranch/SwipeLayout")
                     3 -> openLink("https://developer.android.com/jetpack/androidx/releases/work")
                     4 -> openLink("https://github.com/davemorrissey/subsampling-scale-image-view")
                     5 ->
                         openLink(
                             "https://github.com/material-components/material-components-android"
                         )
+                    6 -> openLink("https://github.com/sqlcipher/sqlcipher")
                 }
             }
             .setNegativeButton(R.string.cancel, null)

app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/ListItemVH.kt

@@ -98,9 +98,10 @@ class ListItemVH(
                     // TODO: when there are multiple checked items above it does not jump to the
                     // last
                     // unchecked item but always re-adds a new item
-                    listManager.delete(adapterPosition, false)
+                    listManager.delete(adapterPosition, false) != null
+                } else {
+                    false
                 }
-                true
             }
         }
     }

app/src/main/java/com/philkes/notallyx/utils/Extensions.kt

@@ -246,8 +246,8 @@ fun EditText.createTextWatcherWithHistory(
         }
 
         override fun afterTextChanged(s: Editable?) {
-            val textBefore = currentTextBefore
-            val textAfter = requireNotNull(s)
+            val textBefore = currentTextBefore.clone()
+            val textAfter = requireNotNull(s).clone()
             updateModel.invoke(textAfter)
 
             changeHistory.push(

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

@@ -142,6 +142,7 @@
         <TextView
             android:id="@+id/Rate"
             style="@style/Preference"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/rate" />

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

@@ -186,7 +186,7 @@
     <string name="about">About</string>
     <string name="libraries">Libraries</string>
     <string name="rate">Rate this app</string>
-    <string name="send_feedback">Send feedback</string>
+    <string name="send_feedback">Report an issue or make a feature request</string>
 
     <string name="github" translatable="false">GitHub</string>
 

fastlane/metadata/android/de/changelogs/60.txt

@@ -0,0 +1,11 @@
+Toolbar Buttons um Änderungen zurückzunehmen/wiederholen
+Bei Listen Löschen-Button direkt anzeigen anstatt swipen zu müssen
+Sortiere deine Listen in Unteraufgaben indem du sie nach rechts swipest
+Hänge beliebige Dateien an deine Notizen an, nicht nur Bilder.
+Customize the sort order of your notes by last modified, title,...
+Sortiere deine Notizen nach Datum der letzten Änderung, Titel,...
+Sichere deine Notizen per Biometric/PIN Lock
+Automatische Backups können nun deutlich stärker konfiguriert werden
+Adaptives Android App Icon nun verfügbar
+Tausche schnell in Home-Screen Widget angezeigte Notizen aus, anstatt sie neu hinzufügen zu müssen
+Markiere/Lösche schnell und einfach erledigte Aufgaben über die Toolbar

fastlane/metadata/android/de/full_description.txt

@@ -0,0 +1,48 @@
+NotallyX ist eine minimalistische Notiz-App mit einfachen Design und nützlichen Funktionen.
+
+<b>Organisation</b>
+
+Erstelle Notizen mit Unterstützung für alle Fettdruck, Kursivschrift, Monospace, etc.
+Erstelle Listen und ordnen sie mit Unteraufgaben.
+Ergänze deine Notizen mit beliebigen Dateien sowie Vorschauen für Bilder
+Sortiere Notizen nach Titel, Datum der letzten Änderung oder Erstellungsdatum.
+Ordne die Notizen entweder in einer Listen- oder Gitteransicht an.
+Farbmarkierung, anheften und beschrifte deine Notizen für eine schnelle Organisation.
+Füge anklickbare Links zu Notizen hinzu, mit Unterstützung für Telefonnummern, E-Mail-Adressen und URLs.
+Buttons um erledigte Aufgaben schnell und einfach zu entfernen.
+Die Möglichkeit Änderungen rückgängig zu machen.
+Umfangreiche Einstellungen, um Ansichten nach deinen Wünschen anzupassen.
+Teile Notizen schnell per Text.
+Sperre deine Notizen per Biometrie/PIN Lock.
+Konfigurierbare automatische Backups.
+Adaptives Android App-Icon.
+Unterstützung für Geräte ab Android Lollipop.
+
+<b>Komfort</b>
+
+• Dunkelmodus
+• Vollständig kostenlos
+• Einstellbare Schriftgröße
+• Automatisches Speichern und automatische Backups
+• Füge Notizen und Listen per Widgets zum Home-Screen hinzu
+
+<b>Datenschutz</b>
+
+Es gibt keine Werbung, Tracker oder Analytics jeglicher Art. Alle Notizen werden vollständig auf deinem Gerät gespeichert und verlassen es nie.
+
+<b>Berechtigungen</b>
+
+• Benachrichtigungen anzeigen
+
+Wird verwendet, um eine Benachrichtigung anzuzeigen, falls das Löschen von Bildern oder das Importieren von Backups Zeit in Anspruch nimmt.
+
+• Verhindern, dass das Telefon in den Ruhemodus wechselt, beim Start ausführen
+
+Wird von der automatischen Backup-Funktion verwendet, um sicherzustellen, dass Backups weiterhin erstellt werden, auch wenn dein Telefon neu gestartet wird.
+
+<b>Hinweis</b>
+
+Aufgrund eines Bugs seitens Xiaomi könnten einige MiUI-Geräte möglicherweise nicht auf die Textformatierungsoptionen zugreifen.
+
+https://github.com/PhilKes/NotallyX
+

fastlane/metadata/android/de/short_description.txt

@@ -0,0 +1 @@
+Simple und minimalistische Open-Source Notizen App

fastlane/metadata/android/de/title.txt

@@ -0,0 +1 @@
+NotallyX | Minimalistische Notizen App

fastlane/metadata/android/en-US/changelogs/60.txt

@@ -0,0 +1,10 @@
+Toolbar action for Undo/Redo any change
+Visible Delete button for list items instead of having to swipe right
+Order your lists in subtasks by swiping them to the right
+You can now attach any file to a note, not just pictures
+Customize the sort order of your notes by last modified, title,...
+Secure your notes via Biometric/PIN lock
+Auto-backups are now much more configurable
+Added monochrome app icon for custom theming
+Quickly change notes displayed in Widget instead of having to remove/re-add them
+Quickly check/delete tasks