diff --git a/app/build.gradle b/app/build.gradle index d746537c..bd51c882 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { applicationId "com.maltaisn.notes.sync" minSdkVersion 21 targetSdkVersion 30 - versionCode 10300 - versionName "1.3.0" + versionCode 10400 + versionName "1.4.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" kapt { diff --git a/app/src/androidTest/kotlin/com/maltaisn/notes/model/DefaultJsonManagerTest.kt b/app/src/androidTest/kotlin/com/maltaisn/notes/model/DefaultJsonManagerTest.kt index e667edcf..dfb6add1 100644 --- a/app/src/androidTest/kotlin/com/maltaisn/notes/model/DefaultJsonManagerTest.kt +++ b/app/src/androidTest/kotlin/com/maltaisn/notes/model/DefaultJsonManagerTest.kt @@ -34,6 +34,7 @@ import com.maltaisn.notes.model.entity.PinnedStatus import com.maltaisn.notes.model.entity.Reminder import com.maltaisn.notes.testNote import com.maltaisn.recurpicker.Recurrence +import com.nhaarman.mockitokotlin2.mock import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json import org.junit.After @@ -60,7 +61,7 @@ class DefaultJsonManagerTest { jsonManager = DefaultJsonManager(notesDao, labelsDao, Json { encodeDefaults = false ignoreUnknownKeys = true - }) + }, mock()) } @After diff --git a/app/src/main/kotlin/com/maltaisn/notes/model/ReminderAlarmManager.kt b/app/src/main/kotlin/com/maltaisn/notes/model/ReminderAlarmManager.kt index e78feddf..d4272aed 100644 --- a/app/src/main/kotlin/com/maltaisn/notes/model/ReminderAlarmManager.kt +++ b/app/src/main/kotlin/com/maltaisn/notes/model/ReminderAlarmManager.kt @@ -16,12 +16,14 @@ package com.maltaisn.notes.model +import com.maltaisn.notes.OpenForTesting import com.maltaisn.notes.model.entity.Note import com.maltaisn.recurpicker.RecurrenceFinder import kotlinx.coroutines.flow.first import java.util.Date import javax.inject.Inject +@OpenForTesting class ReminderAlarmManager @Inject constructor( private val notesRepository: NotesRepository, private val alarmCallback: ReminderAlarmCallback diff --git a/app/src/main/play/release-notes/en-US/production.txt b/app/src/main/play/release-notes/en-US/production.txt index 0152542d..1c16e82c 100644 --- a/app/src/main/play/release-notes/en-US/production.txt +++ b/app/src/main/play/release-notes/en-US/production.txt @@ -1,4 +1,4 @@ -- Fixed export feature causing crash. -- Add import feature for JSON data. -- Add periodical auto export feature to a JSON file. -- Add option to separate checked and unchecked items in list note. \ No newline at end of file +- Added ability to hide all notes with a particular label. +- Added clickable links to edit screen. +- New Spanish translation. +- Many bug fixes. \ No newline at end of file diff --git a/app/src/main/play/release-notes/fr-CA/production.txt b/app/src/main/play/release-notes/fr-CA/production.txt index 9d8b828e..fbe58a0e 100644 --- a/app/src/main/play/release-notes/fr-CA/production.txt +++ b/app/src/main/play/release-notes/fr-CA/production.txt @@ -1,4 +1,4 @@ -- Correction du plantage lors de l'exportation des données. -- Nouvelle fonctionnalité: importation des données JSON. -- Nouvelle fonctionnalité: exportation périodique des données. -- Nouvelle option: séparation des éléments cochés et non cochés dans les listes. +- Ajout d'une fonctionnalité pour cacher les notes ayant une étiquette en particulier. +- Ajout de liens cliquables lors de l'édition. +- Nouvelle traduction en espagnol. +- Plusieurs bugs corrigés. diff --git a/gradle.properties b/gradle.properties index 2dc82e01..e2506714 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # App version # Must be updated manually in app/build.gradle! -# F-Droid only supports raw literals for auto update detection. -appVersion=1.3.0 -appVersionCode=10300 +# (F-Droid only supports raw literals for auto update detection) +appVersion=1.4.0 +appVersionCode=10400 # Kotlin kotlinVersion=1.5.10