Merge remote-tracking branch 'origin/master'

AUTHORS.md

@@ -5,7 +5,7 @@ AUTHORS
 Trackbook is designed, developed, and maintained by: [y20k](https://github.com/y20k)
 
 ### Translations
-Chinese version: [yzqzss](https://github.com/yzqzss) | [weblate version history](https://hosted.weblate.org/changes/?lang=pt_BR&project=trackbook)
+Chinese version: [yzqzss](https://github.com/yzqzss) | [weblate version history](https://hosted.weblate.org/changes/?lang=zh_Hans&project=trackbook)
 
 Croatian version: [milotype](https://github.com/milotype) | [weblate version history](https://hosted.weblate.org/changes/?lang=hr&project=trackbook)
 

app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt

@@ -64,7 +64,9 @@ class RenameTrackDialog (private var renameTrackListener: RenameTrackListener) {
         builder.setPositiveButton(R.string.dialog_rename_track_button) { _, _ ->
             // hand text over to initiating activity
             inputField.text?.let {
-                renameTrackListener.onRenameTrackDialog(it.toString())
+                var newStationName: String = it.toString()
+                if (newStationName.isEmpty()) newStationName = trackName
+                renameTrackListener.onRenameTrackDialog(newStationName)
             }
         }
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -78,7 +78,7 @@
     <string name="pref_accuracy_threshold_summary">丢弃误差大于指定值的定位：</string>
     <string name="pref_accuracy_threshold_title">误差阈值</string>
     <string name="pref_advanced_title">高级</string>
-    <string name="pref_delete_non_starred_summary">删除所有\"轨迹\"中未加星的记录。</string>
+    <string name="pref_delete_non_starred_summary">删除所有“轨迹“中未加星的记录。</string>
     <string name="pref_delete_non_starred_title">删除未加星的记录</string>
     <string name="pref_general_title">常规</string>
     <string name="pref_maintenance_title">维护</string>

build.gradle

@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.20'
-        navigation_version = '2.3.1'
+        kotlin_version = '1.4.21'
+        navigation_version = '2.3.2'
     }
     repositories {
         google()