From 65249f11b2a89b37c10b75725f354e1c6a7c6c88 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 25 May 2023 22:42:15 +0200 Subject: [PATCH] Move Help from Settings to TrackList (overflow menu). Fixes #956. --- .../opentracks/TrackListActivity.java | 6 ++++++ .../settings/MainSettingsFragment.java | 5 ----- .../settings/OpenTracksSettingsFragment.java | 21 ------------------- .../opentracks/settings/SettingsActivity.java | 2 -- src/main/res/menu/track_list.xml | 4 ++++ src/main/res/values-b+es+419/strings.xml | 1 - src/main/res/values-cs/strings.xml | 1 - src/main/res/values-da/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-es/strings.xml | 1 - src/main/res/values-et/strings.xml | 1 - src/main/res/values-eu/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-ga/strings.xml | 1 - src/main/res/values-gl/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-nb/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 1 - src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values-pt-rPT/strings.xml | 1 - src/main/res/values-pt/strings.xml | 1 - src/main/res/values-ru/strings.xml | 1 - src/main/res/values-sk/strings.xml | 1 - src/main/res/values-tr/strings.xml | 1 - src/main/res/values-uk/strings.xml | 1 - src/main/res/values-vi/strings.xml | 1 - src/main/res/values-zh-rTW/strings.xml | 1 - src/main/res/values-zh/strings.xml | 1 - src/main/res/values/settings.xml | 2 -- src/main/res/values/strings.xml | 1 - src/main/res/xml/settings.xml | 9 +++++--- src/main/res/xml/settings_open_tracks.xml | 17 --------------- 33 files changed, 16 insertions(+), 75 deletions(-) delete mode 100644 src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java delete mode 100644 src/main/res/xml/settings_open_tracks.xml diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 4fbc17ff6..a619f02b8 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -381,6 +381,12 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co SearchView searchView = (SearchView) searchMenuItem.getActionView(); searchView.setIconified(false); searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + return true; + } + + if (item.getItemId() == R.id.track_list_help) { + startActivity(IntentUtils.newIntent(this, HelpActivity.class)); + return true; } return super.onOptionsItemSelected(item); diff --git a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java index 186f0a270..f2fd0bfbf 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java @@ -49,11 +49,6 @@ public class MainSettingsFragment extends PreferenceFragmentCompat { ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_api_key)); return true; }); - - findPreference(getString(R.string.settings_open_tracks_key)).setOnPreferenceClickListener(preference -> { - ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_open_tracks_key)); - return true; - }); } @Override diff --git a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java deleted file mode 100644 index 16b130453..000000000 --- a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.dennisguse.opentracks.settings; - -import android.os.Bundle; - -import androidx.preference.PreferenceFragmentCompat; - -import de.dennisguse.opentracks.R; - -public class OpenTracksSettingsFragment extends PreferenceFragmentCompat { - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.settings_open_tracks); - } - - @Override - public void onStart() { - super.onStart(); - ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_open_tracks_title); - } -} diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index 6d6d76c48..ff480ea37 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -93,8 +93,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity fragment = new ImportExportSettingsFragment(); } else if (key.equals(getString(R.string.settings_api_key))) { fragment = new PublicAPISettingsFragment(); - } else if (key.equals(getString(R.string.settings_open_tracks_key))) { - fragment = new OpenTracksSettingsFragment(); } return fragment; diff --git a/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml index 9dca7dfa1..d206e337c 100644 --- a/src/main/res/menu/track_list.xml +++ b/src/main/res/menu/track_list.xml @@ -42,4 +42,8 @@ limitations under the License. android:id="@+id/track_list_settings" android:icon="@drawable/ic_settings_24dp" android:title="@string/menu_settings" /> + + \ No newline at end of file diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index efc7829e5..0d2864860 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -491,7 +491,6 @@ Importar No hay actividades para el filtro especificado %1$.1f mi/h (recomendado) - Open Tracks %1$.1f km/h %1$.1f km/h (recomendado) Deshacer diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 84b812aea..87b45bf9a 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -520,7 +520,6 @@ limitations under the License. Bluetooth senzory Časový interval, Interval vzdálenosti, Maximální vzdálenost, Přesnost Vzhled, Rozložení záznamu, Téma - O programu Vše o projektu OpenTracks Výchozí jednotky a aktivity Uživatelské rozhraní diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index fd1a91c4e..a42fad410 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -537,7 +537,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj Udseende, Optagelse af layout, Tema GPS Filter - Åbne spor Skriv navnet på det layout, der skal tilføjes Alle layoutindstillinger vil blive tilbageført til standardværdierne. Dette vil ikke slette spor på enheden. Nulstil diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index c18a044eb..c5a5f7eb5 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -574,6 +574,5 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Erscheinungsbild, Aufzeichnungslayout, Theme Zeitintervall, Entfernungsintervall, Max Entfernung, Genauigkeit Geschwindigkeit (Knoten) - Open Tracks %1$s: %2$s \ No newline at end of file diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 8326b1508..ec2d94e46 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -542,7 +542,6 @@ limitations under the License. Todo sobre el proyecto OpenTracks Unidades y Actividad predeterminadas Unidades preferidas, Actividad predeterminada, Nombre predeterminado del recorrido - Open Tracks Deshacer No hay un gestor de archivos compatible instalado La API pública de OpenTracks está deshabilitada: esta se puede activar en los ajustes. diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index 10e430783..c204e3d3d 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -498,7 +498,6 @@ limitations under the License. Import/Eksport GPS Kõik OpenTracks Projekti Kohta - OpenTracks Lähtestage Seaded vaikeväärtustele Kohandage oma salvestuspaigutust Andmeväljad rea kohta diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 0fedaee79..2361894f9 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -528,7 +528,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Unitate Hobetsia, Jarduera Lehenetsia, Pistaren Izen Lehenetsia Interfazea Itxura, Grabazioaren Diseinua, Gaia - Ireki Pistak Txirrindularitza Iragazkia Nondik diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 32d9f6fef..dcfea54a2 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -526,7 +526,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Unités préférées, Activité par défaut, Suivi du nom par défaut Unités et activité par défaut A propos du projet OpenTracks - Open Tracks Annuler Nouvelle présentation Filtre diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml index b01d8bc62..d58fa2ec8 100644 --- a/src/main/res/values-ga/strings.xml +++ b/src/main/res/values-ga/strings.xml @@ -208,7 +208,6 @@ Dealramh, Leagan Amach Taifeadta, Téama Braiteoirí Rothaíochta, Imlíne Rothaí, Braiteoirí Reatha Cumasaigh Bluetooth le do thoil. - Open Tracks Gach Maidir Tionscadal OpenTracks Aonaid agus Gníomhaíocht Réamhshocraithe Comhéadan Úsáideora diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index faddd6ef4..82ff343e7 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -505,7 +505,6 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele %1$.1f km/h (recomendado) %1$.1f km/h (recomendado) Reloxo - Open Tracks Unidades preferidas, Actividade por defecto, Nome da ruta A Distancia, Tempo, Voz Velocidade Todo Sobre OpenTracks Proxecto diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 5433038cb..1071fb418 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -506,7 +506,6 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Tutte le impostazioni del layout sono state reimpostate ai valori predefiniti Generico %1$.1f km/h - Binari aperti Tutto a proposito del progetto OpenTracks Interfaccia Utente Aspetto, Layout durante la registrazione, Tema diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 307b7a054..57b3416ae 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -498,7 +498,6 @@ limitations under the License. %1$.1f mi/h %1$.1f mi/h (anbefales) Klokke - OpenTracks Foretrukne enheter, forvalgsaktivitet, forvalgt spornavn Sykkelsensorer, hjulomkrets, løpesensorer Alt om OpenTracks-prosjektet diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 03c0c77ad..a06f28727 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -549,7 +549,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Gegevensvelden per rij %1$.1f mi/u %1$.1f mi/u (aanbevolen) - Open Tracks Alles over het OpenTracks Project training Lay-outs terugzetten\? diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index c2d00a119..e8d16a6d1 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -536,7 +536,6 @@ limitations under the License. Usuń Główny Poboczny - Otwarte tory Wszystko o projekcie OpenTacks Domyślne Jednostki i Aktywności Preferowane Jednostki, Domyślne Aktywności, Nazwy Treningów diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index c5a62c094..0c905c906 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -458,7 +458,6 @@ Interface do usuário Unidades e Atividade Default Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista - Trilhas abertas GPS Redefinir configurações para valores padrão Defaults da atividade diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 0bb44c362..4dc43124d 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -440,7 +440,6 @@ Energia Avg Não foi possível procurar aparelhos Bluetooth (erro %1$i). Ative o Bluetooth. - Trilhas abertas Tudo sobre o Projeto OpenTracks Unidades e Atividade Default Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index afeb7d517..a23082aa0 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -444,7 +444,6 @@ limitations under the License. Energia Avg Não foi possível procurar aparelhos Bluetooth (erro %1$i). Ative o Bluetooth. - Trilhas abertas Tudo sobre o Projeto OpenTracks Unidades e Atividade Default Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 3ce175acb..f39359bc5 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -505,7 +505,6 @@ limitations under the License. Только OpenTracks может запускать и останавливать запись. %1$.1f миль/ч (рекомендуется) Невозможно записать в папку экспорта. - Open Tracks Всё о проекте OpenTracks Предпочитаемые единицы, активность по умолчанию, название трека Изменить раскладку записи diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index f33fbbb16..07d331bdc 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -511,7 +511,6 @@ limitations under the License. Predvolené jednotky, predvolená aktivita, predvolený názov skladby Používateľské rozhranie Vzhľad, Rozloženie nahrávania, Téma - Otvorené trate Hlasové oznámenia GPS Senzory Bluetooth diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 33d7b401b..c45d0354f 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -427,7 +427,6 @@ limitations under the License. Maks. Kalp atış hızı Bluetooth cihazları taranamadı (%1$i hatası). Lütfen Bluetooth\'u etkinleştirin. - Open Tracks OpenTracks Projesi hakkında her şey OpenTracks\'i nasıl destekleyebilirim\? %1$s parçası hedef dizinde zaten var. diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index b457e969a..8ffe4a2a4 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -516,7 +516,6 @@ limitations under the License. Каденція частота серцебиття Переважні одиниці виміру, активність за замовчуванням, Ім\'я треку за замовчуванням - Відкриті доріжки Все про проект OpenTracks Одиниці виміру і дії за замовчуванням Інтерфейс користувача diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 80e1bf543..1842880fc 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -492,7 +492,6 @@ limitations under the License. %1$.1f km/h %1$.1f km/h (khuyến khích) Cái đồng hồ - Mở Bài Hát Thiết lập lại các thiết Lập để mặc Định giá Trị Hoạt động của Mặc định Đơn vị diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 9a49382a0..402d382d0 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -323,7 +323,6 @@ limitations under the License. 平均功率 無法掃描藍牙裝置 (錯誤 %1$i). 請啟用藍芽。 - Open Tracks 所有關於 OpenTracks 專案 預設單位與活動 首選單位、預設活動、蹤跡預設名稱 diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index ff393a649..371e00cc0 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -579,7 +579,6 @@ limitations under the License. 已取消，照片标记没有被添加 平均步频 无法扫描蓝牙设备（错误：%1$i）。 - Open Tracks 单位 每行数据字段数 平均心率 diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 9faf25f51..a2ad42e87 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -11,8 +11,6 @@ false - settingsOpenTracks - settingsDefaults settingsUI diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cd1eb1536..cf47f8a9a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -336,7 +336,6 @@ limitations under the License. Could not scan for Bluetooth devices (error %1$i). Please enable Bluetooth. - Open Tracks All About OpenTracks Project Default Units and Activity diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index 6937ca0f8..69cb5e7e7 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -54,12 +54,15 @@ android:icon="@drawable/ic_baseline_api_24" android:key="@string/settings_api_key" android:summary="@string/settings_api_summary" - android:title="@string/settings_api_title"/> + android:title="@string/settings_api_title" /> + android:title="@string/about_preference_title"> + + diff --git a/src/main/res/xml/settings_open_tracks.xml b/src/main/res/xml/settings_open_tracks.xml deleted file mode 100644 index 8ec3f6322..000000000 --- a/src/main/res/xml/settings_open_tracks.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file