diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3ccac3..af93e0c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,11 +6,11 @@
+
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a93b03f..d3076fc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -54,8 +100,8 @@
android:layout_gravity="bottom|end"
android:layout_marginEnd="8dp"
android:clickable="true"
- android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_1"
+ android:focusable="true"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
@@ -74,9 +120,7 @@
android:text="@string/fab_sub_menu_save"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"
- android:textStyle="bold"
- tools:layout_editor_absoluteX="110dp"
- tools:layout_editor_absoluteY="239dp" />
+ android:textStyle="bold" />
@@ -87,8 +131,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:clickable="true"
- android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_2"
+ android:focusable="true"
app:backgroundTint="@color/trackbook_blue"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fabMainButton"
@@ -102,8 +146,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:clickable="true"
- android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_2"
+ android:focusable="true"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
@@ -122,9 +166,7 @@
android:text="@string/fab_sub_menu_clear"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"
- android:textStyle="bold"
- tools:layout_editor_absoluteX="124dp"
- tools:layout_editor_absoluteY="447dp" />
+ android:textStyle="bold" />
@@ -136,8 +178,8 @@
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:clickable="true"
- android:focusable="true"
android:contentDescription="@string/descr_fab_main"
+ android:focusable="true"
app:backgroundTint="@color/trackbook_blue"
app:fabSize="normal"
app:layout_constraintBottom_toTopOf="@+id/navigation"
@@ -160,14 +202,15 @@
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/menu_main" />
+
+ android:id="@+id/fragmentContainer"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toTopOf="@+id/navigation"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ec1d41c..e5dded1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,11 +19,13 @@
Aufzeichnung angehalten
Aufzeichnung gestartet
+ Aufzeichnung fortgesetzt
Standortdienste sind deaktiviert. Trackbook wird nicht funktionieren.
Zurücksetzen
Speichernn
+ Fortsetzen
Abbrechen
@@ -96,10 +98,12 @@
Kartierung der letzten Aufzeichnung
Mein-Standort-Button
Haupt-Aktionsbutton
- Beschreibung des Speichern-und-Zurücksetzen-Buttons
- kleiner Speichern-und-Zurücksetzen-Button
+ Beschreibung des Speichern-Buttons
+ kleiner Speichern-Button
Beschreibung des Zurücksetzen-Buttons
kleiner Zurücksetzen-Button
+ Beschreibung des Fortsetzen-Buttons
+ kleiner Fortsetzen-Button
Überschrift der Statistik-Einblendung
Informations-Icon
Datenpunkt: Distanz
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index e0a71dd..18bcad4 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -19,11 +19,13 @@
Pelacakan berhenti
Pelacakan dimulai
+ Tracking resumed
Location is turned off. Trackbook will not work.
Clear
Save and Clear
+ Resume
Cancel
@@ -100,6 +102,8 @@
small Save and Clear button
Label of the Clear button
small Clear button
+ Label of the Resume button
+ small Resume button
Headline of the statistics sheet
Icon of a bar chart
Data point: Distance
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 580bba5..9b6385c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,11 +19,13 @@
Tracciamento interrotto
Tracciamento avviato
+ Tracking resumed
La posizione è disattivata. Trackbook non può funzionare.
Cancella
Salva e ripristina la mappa
+ Resume
Annulla
@@ -100,6 +102,8 @@
piccolo pulsante Salva e ripristina la mappa
Etichetta del pulsante Cancella
piccolo pulsante Cancella
+ Label of the Resume button
+ small Resume button
Titolo scheda statistiche
Icona grafico a barre
Data point: Distanza
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2858d0e..a7d447b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,11 +19,13 @@
トレースを停止しました
トレースを開始しました
+ Tracking resumed
位置情報がオフです。Trackbook は動作しません。
クリア
保存してクリア
+ Resume
キャンセル
@@ -100,6 +102,8 @@
小さな保存してクリア ボタン
クリア ボタンのラベル
小さなクリア ボタン
+ Label of the Resume button
+ small Resume button
統計情報シートの見出し
情報アイコン
データ地点: 距離
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c6a73e4..6c583e4 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -19,11 +19,13 @@
Sporing stoppet
Sporing startet
+ Tracking resumed
Plassering avskrudd. Trackbook bil ikke fungere.
Tøm
Lagre og tøm
+ Resume
Avbryt
@@ -100,6 +102,8 @@
liten Lagre- og Tøm-knapp
Etikett for Tøm-knappen
liten Tøm-knapp
+ Label of the Resume button
+ small Resume button
Overskrift for statistikkarket
Informasjonsikon
Datapunkt: Distanse
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6cf909f..5650a67 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,11 +19,13 @@
Bijhouden gestopt
Bijhouden gestart
+ Tracking resumed
Locatie is uitgeschakeld; Trackbook zal niet werken.
Wissen
Opslaan en wissen
+ Resume
Cancel
@@ -100,6 +102,8 @@
kleine Opslaan en wissen-knop
Label van de Wissen-knop
kleine Wissen-knop
+ Label of the Resume button
+ small Resume button
Kop van het statistiekenblad
Informatiepictogram
Gegevenspunt: afstand
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2c653fa..2c1b875 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,11 +19,13 @@
Tracking stopped
Tracking started
+ Tracking resumed
Location is turned off. Trackbook will not work.
Clear
Save
+ Resume
Cancel
@@ -96,10 +98,12 @@
Mapping of last track
My Location Button
Main Action Button
- Label of the Save and Clear button
- small Save and Clear button
+ Label of the Save button
+ small Save button
Label of the Clear button
small Clear button
+ Label of the Resume button
+ small Resume button
Headline of the statistics sheet
Information icon
Data point: Distance
diff --git a/build.gradle b/build.gradle
index 9be65d9..0a139de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ allprojects {
}
project.ext {
applicationId = 'org.y20k.trackbook'
- versionCode = 21
- versionName = '1.1.5'
+ versionCode = 22
+ versionName = '1.1.6'
minSdkVersion = 22
compileSdkVersion = 27
targetSdkVersion = 27