voussoir/trkpt
1
0
Fork 0
Code Issues Projects Releases Packages Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
y20k 2021-03-04 19:56:24 +01:00
commit dd3a96e350
No known key found for this signature in database
GPG key ID: 824D4259F41FAFF6
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS.md
View file

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

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

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

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

@ -78,7 +78,7 @@
<string name="pref_accuracy_threshold_summary">丢弃误差大于指定值的定位：</string> <string name="pref_accuracy_threshold_summary">丢弃误差大于指定值的定位：</string>
<string name="pref_accuracy_threshold_title">误差阈值</string> <string name="pref_accuracy_threshold_title">误差阈值</string>
<string name="pref_advanced_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_delete_non_starred_title">删除未加星的记录</string>
<string name="pref_general_title">常规</string> <string name="pref_general_title">常规</string>
<string name="pref_maintenance_title">维护</string> <string name="pref_maintenance_title">维护</string>

4
build.gradle
View file

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