Added extension to format seconds to short time

commons/src/main/kotlin/org/fossify/commons/extensions/Context.kt

@@ -591,6 +591,41 @@ fun Context.formatSecondsToTimeString(totalSeconds: Int): String {
     return result
 }
 
+fun Context.formatMinutesToShortTimeString(totalMinutes: Int) = formatSecondsToShortTimeString(totalMinutes * 60)
+
+fun Context.formatSecondsToShortTimeString(totalSeconds: Int): String {
+    val days = totalSeconds / DAY_SECONDS
+    val hours = (totalSeconds % DAY_SECONDS) / HOUR_SECONDS
+    val minutes = (totalSeconds % HOUR_SECONDS) / MINUTE_SECONDS
+    val seconds = totalSeconds % MINUTE_SECONDS
+    val timesString = StringBuilder()
+    if (days > 0) {
+        val daysString = String.format(resources.getString(R.string.days_letter), days)
+        timesString.append("$daysString ")
+    }
+
+    if (hours > 0) {
+        val hoursString = String.format(resources.getString(R.string.hours_letter), hours)
+        timesString.append("$hoursString ")
+    }
+
+    if (minutes > 0) {
+        val minutesString = String.format(resources.getString(R.string.minutes_letter), minutes)
+        timesString.append("$minutesString ")
+    }
+
+    if (seconds > 0) {
+        val secondsString = String.format(resources.getString(R.string.seconds_letter), seconds)
+        timesString.append(secondsString)
+    }
+
+    var result = timesString.toString().trim()
+    if (result.isEmpty()) {
+        result = String.format(resources.getString(R.string.minutes_letter), 0)
+    }
+    return result
+}
+
 fun Context.getFormattedMinutes(minutes: Int, showBefore: Boolean = true) = getFormattedSeconds(if (minutes == -1) minutes else minutes * 60, showBefore)
 
 fun Context.getFormattedSeconds(seconds: Int, showBefore: Boolean = true) = when (seconds) {

commons/src/main/res/values-be/strings.xml

@@ -447,9 +447,9 @@
     <string name="minutes_raw">хвілін</string>
     <string name="hours_raw">гадзін</string>
     <string name="days_raw">дзён</string>
-    <string name="seconds_letter">с</string>
-    <string name="minutes_letter">х</string>
-    <string name="hours_letter">г</string>
+    <string name="seconds_letter">%dс</string>
+    <string name="minutes_letter">%dх</string>
+    <string name="hours_letter">%dг</string>
     <plurals name="seconds">
         <item quantity="one">%d секунда</item>
         <item quantity="few">%d секунды</item>
@@ -993,4 +993,4 @@
     <string name="deprecated_app">САСТАРЕЛА: гэтая версія праграмы больш не падтрымліваецца, атрымайце версію Pro па адрасе https://play.google.com/store/apps/details\?id=org.fossify..xxx.pro</string>
     <string name="pro_app_refund">Не забывайце, што калі вы выдаліце любую платную праграму на працягу 2 гадзін, вам аўтаматычна вернуць грошы. Калі вы хочаце вярнуць грошы ў любы час пазней, проста звяжыцеся з намі па адрасе [email protected], і вы атрымаеце іх. Гэта дазваляе лёгка паспрабаваць :)</string>
     <string name="developer_description">Група простых праграм для Android з адкрытым зыходным кодам і віджэтамі, якія можна наладзіць, без рэкламы і непатрэбных дазволаў.</string>
-</resources>
+</resources>

commons/src/main/res/values-bg/strings.xml

@@ -447,9 +447,9 @@
     <string name="minutes_raw">минути</string>
     <string name="hours_raw">часове</string>
     <string name="days_raw">дни</string>
-    <string name="seconds_letter">с</string>
-    <string name="minutes_letter">м</string>
-    <string name="hours_letter">ч</string>
+    <string name="seconds_letter">%dс</string>
+    <string name="minutes_letter">%dм</string>
+    <string name="hours_letter">%dч</string>
     <plurals name="seconds">
         <item quantity="one">%d секунда</item>
         <item quantity="other">%d секунди</item>

commons/src/main/res/values-bs/strings.xml

@@ -482,7 +482,7 @@
     <string name="minutes_raw">minute</string>
     <string name="hours_raw">sati</string>
     <string name="days_raw">dani</string>
-    <string name="minutes_letter">min</string>
+    <string name="minutes_letter">%dmin</string>
     <string name="week_number_short">sed.</string>
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
@@ -1083,4 +1083,4 @@
     <string name="filter_pro">Filter (Pro)</string>
     <string name="root">Početak</string>
     <string name="internal_storage">Interno skladište</string>
-</resources>
+</resources>

commons/src/main/res/values-ca/strings.xml

@@ -1097,9 +1097,9 @@
     <string name="enter_password">Introduïu la contrasenya</string>
     <string name="password">Contrasenya</string>
     <string name="add_password">Afegeix una contrasenya</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dh</string>
     <string name="week_number_short">st.</string>
     <string name="purchase_simple_thank_you">Compra de Fossify Thank You</string>
     <string name="general_settings">General</string>

commons/src/main/res/values-cs/strings.xml

@@ -1050,9 +1050,9 @@
     <string name="too_many_incorrect_attempts">Příliš mnoho nesprávných pokusů o odemknutí.
 \nZkuste to znovu za %d sekund.</string>
     <string name="enter_password">Zadejte heslo</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dh</string>
     <string name="week_number_short">týd.</string>
     <string name="purchase_simple_thank_you">Zakoupit Poděkování Fossify</string>
     <string name="notification_sound">Zvuk oznámení</string>

commons/src/main/res/values-da/strings.xml

@@ -449,7 +449,7 @@
     <string name="minutes_raw">minutter</string>
     <string name="hours_raw">timer</string>
     <string name="days_raw">dage</string>
-    <string name="hours_letter">t</string>
+    <string name="hours_letter">%dt</string>
     <string name="week_number_short">u.</string>
     <plurals name="seconds">
         <item quantity="one">%d sekund</item>
@@ -975,4 +975,4 @@
     <string name="developer_description">En gruppe simple, open source apps til Android med widgets, der kan tilpasses, uden reklamer og unødvendige tilladelser.</string>
     <string name="ok">OK</string>
     <string name="format_phone_numbers">Formatér telefonnumre</string>
-</resources>
+</resources>

commons/src/main/res/values-de/strings.xml

@@ -473,9 +473,9 @@
     <string name="minutes_raw">Minuten</string>
     <string name="hours_raw">Stunden</string>
     <string name="days_raw">Tage</string>
-    <string name="seconds_letter">Sek.</string>
-    <string name="minutes_letter">Min.</string>
-    <string name="hours_letter">Std.</string>
+    <string name="seconds_letter">%dSek.</string>
+    <string name="minutes_letter">%dMin.</string>
+    <string name="hours_letter">%dStd.</string>
     <string name="week_number_short">KW</string>
     <plurals name="seconds">
         <item quantity="one">%d Sekunde</item>

commons/src/main/res/values-el/strings.xml

@@ -470,9 +470,9 @@
     <string name="minutes_raw">λεπτά</string>
     <string name="hours_raw">ώρες</string>
     <string name="days_raw">ημερ.</string>
-    <string name="seconds_letter">δ</string>
-    <string name="minutes_letter">λ</string>
-    <string name="hours_letter">ω</string>
+    <string name="seconds_letter">%dδ</string>
+    <string name="minutes_letter">%dλ</string>
+    <string name="hours_letter">%dω</string>
     <string name="week_number_short">εβδ.</string>
     <plurals name="seconds">
         <item quantity="one">%d δευτ.</item>
@@ -954,4 +954,4 @@
     <string name="deprecated_app">ΚΑΤΑΡΓΗΣΗ: Αυτή η έκδοση της εφαρμογής δεν υποστηρίζεται πλέον, λάβετε την έκδοση Pro εδώ https://play.google.com/store/apps/details?id=org.fossify..xxx.pro</string>
     <string name="pro_app_refund">Μην ξεχνάτε οτι αν απεγκατασταθεί εντός 2 ωρών, θα επιστραφούν αυτόματα τα χρήματα σας. Αν θέλετε επιστροφή χρημάτων οποιαδήποτε στιγμή αργότερα, απλά επικοινωνήστε μαζί μας στο [email protected] και θα τα λάβετε. Αυτό το κάνει εύκολότερο για να την δοκιμάσετε :)</string>
     <string name="developer_description">Μια ομάδα Απλών εφαρμογών Android ανοιχτού κώδικα με προσαρμόσιμα γραφικά στοιχεία, χωρίς διαφημίσεις και περιττές Άδειες.</string>
-</resources>
+</resources>

commons/src/main/res/values-eo/strings.xml

@@ -625,9 +625,9 @@
     </plurals>
     <string name="minutes_raw">minutoj</string>
     <string name="days_raw">tagoj</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dh</string>
     <plurals name="seconds">
         <item quantity="one">%d sekundo</item>
         <item quantity="other">%d sekundoj</item>

commons/src/main/res/values-es/strings.xml

@@ -1107,9 +1107,9 @@
     <string name="enter_password">Introduzca la contraseña</string>
     <string name="password">Contraseña</string>
     <string name="add_password">Añadir una contraseña</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">min</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dmin</string>
+    <string name="hours_letter">%dh</string>
     <string name="week_number_short">semana</string>
     <string name="general_settings">General</string>
     <string name="purchase_simple_thank_you">Comprar Fossify Thank You</string>

commons/src/main/res/values-et/strings.xml

@@ -1011,8 +1011,8 @@
     <string name="pro_app_refund">Palun arvesta, et kui eemaldad tasulise rakenduse nutiseadmest 2 tunni jooksul, siis ostusumma tagastatakse automaatselt. Kui soovit tagastust hiljem, siis saada e-kiri [email protected] aadressile ning korraldame tagastuse. Mõlemal juhul on sul võimalik meie tasulisi rakendusi testida :)</string>
     <string name="developer_description">Arendame Androidi jaoks avatud lähtekoodil põhinevaid lihtsaid tarvikuid ja milles pole reklaame ega vajadust asjatute õiguste jaoks.</string>
     <string name="exif">EXIF</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">t</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dt</string>
     <string name="friday_letter">R</string>
     <string name="donate_new">Tere,&lt;br&gt;&lt;br&gt; loodame, et sulle meie rakendus meeldib. See ei sisalda reklaame, palun toeta selle arendamist, ostes rakenduse &lt;a href=https://play.google.com/store/apps/details?id=org.fossify.thankyou&gt;Fossify Suur Tänu&lt;/a&gt;. Seejärel muutuvad kasutatavaks ka rakenduse lisafunktsionaalsused ja värvide kohandamine.&lt;br&gt;&lt;br&gt;Aitäh!</string>
     <string name="update_thank_you">Palun uuenda rakendus Fossify Suur Tänu viimase versioonini</string>
@@ -1059,7 +1059,7 @@
     <string name="enter_password">Sisesta salasõna</string>
     <string name="password">Salasõna</string>
     <string name="add_password">Lisa salasõna</string>
-    <string name="seconds_letter">s</string>
+    <string name="seconds_letter">%ds</string>
     <string name="week_number_short">nd.</string>
     <string name="notification_sound">Teavituse heli</string>
     <string name="usb">USB</string>

commons/src/main/res/values-eu/strings.xml

@@ -911,9 +911,9 @@
     <string name="enter_password">Sartu pasahitza</string>
     <string name="password">Pasahitza</string>
     <string name="add_password">Gehitu pasahitza</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">ordu</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dordu</string>
     <string name="week_number_short">aste</string>
     <string name="general_settings">Orokorra</string>
     <string name="list_view">Zerrenda ikuspegia</string>
@@ -968,4 +968,4 @@
     <string name="theme_and_colors">Itxura eta koloreak</string>
     <string name="all_fossify_apps">Fossifyren aplikazio guztiak</string>
     <string name="known_issues">Errore ezagunak</string>
-</resources>
+</resources>

commons/src/main/res/values-fa/strings.xml

@@ -259,9 +259,9 @@
     <string name="minutes_raw">دقیقه</string>
     <string name="hours_raw">ساعت</string>
     <string name="days_raw">روز</string>
-    <string name="seconds_letter">ث</string>
-    <string name="minutes_letter">د</string>
-    <string name="hours_letter">س</string>
+    <string name="seconds_letter">%dث</string>
+    <string name="minutes_letter">%dد</string>
+    <string name="hours_letter">%dس</string>
     <plurals name="seconds">
         <item quantity="one">%d ثانیه</item>
         <item quantity="other">%d ثانیه</item>
@@ -546,4 +546,4 @@
     <string name="three">سه</string>
     <string name="four">چهار</string>
     <string name="thumbnails">نمایه‌ها</string>
-</resources>
+</resources>

commons/src/main/res/values-fi/strings.xml

@@ -1049,9 +1049,9 @@
     <string name="deletion_confirmation_short">Poistetaanko %s?</string>
     <string name="pin">PIN</string>
     <string name="add_password">Lisää salasana</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">t</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dt</string>
     <string name="week_number_short">vko</string>
     <string name="october_short">Lok</string>
     <string name="november_short">Mar</string>
@@ -1071,4 +1071,4 @@
     <string name="translation_romanian">Romania</string>
     <string name="translation_english">Englanti</string>
     <string name="translation_nepali">Nepali</string>
-</resources>
+</resources>

commons/src/main/res/values-fr/strings.xml

@@ -476,7 +476,7 @@
     <string name="seconds_raw">secondes</string>
     <string name="hours_raw">heures</string>
     <string name="days_raw">jours</string>
-    <string name="minutes_letter">min</string>
+    <string name="minutes_letter">%dmin</string>
     <string name="week_number_short">sem</string>
     <plurals name="seconds">
         <item quantity="one">%d seconde</item>
@@ -1115,8 +1115,8 @@ j\'espère que vous appréciez l\'application. Elle ne contient pas d\'annonces,
     <string name="shared_theme_note">Notez que même si vous utilisez la version Pro de l\'application, vous avez toujours besoin de Fossify Thank You pour des raisons techniques. Il s\'occupe de la synchronisation des couleurs.</string>
     <string name="extension">Extension</string>
     <string name="minutes_raw">minutes</string>
-    <string name="seconds_letter">s</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="hours_letter">%dh</string>
     <string name="purchase_simple_thank_you">Acheter Fossify Thank You</string>
     <string name="widgets">Widgets</string>
     <string name="contacts_tab">Contacts</string>

commons/src/main/res/values-ga/strings.xml

@@ -964,9 +964,9 @@
     <string name="minutes_raw">nóiméad</string>
     <string name="hours_raw">uair an chloig</string>
     <string name="days_raw">laethanta</string>
-    <string name="seconds_letter">s</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dh</string>
     <string name="week_number_short">wk.</string>
     <string name="reminder_triggers_in">An t-am atá fágtha go dtí go spreagann an meabhrúchán:\n%s</string>
     <string name="time_remaining">An t-am atá fágtha:\n%s</string>

commons/src/main/res/values-hi-rIN/strings.xml

@@ -675,13 +675,13 @@
     <string name="invalid_password">गलत पासवर्ड</string>
     <string name="yesterday">कल</string>
     <string name="today">आज</string>
-    <string name="seconds_letter">से</string>
+    <string name="seconds_letter">%dसे</string>
     <plurals name="days">
         <item quantity="one">%d दिन</item>
         <item quantity="other">%d दिन</item>
     </plurals>
-    <string name="minutes_letter">मि</string>
-    <string name="hours_letter">घं</string>
+    <string name="minutes_letter">%dमि</string>
+    <string name="hours_letter">%dघं</string>
     <string name="week_number_short">सप्त</string>
     <plurals name="seconds">
         <item quantity="one">%d सेकेंड</item>
@@ -1088,4 +1088,4 @@
     <string name="format_phone_numbers">फोन नंबर प्रारूपित करें</string>
     <string name="platforms">प्लेटफार्म</string>
     <string name="little_to_no_fee">बहुत कम या कोई शुल्क नहीं</string>
-</resources>
+</resources>

commons/src/main/res/values-hr/strings.xml

@@ -450,7 +450,7 @@
     <string name="minutes_raw">minute</string>
     <string name="hours_raw">sati</string>
     <string name="days_raw">dani</string>
-    <string name="minutes_letter">min</string>
+    <string name="minutes_letter">%dmin</string>
     <string name="week_number_short">tj.</string>
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
@@ -1098,8 +1098,8 @@
     <string name="pin">PIN</string>
     <string name="too_many_incorrect_attempts">Previše netočnih pokušaja otključavanja.
 \nPokušaj ponovo za %d sekunde.</string>
-    <string name="seconds_letter">s</string>
-    <string name="hours_letter">h</string>
+    <string name="seconds_letter">%ds</string>
+    <string name="hours_letter">%dh</string>
     <string name="alarm">Alarm</string>
     <string name="start_week_on">Početak tjedna je</string>
     <string name="files_tab">Datoteke</string>
@@ -1143,4 +1143,4 @@
     <string name="all_fossify_apps">Sve Fossify aplikacije</string>
     <string name="translation_central_kurdish">Centralnokurdski</string>
     <string name="known_issues">Poznati problemi</string>
-</resources>
+</resources>

commons/src/main/res/values-hu/strings.xml

@@ -468,9 +468,9 @@
     <string name="minutes_raw">perc</string>
     <string name="hours_raw">óra</string>
     <string name="days_raw">nap</string>
-    <string name="seconds_letter">mp</string>
-    <string name="minutes_letter">p</string>
-    <string name="hours_letter">ó</string>
+    <string name="seconds_letter">%dmp</string>
+    <string name="minutes_letter">%dp</string>
+    <string name="hours_letter">%dó</string>
     <plurals name="seconds">
         <item quantity="one">%d másodperc</item>
         <item quantity="other">%d másodperc</item>

commons/src/main/res/values-in/strings.xml

@@ -972,9 +972,9 @@
     <string name="add_password">Tambahkan kata sandi</string>
     <string name="empty_password">Silakan masukkan kata sandi</string>
     <string name="invalid_password">Kata sandi alah</string>
-    <string name="seconds_letter">d</string>
-    <string name="minutes_letter">m</string>
-    <string name="hours_letter">j</string>
+    <string name="seconds_letter">%dd</string>
+    <string name="minutes_letter">%dm</string>
+    <string name="hours_letter">%dj</string>
     <string name="week_number_short">mg.</string>
     <string name="alarm">Alarm</string>
     <string name="purchase_simple_thank_you">Beli Terima Kasih Fossify</string>