diff --git a/README.md b/README.md index 726ca9eb..3801a715 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Notally was created because I wanted to make something that was beautiful and at the same time, useful. It's extremely light, there are minimal dependencies and lines of code. (Without compromising on readability) ### Features +* Auto backup * Adjustable text size -* No permissions required * Support for Lollipop devices and up * APK size of 1.2 MB (1.6 MB uncompressed) * Color, pin and label your notes for quick organisation diff --git a/app/build.gradle b/app/build.gradle index ffe5148e..2d46bd50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.omgodse.notally" minSdk 21 targetSdk 32 - versionCode 46 - versionName "5.1" + versionCode 47 + versionName "5.2" resConfigs "en", "ca", "cs", "da", "de", "el", "es", "fr", "hu", "in", "it", "ja", "nb", "nl", "nn", "pl", "pt-rBR", "pt-rPT", "ru", "sk", "sv", "tl", "tr", "uk", "vi", "zh-rCN" vectorDrawables.generatedDensities = [] } diff --git a/app/src/main/java/com/omgodse/notally/activities/NotallyActivity.kt b/app/src/main/java/com/omgodse/notally/activities/NotallyActivity.kt index 88b84802..504ea84a 100644 --- a/app/src/main/java/com/omgodse/notally/activities/NotallyActivity.kt +++ b/app/src/main/java/com/omgodse/notally/activities/NotallyActivity.kt @@ -5,7 +5,6 @@ import android.content.res.ColorStateList import android.os.Build import android.os.Bundle import android.util.TypedValue -import android.view.Menu import android.view.MenuItem import android.view.View import androidx.activity.viewModels @@ -45,7 +44,6 @@ abstract class NotallyActivity(private val type: Type) : AppCompatActivity() { super.onCreate(savedInstanceState) initialiseBinding() setContentView(binding.root) - setupToolbar() if (model.isFirstInstance) { val selectedBaseNote = intent.getParcelableExtra(Constants.SelectedBaseNote) @@ -61,45 +59,12 @@ abstract class NotallyActivity(private val type: Type) : AppCompatActivity() { model.isFirstInstance = false } + setupToolbar() setupListeners() setStateFromModel() } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { - if (menu != null) { - val pin = menu.add(R.string.pin, R.drawable.pin) { item -> pin(item) } - bindPinned(pin) - - menu.add(R.string.share, R.drawable.share) { share() } - menu.add(R.string.labels, R.drawable.label) { label() } - - when (model.folder) { - Folder.NOTES -> { - menu.add(R.string.delete, R.drawable.delete) { delete() } - menu.add(R.string.archive, R.drawable.archive) { archive() } - } - Folder.DELETED -> { - menu.add(R.string.restore, R.drawable.restore) { restore() } - menu.add(R.string.delete_forever, R.drawable.delete) { deleteForever() } - } - Folder.ARCHIVED -> { - menu.add(R.string.delete, R.drawable.delete) { delete() } - menu.add(R.string.unarchive, R.drawable.unarchive) { restore() } - } - } - } - return super.onCreateOptionsMenu(menu) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == android.R.id.home) { - onBackPressed() - } - return super.onOptionsItemSelected(item) - } - - open fun receiveSharedNote() {} open fun setupListeners() { @@ -179,9 +144,29 @@ abstract class NotallyActivity(private val type: Type) : AppCompatActivity() { private fun setupToolbar() { - setSupportActionBar(binding.Toolbar) - supportActionBar?.title = null - supportActionBar?.setDisplayHomeAsUpEnabled(true) + binding.Toolbar.setNavigationOnClickListener { onBackPressed() } + + val menu = binding.Toolbar.menu + val pin = menu.add(R.string.pin, R.drawable.pin) { item -> pin(item) } + bindPinned(pin) + + menu.add(R.string.share, R.drawable.share) { share() } + menu.add(R.string.labels, R.drawable.label) { label() } + + when (model.folder) { + Folder.NOTES -> { + menu.add(R.string.delete, R.drawable.delete) { delete() } + menu.add(R.string.archive, R.drawable.archive) { archive() } + } + Folder.DELETED -> { + menu.add(R.string.restore, R.drawable.restore) { restore() } + menu.add(R.string.delete_forever, R.drawable.delete) { deleteForever() } + } + Folder.ARCHIVED -> { + menu.add(R.string.delete, R.drawable.delete) { delete() } + menu.add(R.string.unarchive, R.drawable.unarchive) { restore() } + } + } } private fun initialiseBinding() { diff --git a/app/src/main/res/layout/activity_notally.xml b/app/src/main/res/layout/activity_notally.xml index af621a81..a4c5390a 100644 --- a/app/src/main/res/layout/activity_notally.xml +++ b/app/src/main/res/layout/activity_notally.xml @@ -7,7 +7,8 @@ + android:layout_height="wrap_content" + app:navigationIcon="?attr/homeAsUpIndicator" /> + android:textAppearance="?attr/textAppearanceHeadline6" /> - Poznámky Štítky @@ -88,7 +87,7 @@ Formát data Žádné - + Velikost písma Malé Střední @@ -99,8 +98,8 @@ Max. počet položek v poznámce Zálohování - - + + Automatická záloha Nastavit klepnutím sem Poznámky budou každý den zálohovány do interního uložiště telefonu.\n\nPokud máte zapnutý úsporný režim, nemusí to fungovat. @@ -108,7 +107,7 @@ Zakázat automatickou zálohu Vybrat jinou složku Složka nebyla nalezena. Možná byla přesunuta nebo smazána. - + Exportovat zálohu Importovat zálohu @@ -116,4 +115,4 @@ Knihovny Ohodnotit aplikaci Odeslat zpětnou vazbu - + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 67e96931..c19234ce 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -87,7 +87,7 @@ Datumsformat Keines - + Textgröße Klein Mittel @@ -98,7 +98,7 @@ Maximal angezeigte Zeilen Sichern und Wiederherstellen - + Automatische Sicherung Zum Einrichten antippen @@ -107,7 +107,7 @@ Automatische Sicherung deaktivieren Anderen Ordner wählen Kann den Ordner nicht finden. Er kann verschoben oder gelöscht worden sein - + Notizen sichern Notizen wiederherstellen @@ -115,4 +115,4 @@ Bibliotheken App bewerten Feedback senden - + \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3b87cba0..407f2c61 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -87,7 +87,7 @@ Format daty Brak - + Rozmiar tekstu Mały Średni @@ -98,10 +98,10 @@ Maksymalna ilość linii w notatce do pokazania Kopia - + Automatyczna kopia zapasowa - Dotknij, aby ustawić/string> + Dotknij, aby ustawić Notatki będą codziennie zapisywane w wewnętrznej pamięci telefonu.\n\nTo może nie działać, jeśli masz włączony tryb oszczędzania energii. Wybierz katalog Wyłącz automatyczną kopię zapasową @@ -115,4 +115,4 @@ Biblioteki Oceń aplikację Wyślij opinię - + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 972275ac..f1696962 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,6 +1,5 @@ + - - 笔记 标签 @@ -88,18 +87,18 @@ 日期格式 - + 文本大小 - + 内容密度 列表最多显示多少条目 笔记最多显示几行 备份 - + 自动备份 轻按进行设置 @@ -108,7 +107,7 @@ 禁用自动备份 选择另一个文件夹 找不到该文件夹。可能被移动或删除了。 - + 导出备份 导入备份 @@ -116,6 +115,4 @@ 给应用打分 发送反馈 - - - + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ed3d81ee..65a3c451 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,8 +32,11 @@ - + + @@ -48,6 +51,7 @@ diff --git a/fastlane/metadata/android/en-US/changelogs/47.txt b/fastlane/metadata/android/en-US/changelogs/47.txt new file mode 100644 index 00000000..8350a686 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/47.txt @@ -0,0 +1,5 @@ +Updated Czech, Polish, Chinese (Simplified) and German translations + +Removed the ACCESS NETWORK STATE permission which had been added automatically by the auto backup library. No user data was being collected. + +Instead of going through a dialog, notes can now be directly created from the home page. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 6ed41400..d872939c 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -20,9 +20,8 @@ Add clickable links to notes with support for phone numbers, email addresses and • Dark mode • Completely free -• Auto save and backup • Adjustable text size -• No permissions required +• Auto save and backup • APK size of 1.2 MB (1.6 MB uncompressed) Privacy