diff --git a/README.md b/README.md index bdf52a6..e0e6d70 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,23 @@ All have a folder value of 0 | KindergartenMode | 5 | - | Previous and back buttons are locked. Adding a new card will not stop the current track but will schedule it as next track | | RepeatSingleModifier | 6 | - | Repeat current track | | FeedbackModifier | 7 | - | Will e.g. tell volume before changing it | +## Tonuino TNG 3.1.x +[Repository](https://github.com/tonuino/TonUINO-TNG#version-31-13102022) +Is a full rewrite of the original TonUINO software in C++ + +**Different Modes** +It supports all modes of TonUINO 2.1 and adds these + +| # | title | description | next | previous | +|----|-----------------|-----------------------------------------------------------|------|---------------------------------------| +| 10 | Hörbuch Einzeln | Play the next file from the folder and store the progress | stop | start title again from the beginning | +| 11 | Repeat last | Repeat the last card or shortcut | ?? | ?? | + +Wiederhole Karte Modus: die letzte Karte oder der letzte Shortcut wird wiederholt. + +#### Modifier Tags (aka admin tags) +Same as TonUINO 2.1 but removed the `FeedbackModifier` card with value `7`. ## NFC Host Card Emulation It would be great if the app also can act as an NFC tag to simulate TonUINO tags, some links to this: diff --git a/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt b/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt index 9e07e18..b2e0782 100644 --- a/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt +++ b/app/src/main/java/de/mw136/tonuino/ui/DescribeTag.kt @@ -31,6 +31,11 @@ enum class Format2Mode(val value: Int) { Party2(9) } +enum class Format3Mode(val value: Int) { + AudioBookSingle(10), + RepeatLast(11), +} + enum class Format2ModifierMode(val value: Int) { Admin(0), SleepTimer(1), FreezeDance(2), Locked(3), Toddler(4), Kindergarten(5), RepeatSingle(6), Feedback(7) diff --git a/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt b/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt index b285f4e..6ffbac9 100644 --- a/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt +++ b/app/src/main/java/de/mw136/tonuino/ui/enter/EnterSimple.kt @@ -15,6 +15,7 @@ import de.mw136.tonuino.setByteIfChanged import de.mw136.tonuino.ui.Format1Mode import de.mw136.tonuino.ui.Format2Mode import de.mw136.tonuino.ui.Format2ModifierMode +import de.mw136.tonuino.ui.Format3Mode import de.mw136.tonuino.ui.Tonuino private const val VERSION_MAX = 2 @@ -29,7 +30,7 @@ class EnterSimple : Fragment() { get() { return when (savedModeView) { ModeView.V1 -> 6 - ModeView.V2 -> 9 + ModeView.V2 -> 11 ModeView.V2_MODIFIER -> 7 ModeView.INITIAL -> 0 } @@ -248,7 +249,9 @@ class EnterSimple : Fragment() { Format1Mode.AudioBookRandom.value, Format1Mode.AudioBookMultiple.value, Format1Mode.Album.value, - Format1Mode.Party.value + Format1Mode.Party.value, + Format3Mode.AudioBookSingle.value, + Format3Mode.RepeatLast.value -> { specialRow.visibility = View.GONE specialLabel.text = getString(R.string.edit_hidden_label) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c5535aa..9e06146 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -53,6 +53,8 @@ Hörspiel von-bis Album von-bis Party von-bis + Hörbuch einzeln + Wiederhole Karte Ein zufälliger Titel aus dem gewählten Ordner wird abgespielt. @@ -66,6 +68,8 @@ Ein zufälliger Titel im gewählten Ordner zwischen von und bis wird abgespielt. Spielt alle Titel des Ordners zwischen von und bis in numerischer Reihenfolge. Spielt zufällige Titel des Ordners zwischen von und bis in Endlosschleife. + Den nächsten Titel im Ordner wiedergeben und den Fortschritt speichern. + Die letzte Karte oder der letzte Shortcut wird wiederholt. Der Modus \'%d\' ist unbekannt. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0262cd3..612f691 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,8 +45,8 @@ From Extra 2 To - Format 1: For Tonuino 2.0.x ("master" branch) - Format 2: For Tonuino 2.1 ("DEV" branch) + Format 1: For Tonuino 2.0.x + Format 2: For Tonuino 2.1 and Tonuino TNG 3.1 hidden Value \'%s\' is unknown. @@ -54,7 +54,7 @@ Tonuino 2.0.x - Tonuino 2.1.x + Tonuino 2.1.x and Tonuino TNG Audio book (single file) @@ -66,6 +66,8 @@ Audio book from-to (single file) Album from-to Party from-to + Audio book series (single files) + Repeat last A random file from the chosen folder will be played. @@ -79,6 +81,8 @@ A random file from the chosen folder between the selected minimum and maximum will be played. Plays all files inside the folder between the selected minimum and maximum in numerical order. Plays random files inside the folder between the selected minimum and maximum. + Plays the next file from the folder and store the progress. + Repeat the last card or shortcut. Mode \'%d\' is unknown.