Merge branch 'master' into master

2023-01-11 16:52:22 +01:00 · 2023-01-11 16:52:22 +01:00 · 1376349ff4
parent 8461925973 4e8fcd5b47
commit 1376349ff4
17 changed files with 38 additions and 37 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -64,7 +64,7 @@ android {
 }

 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:0eb2785498'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:185891674f'
    implementation 'com.facebook.stetho:stetho:1.5.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'com.shawnlin:number-picker:2.4.6'
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
@ -37,7 +37,7 @@ class MainActivity : SimpleActivity() {
        setupOptionsMenu()
        refreshMenuItems()

-        updateMaterialActivityViews(main_coordinator, main_holder)
+        updateMaterialActivityViews(main_coordinator, main_holder, useTransparentNavigation = false, useTopSearchMenu = false)

        storeStateVariables()
        initFragments()
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
@ -21,7 +21,7 @@ class SettingsActivity : SimpleActivity() {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_settings)

-        updateMaterialActivityViews(settings_coordinator, settings_holder)
+        updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false)
        setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
    }

--- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
@ -16,6 +16,7 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.views.MyRecyclerView
 import kotlinx.android.synthetic.main.item_timer.view.*
+import me.grantland.widget.AutofitHelper
 import org.greenrobot.eventbus.EventBus

 class TimerAdapter(
@ -103,6 +104,7 @@ class TimerAdapter(
            timer_label.setHintTextColor(textColor.adjustAlpha(0.7f))
            timer_label.text = timer.label

+            AutofitHelper.create(timer_time)
            timer_time.setTextColor(textColor)
            timer_time.text = when (timer.state) {
                is TimerState.Finished -> 0.getFormattedDuration()
--- a/app/src/main/res/layout/item_timer.xml
+++ b/app/src/main/res/layout/item_timer.xml
@ -17,11 +17,12 @@
        android:paddingTop="@dimen/medium_margin"
        android:paddingBottom="@dimen/activity_margin">

-        <com.simplemobiletools.commons.views.MyTextView
+        <TextView
            android:id="@+id/timer_time"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:includeFontPadding="false"
+            android:maxLines="1"
            android:textSize="@dimen/alarm_text_size"
            app:layout_constraintEnd_toStartOf="@id/timer_reset"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@ -6,11 +6,6 @@
        android:icon="@drawable/ic_sort_vector"
        android:title="@string/sort_by"
        app:showAsAction="always" />
-    <item
-        android:id="@+id/more_apps_from_us"
-        android:icon="@drawable/ic_google_play_vector"
-        android:title="@string/more_apps_from_us"
-        app:showAsAction="always" />
    <item
        android:id="@+id/settings"
        android:icon="@drawable/ic_settings_cog_vector"
@ -21,4 +16,8 @@
        android:icon="@drawable/ic_info_vector"
        android:title="@string/about"
        app:showAsAction="always" />
+    <item
+        android:id="@+id/more_apps_from_us"
+        android:title="@string/more_apps_from_us"
+        app:showAsAction="never" />
 </menu>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -23,21 +23,20 @@
    <string name="analogue_clock">Αναλογικό Ρολόι</string>
    <string name="digital_clock">Ψηφιακό Ρολόι</string>
    <string name="alarm_dismissed">Η αφύπνιση απορρίφθηκε</string>
-    <string name="alarm_snoozed">Η αφύμνιση σε αναμονή από %s</string>
+    <string name="alarm_snoozed">Η αφύπνιση σε αναμονή από %s</string>
    <string name="no_alarms_found">Δεν βρέθηκαν αφυπνίσεις</string>
    <string name="add_alarm">Προσθήκη αφύπνισης</string>
    <string name="no_timers_found">Δεν βρέθηκαν χρονόμετρα</string>
    <string name="add_timer">Προσθήκη χρονόμετρου</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-
+    <string name="upcoming_alarm">Επερχόμενη αφύπνιση</string>
    <!--Timer-->
-    <string name="timers_notification_msg">Τα χρονόμετρα τρέχουν</string>
-    <string name="timer_single_notification_label_msg">Το χρονόμετρο για %s τρέχει</string>
+    <string name="timers_notification_msg">Τα χρονόμετρα σε λειτουργία</string>
+    <string name="timer_single_notification_label_msg">Το χρονόμετρο για %s σε λειτουργία</string>
    <string name="new_timer">Νέο Χρονόμετρο</string>

    <plurals name="timer_notification_msg">
-        <item quantity="one">%d χρονόμετρο τρέχει</item>
-        <item quantity="other">%d χρονόμετρα τρέχουν</item>
+        <item quantity="one">%d χρονόμετρο σε λειτουργία</item>
+        <item quantity="other">%d χρονόμετρα σε λειτουργία</item>
    </plurals>

    <!-- Settings -->
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -28,7 +28,7 @@
    <string name="add_alarm">Engadir alarma</string>
    <string name="no_timers_found">Non se atoparon temporizadores</string>
    <string name="add_timer">Engadir temporizador</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
+    <string name="upcoming_alarm">Próxima alarma</string>
    <!--Timer-->
    <string name="timers_notification_msg">Os temporizadores atopanse traballando</string>
    <string name="timer_single_notification_label_msg">O temporizador para %s atopase traballando</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -8,7 +8,7 @@
    <string name="clock">Sat</string>
    <string name="timer">Brojač</string>
    <string name="stopwatch">Štoperica</string>
-    <string name="start_stopwatch">Start stopwatch</string>
+    <string name="start_stopwatch">Pokreni štopericu</string>
    <string name="lap">Runda</string>
    <string name="stopwatch_stopped">Štoperica je zaustavljena</string>
    <string name="timer_stopped">Brojač je zaustavljen</string>
@ -28,7 +28,7 @@
    <string name="add_alarm">Dodaj alarm</string>
    <string name="no_timers_found">Nema brojača vremena</string>
    <string name="add_timer">Dodaj brojač vremena</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
+    <string name="upcoming_alarm">Nadolazeći alarm</string>
    <!--Timer-->
    <string name="timers_notification_msg">Brojači su pokrenuti</string>
    <string name="timer_single_notification_label_msg">Brojač za %s je pokrenut</string>
@ -52,4 +52,4 @@
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">Relógio Simples</string>
    <string name="app_launcher_name">Relógio</string>
@ -28,17 +29,15 @@
    <string name="no_timers_found">Nenhum temporizador encontrado</string>
    <string name="add_timer">Adicionar temporizador</string>
    <string name="upcoming_alarm">Próximo alarme</string>
-
    <!--Timer-->
-    <string name="timers_notification_msg">Temporizadores em execução</string>
-    <string name="timer_single_notification_label_msg">Temporizador para %s está em execução</string>
+    <string name="timers_notification_msg">Temporizadores em curso</string>
+    <string name="timer_single_notification_label_msg">Temporizador para %s está em curso</string>
    <string name="new_timer">Novo temporizador</string>
-
    <plurals name="timer_notification_msg">
-        <item quantity="one">%d temporizador em execução</item>
-        <item quantity="other">%d temporizadores em execução</item>
+        <item quantity="one">%d temporizador em curso</item>
+        <item quantity="many">%d temporizadores em curso</item>
+        <item quantity="other">%d temporizadores em curso</item>
    </plurals>
-
    <!-- Settings -->
    <string name="clock_tab">Relógio</string>
    <string name="alarm_tab">Alarme</string>
@ -46,12 +45,11 @@
    <string name="timer_tab">Temporizador</string>
    <string name="show_seconds">Mostrar segundos</string>
    <string name="increase_volume_gradually">Aumentar volume gradualmente</string>
-
    <!-- FAQ -->
-    <string name="faq_1_title">Como posso alterar a classificação das voltas na guia Cronômetro?</string>
-    <string name="faq_1_text">Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam classificadas pela coluna especificada. Com cliques adicionais, você pode alternar a ordem de classificação entre crescente e decrescente.</string>
+    <string name="faq_1_title">Como posso alterar a ordem das voltas no Cronómetro\?</string>
+    <string name="faq_1_text">Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam ordenadas pela coluna especificada. Com cliques adicionais, pode alternar a ordem de entre crescente e decrescente.</string>
    <!--
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -14,8 +14,8 @@

    <dimen name="clock_text_size">70sp</dimen>
    <dimen name="clock_text_size_smaller">60sp</dimen>
-    <dimen name="alarm_text_size">48sp</dimen>
-    <dimen name="stopwatch_text_size">60sp</dimen>
+    <dimen name="alarm_text_size">60sp</dimen>
+    <dimen name="stopwatch_text_size">80sp</dimen>
    <dimen name="widget_time_text_size_small">48sp</dimen>
    <dimen name="widget_details_text_size">14sp</dimen>
    <dimen name="reminder_activity_title_size">32sp</dimen>
--- a/fastlane/metadata/android/ar/full_description.txt
+++ b/fastlane/metadata/android/ar/full_description.txt
@ -24,4 +24,4 @@ https://www.facebook.com/simplemobiletools
 https://www.reddit.com/r/SimpleMobileTools

 برقية:
-https://t.me/SimpleMobileTools
+https://t.me/SimpleMobileTools
--- a/fastlane/metadata/android/ar/short_description.txt
+++ b/fastlane/metadata/android/ar/short_description.txt
@ -1 +1 @@
-مزيج من القطعة ساعة جميلة, المنبه, ساعة توقيت, مؤقت
+مزيج من القطعة ساعة جميلة, المنبه, ساعة توقيت, مؤقت
--- a/fastlane/metadata/android/ar/title.txt
+++ b/fastlane/metadata/android/ar/title.txt
@ -1 +1 @@
-الساعة البسيطة
+الساعة البسيطة
--- a/fastlane/metadata/android/ar/video.txt
+++ b/fastlane/metadata/android/ar/video.txt
@ -0,0 +1 @@
+ 
--- a/fastlane/metadata/android/hr/video.txt
+++ b/fastlane/metadata/android/hr/video.txt
@ -1 +1 @@
-video.txt:1
+ 
--- a/fastlane/metadata/android/uk/video.txt
+++ b/fastlane/metadata/android/uk/video.txt
@ -0,0 +1 @@
+