cleaning up

README.md

@@ -4,7 +4,7 @@ README
 Trackbook - Movement Recorder for Android
 -----------------------------------------
 
-**Version 1.1.x BETA ("Sheep")**
+**Version 1.1.x ("Sheep")**
 
 Trackbook is a bare bones app for recording your movements. Trackbook is great for hiking, vacation or workout. Once started it traces your movements on a map. The map data is provided by [OpenStreetMap (OSM)](https://www.openstreetmap.org/).
 

app/src/main/java/org/y20k/trackbook/MainActivity.java

@@ -218,15 +218,6 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
     }
 
 
-//    @Override
-//    public void onRestoreInstanceState(Bundle savedInstanceState) {
-//        super.onRestoreInstanceState(savedInstanceState);
-//        mTrackerServiceRunning = savedInstanceState.getBoolean(INSTANCE_TRACKING_STATE, false);
-//        mSelectedTab = savedInstanceState.getInt(INSTANCE_SELECTED_TAB, FRAGMENT_ID_MAP);
-//        mFloatingActionButtonSubMenuVisible = savedInstanceState.getBoolean(INSTANCE_FAB_SUB_MENU_VISIBLE, false);
-//    }
-
-
     /* Handles FloatingActionButton dialog results - called by MainActivityMapFragment after Saving and/or clearing the map */
     public void onFloatingActionButtonResult(int requestCode, int resultCode) {
         switch(requestCode) {
@@ -340,7 +331,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
             mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
             // set up the ViewPager with the sections adapter.
-            mViewPager = (NonSwipeableViewPager) findViewById(R.id.container2);
+            mViewPager = (NonSwipeableViewPager) findViewById(R.id.fragmentContainer);
             mViewPager.setAdapter(mSectionsPagerAdapter);
 
             // setup bottom navigation
@@ -349,7 +340,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
 
             // get references to the record button and show/hide its sub menu
             mFloatingActionButtonMain = findViewById(R.id.fabMainButton);
-            mFloatingActionButtonLocation = findViewById(R.id.fabLLcationButton);
+            mFloatingActionButtonLocation = findViewById(R.id.fabLocationButton);
             mFloatingActionButtonSubSave = findViewById(R.id.fabSubMenuButtonSave);
             mFloatingActionButtonSubSaveLabel = findViewById(R.id.fabSubMenuLabelSave);
             mFloatingActionButtonSubClear = findViewById(R.id.fabSubMenuButtonClear);
@@ -560,10 +551,6 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
                         mSelectedTab = FRAGMENT_ID_MAP;
                         mViewPager.setCurrentItem(mSelectedTab);
 
-                        // tint bottom bar red
-                        mBottomNavigationView.setBackgroundResource(R.color.trackbook_red);
-                        mBottomNavigationView.setItemBackgroundResource(R.color.trackbook_red);
-
                         return true;
 
                     case R.id.navigation_last_tracks:
@@ -578,10 +565,6 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
                         mSelectedTab = FRAGMENT_ID_TRACKS;
                         mViewPager.setCurrentItem(mSelectedTab);
 
-                        // tint bottom bar blue
-                        mBottomNavigationView.setBackgroundResource(R.color.trackbook_blue);
-                        mBottomNavigationView.setItemBackgroundResource(R.color.trackbook_blue);
-
                         return true;
 
                     default:
@@ -712,6 +695,7 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
             return null;
         }
 
+        @NonNull
         @Override
         public Object instantiateItem(final ViewGroup container, final int position) {
             final Fragment fragment = (Fragment) super.instantiateItem(container, position);

app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java

@@ -31,6 +31,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.LocalBroadcastManager;
@@ -156,7 +157,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
 
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // create basic map
         mMapView = new MapView(inflater.getContext());
 
@@ -324,7 +325,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys {
 
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putBoolean(INSTANCE_FIRST_START, mFirstStart);
         outState.putBoolean(INSTANCE_TRACKING_STATE, mTrackerServiceRunning);
         outState.putParcelable(INSTANCE_CURRENT_LOCATION, mCurrentBestLocation);

app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java

@@ -83,8 +83,6 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
     private ConstraintLayout mTrackManagementLayout;
     private Spinner mDropdown;
     private View mStatisticsSheet;
-    private ImageButton mStatisticsIcon;
-    private TextView mStatisticsHeadline;
     private TextView mDistanceView;
     private TextView mStepsView;
     private TextView mWaypointsView;
@@ -149,7 +147,7 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         // inflate root view from xml
         mRootView = inflater.inflate(R.layout.fragment_main_track, container, false);
@@ -199,8 +197,6 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
 
         // get views for statistics sheet
         View statisticsView = mRootView.findViewById(R.id.statistics_view);
-        mStatisticsIcon = mRootView.findViewById(R.id.statistics_icon);
-        mStatisticsHeadline = mRootView.findViewById(R.id.statistics_headline);
         mStatisticsSheet = mRootView.findViewById(R.id.statistics_sheet);
         mDistanceView = (TextView) mRootView.findViewById(R.id.statistics_data_distance);
         mStepsView = (TextView) mRootView.findViewById(R.id.statistics_data_steps);
@@ -243,7 +239,7 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
 
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mDropdown.setAdapter(mDropdownAdapter);
         mDropdown.setOnItemSelectedListener(this);
@@ -301,7 +297,7 @@ public class MainActivityTrackFragment extends Fragment implements AdapterView.O
 
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putDouble(INSTANCE_LATITUDE_TRACK_MAP, mMapView.getMapCenter().getLatitude());
         outState.putDouble(INSTANCE_LONGITUDE_TRACK_MAP, mMapView.getMapCenter().getLongitude());
         outState.putInt(INSTANCE_ZOOM_LEVEL_TRACK_MAP, mMapView.getZoomLevel());

app/src/main/java/org/y20k/trackbook/helpers/MapHelper.java

@@ -19,7 +19,7 @@ package org.y20k.trackbook.helpers;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.location.Location;
-import android.support.v7.widget.AppCompatDrawableManager;
+import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
 import org.osmdroid.util.GeoPoint;
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-
 /**
  * MapHelper class
  */
@@ -52,11 +51,9 @@ public final class MapHelper {
         // create marker
         Drawable newMarker;
         if (locationIsNew) {
-            // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+            newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_dot_blue_24dp);
-            newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_dot_blue_24dp);
         } else {
-            //noinspection RestrictedApi
+            newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_dot_grey_24dp);
-            newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_dot_grey_24dp);
         }
         OverlayItem overlayItem = createOverlayItem(context, currentBestLocation);
         overlayItem.setMarker(newMarker);
@@ -104,12 +101,10 @@ public final class MapHelper {
             if (trackingActive && !currentPosition) {
                 if (wayPoint.getIsStopOver()) {
                     // stop over marker
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_crumb_grey_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_crumb_grey_24dp);
                 } else {
                     // default marker for this case
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_crumb_red_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_crumb_red_24dp);
                 }
             }
 
@@ -117,12 +112,10 @@ public final class MapHelper {
             else if (trackingActive && currentPosition) {
                 if (wayPoint.getIsStopOver()) {
                     // stop over marker
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_dot_grey_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_dot_grey_24dp);
                 } else {
                     // default marker for this case
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_dot_red_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_dot_red_24dp);
                 }
             }
 
@@ -130,20 +123,17 @@ public final class MapHelper {
             else if (!trackingActive && !currentPosition) {
                 if (wayPoint.getIsStopOver()) {
                     // stop over marker
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_crumb_grey_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_crumb_grey_24dp);
                 } else {
                     // default marker for this case
-                    // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                    newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_crumb_blue_24dp);
-                    newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_crumb_blue_24dp);
                 }
             }
 
             // CASE 4: Tracking not active and WayPoint is current position
             else {
                 // default marker
-                // noinspection RestrictedApi // TODO remove as soon as support library gets updated
+                newMarker = ContextCompat.getDrawable(context, R.drawable.ic_my_location_crumb_blue_24dp);
-                newMarker = AppCompatDrawableManager.get().getDrawable(context, R.drawable.ic_my_location_crumb_blue_24dp);
             }
 
             // create overlay item

app/src/main/res/layout/activity_main.xml

@@ -16,11 +16,13 @@
 
         <!-- BUTTON MY LOCATION -->
         <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fabLLcationButton"
+            android:id="@+id/fabLocationButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:clickable="true"
+            android:focusable="true"
+            android:contentDescription="@string/descr_fab_my_location"
             app:backgroundTint="@color/trackbook_white"
             app:fabSize="mini"
             app:layout_constraintBottom_toBottomOf="@+id/fabMainButton"
@@ -35,6 +37,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
+            android:clickable="true"
+            android:focusable="true"
             android:contentDescription="@string/descr_fab_sub_menu_button_1"
             app:backgroundTint="@color/trackbook_green"
             app:fabSize="mini"
@@ -49,6 +53,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_marginEnd="8dp"
+            android:clickable="true"
+            android:focusable="true"
             android:contentDescription="@string/descr_fab_sub_menu_button_1"
             app:cardBackgroundColor="@color/trackbook_white"
             app:cardCornerRadius="4dp"
@@ -79,6 +85,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
+            android:clickable="true"
+            android:focusable="true"
             android:contentDescription="@string/descr_fab_sub_menu_button_2"
             app:backgroundTint="@color/trackbook_blue"
             app:fabSize="mini"
@@ -92,6 +100,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
+            android:clickable="true"
+            android:focusable="true"
             android:contentDescription="@string/descr_fab_sub_menu_label_2"
             app:cardBackgroundColor="@color/trackbook_white"
             app:cardCornerRadius="4dp"
@@ -123,6 +133,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:layout_marginEnd="16dp"
+            android:clickable="true"
+            android:focusable="true"
             android:contentDescription="@string/descr_fab_main"
             app:backgroundTint="@color/trackbook_blue"
             app:fabSize="normal"
@@ -137,6 +149,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="@color/trackbook_red"
+            android:clickable="true"
+            android:focusable="true"
             app:itemIconTint="@drawable/selector_bottom_navigation"
             app:itemTextColor="@drawable/selector_bottom_navigation"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -145,7 +159,7 @@
             app:menu="@menu/menu_main" />
 
         <org.y20k.trackbook.layout.NonSwipeableViewPager
-            android:id="@+id/container2"
+            android:id="@+id/fragmentContainer"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/navigation"

app/src/main/res/layout/fragment_main_track_statistics.xml

@@ -21,7 +21,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <ImageView
         android:id="@+id/statistics_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

app/src/main/res/values-de/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Infosheet</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">Mein Standort</string>
-    <string name="menu_about">Über Trackbook</string>
 
     <!-- headers -->
-    <string name="header_about">Über Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Karte</string>
-    <string name="tab_last_track">Letzte Aufzeichnung</string>
     <string name="tab_last_tracks">Letzte Aufzeichnungen</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Bewegungsaufzeichnungen</string>
     <string name="track_tab_onboarding_h1_part_2">… werden hier erscheinen.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">Über Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Bewegungsrekorder für Android</string>
-    <string name="infosheet_about_h3_version">Version 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook ist eine minimalistische App, um Standort-Bewegungen aufzuzeichnen. Trackbook eignet sich für Wandern, Urlaub und Sport. Im Aufnahmemodus werden Deine Bewegungen auf einer Karte nachgezeichnet. Die Kartendaten stammen von OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook ist Freie Software. Der Quellcode befindet sich auf GitHub. GitHub ist auch ein guter Ort, um Bugs zu melden oder um sich bei Interesse an der Weiterentwicklung zu beteiligen. Trackbook ist unter der MIT Open Source Lizenz veröffentlicht. Trackbook nutzt osmdroid um die Karten darstellen. osmdroid ist ebenfalls freie Software und ist unter der Apache Lizenz veröffentlicht.</string>
-    <string name="infosheet_about_h2_permissions">Welche Berechtigungen benötigt Trackbook?</string>
-    <string name="infosheet_about_h3_internet">Berechtigung INTERNET</string>
-    <string name="infosheet_about_p_internet">Trackbook lädt Kartendaten OpenStreetMap Servern und benötigt daher Zugang zum Internet.</string>
-    <string name="infosheet_about_h3_location">Berechtigung ACCESS_COARSE_LOCATION und ACCESS_FINE_LOCATION</string>
-    <string name="infosheet_about_p_location">Trackbook benötigt präzise GPS Informationen, um Bewegungen aufzeichnen zu können. Wenn GPS nicht verfügbar ist, oder wenn die GPS-Daten zu ungenau sind, nutzt Trackbook zur Ortung Mobilfunk- und WLAN-Triangulation.</string>
-    <string name="infosheet_about_h3_network">Berechtigung ACCESS_WIFI_STATE and ACCESS_NETWORK_STATE</string>
-    <string name="infosheet_about_p_network">Trackbook nutzt osmdroid für die Kartendarstellung. osmdroid benötigt Informationen über den aktuellen Netzwerkstatus Deines Geräts.</string>
-    <string name="infosheet_about_h3_external">Berechtigung WRITE_EXTERNAL_STORAGE</string>
-    <string name="infosheet_about_p_external">Trackbook nutzt osmdroid. osmdroid speichert Kartendaten im Externen Speicher von Android. Der Karten-Cache befindet sich im Ordner osmdroid auf der obersten Ebene des für Nutzer sichtbaren Dateisystems.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Karte der aktuellen Aufzeichnung</string>
     <string name="descr_map_last_track">Karte der letzten Aufzeichnung</string>
+    <string name="descr_fab_my_location">Mein-Standort-Button</string>
     <string name="descr_fab_main">Haupt-Aktionsbutton</string>
     <string name="descr_fab_sub_menu_label_1">Beschreibung des Speichern-und-Zurücksetzen-Buttons</string>
     <string name="descr_fab_sub_menu_button_1">kleiner Speichern-und-Zurücksetzen-Button</string>

app/src/main/res/values-id/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Infosheet</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">Lokasi Saya</string>
-    <string name="menu_about">Tentang</string>
 
     <!-- headers -->
-    <string name="header_about">Tentang Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Peta</string>
-    <string name="tab_last_track">Jalur Terakhir</string>
     <string name="tab_last_tracks">Jalur Terakhir</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Your recorded tracks</string>
     <string name="track_tab_onboarding_h1_part_2">… will show up here.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">About Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Movement Recorder for Android</string>
-    <string name="infosheet_about_h3_version">Version 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook is a bare bones app for recording your movements. Trackbook is great for hiking, vacation or workout. Once started it traces your movements on a map. The map data is provided by OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook is free software. You can find the code on GitHub. GitHub is also a good place to file bugs or even to contribute, if you are interested. Trackbook is published under the MIT open source license. Trackbook uses osmdroid to display the map, which is also free software published under the Apache License.</string>
-    <string name="infosheet_about_h2_permissions">Which Permissions does Trackbook need?</string>
-    <string name="infosheet_about_h3_internet">Permission INTERNET</string>
-    <string name="infosheet_about_p_internet">Trackbook needs to download map data from OpenStreetMap servers and therefore needs access to the internet.</string>
-    <string name="infosheet_about_h3_network">Permissions ACCESS_WIFI_STATE and ACCESS_NETWORK_STATE</string>
-    <string name="infosheet_about_p_network">Trackbook uses osmdroid to draw its maps. osmdroid needs to know the current state of your device’s connectivity.</string>
-    <string name="infosheet_about_h3_location">Permissions ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION</string>
-    <string name="infosheet_about_p_location">Trackbook needs accurate GPS location data to be able to record your movements. If the GPS data is not available or not accurate enough Trackbook uses location data from cell tower and WiFi triangulation.</string>
-    <string name="infosheet_about_h3_external">Permission WRITE_EXTERNAL_STORAGE</string>
-    <string name="infosheet_about_p_external">Trackbook uses osmdroid, which caches map tiles on Android\'s external storage. You can find the map cache in the osmdroid folder on the top level of the user-facing file system.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Mapping of current track</string>
     <string name="descr_map_last_track">Mapping of last track</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">Main Action Button</string>
     <string name="descr_fab_sub_menu_label_1">Label of the Save and Clear button</string>
     <string name="descr_fab_sub_menu_button_1">small Save and Clear button</string>

app/src/main/res/values-it/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Scheda informativa</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">La mia posizione</string>
-    <string name="menu_about">Altro su</string>
 
     <!-- headers -->
-    <string name="header_about">Altro su Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Mappa</string>
-    <string name="tab_last_track">Ultima Traccia</string>
     <string name="tab_last_tracks">Ultime Tracce</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Le tue tracce</string>
     <string name="track_tab_onboarding_h1_part_2">… appaririranno qui.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">Altro su Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Geolocalizzatore per Android</string>
-    <string name="infosheet_about_h3_version">Versione 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook è un\'applicazione per registrare i tuoi movimenti. Trackbook è ottimo per escursioni, vacanze o per i tuoi allenamenti. Una volta avviato, tiena traccia dei tuoi movimenti su una mappa. I dati della mappa sono forniti da OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook è software libero. È possibile trovare il codice sorgente su GitHub; inoltre questa piattaforma è anche un buon posto per inserire segnalazioni, suggerimenti o modifiche. Trackbook è pubblicato sotto la licenza open source MIT. Trackbook utilizza osmdroid per visualizzare la mappa, che è anch\'esso un software libero, pubblicato sotto licenza Apache.</string>
-    <string name="infosheet_about_h2_permissions">Quali autorizzazioni sono necessarie a Trackbook??</string>
-    <string name="infosheet_about_h3_internet">Autorizzazione INTERNET</string>
-    <string name="infosheet_about_p_internet">Trackbook deve scaricare i dati della mappa dai server OpenStreetMap quindi ha bisogno di accedere a Internet.</string>
-    <string name="infosheet_about_h3_network">Autorizzazione ACCESS_WIFI_STATE e ACCESS_NETWORK_STATE</string>
-    <string name="infosheet_about_p_network">Trackbook utilizza osmdroid per disegnare le mappe. osmdroid deve conoscere lo stato attuale della connettività sul dispositivo.</string>
-    <string name="infosheet_about_h3_location">Autorizzazione ACCESS_COARSE_LOCATION e ACCESS_FINE_LOCATION</string>
-    <string name="infosheet_about_p_location">Trackbook necessita dei dati GPS precisi sulla posizione per poter registrare i tuoi movimenti. Se i dati GPS non sono disponibili o non sono abbastanza precisi, Trackbook utilizza i dati di localizzazione dalla cella e dalla triangolazione WiFi.</string>
-    <string name="infosheet_about_h3_external">Autorizzazione WRITE_EXTERNAL_STORAGE</string>
-    <string name="infosheet_about_p_external">Trackbook usa osmdroid, questa tecnologia memorizza porzioni di mappa sull\'SD esterna di Android. È possibile trovare la cache della mappa nella cartella osmdroid sul file system.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Mappatura della traccia corrente</string>
     <string name="descr_map_last_track">Mappatura dell\'ultima traccia</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">Pulsante di azione principale</string>
     <string name="descr_fab_sub_menu_label_1">Etichetta del pulsante Salva e ripristina la mappa</string>
     <string name="descr_fab_sub_menu_button_1">piccolo pulsante Salva e ripristina la mappa</string>

app/src/main/res/values-ja/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">情報シート</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">私の場所</string>
-    <string name="menu_about">アプリについて</string>
 
     <!-- headers -->
-    <string name="header_about">Trackbook について</string>
 
     <!-- tabs -->
     <string name="tab_map">地図</string>
-    <string name="tab_last_track">最後のトレース</string>
     <string name="tab_last_tracks">最後のトレース</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">記録したトレース</string>
     <string name="track_tab_onboarding_h1_part_2">… ここに表示されます。</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">Trackbook について</string>
-    <string name="infosheet_about_h2_recorder">Android 用の移動レコーダー</string>
-    <string name="infosheet_about_h3_version">バージョン 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook は、動きを記録するためベアボーンアプリです。Trackbook は、ハイキング、旅行、運動に最適です。 開始すると、地図にあなたの動きをトレースします。 地図データは、OpenStreetMap (OSM) によって提供されます。</string>
-    <string name="infosheet_about_p_free">Trackbook はフリー ソフトウェアです。コードは GitHub 上で見つけることができます。GitHub は、バグの報告するのに良い場所です。興味があれば、貢献にも。Trackbook は、MIT オープン ソース ライセンスの下で公開されます。Trackbook は、Apache ライセンスの下で公開されるフリー ソフトウェアでもある、osmdroid を使用して地図を表示します。</string>
-    <string name="infosheet_about_h2_permissions">Trackbook には何のアクセス許可が必要ですか?</string>
-    <string name="infosheet_about_h3_internet">インターネット アクセス許可</string>
-    <string name="infosheet_about_p_internet">Trackbook は、OpenStreetMap サーバーから地図データをダウンロードする必要があります。したがって、インターネットへのアクセスが必要です。</string>
-    <string name="infosheet_about_h3_network">ACCESS_WIFI_STATE および ACCESS_NETWORK_STATE アクセス許可</string>
-    <string name="infosheet_about_p_network">Trackbook は、osmdroid を使用して地図を描画します。osmdroid は、デバイスの接続の現在の状態を知る必要があります。</string>
-    <string name="infosheet_about_h3_location">ACCESS_COARSE_LOCATION および ACCESS_FINE_LOCATION アクセス許可</string>
-    <string name="infosheet_about_p_location">Trackbook は、あなたの動きを記録できるように、正確な GPS の位置データを必要があります。GPS データが利用できないか、正確ではない場合、Trackbook は基地局および WiFi の三角測量の場所データを使用します。</string>
-    <string name="infosheet_about_h3_external">WRITE_EXTERNAL_STORAGE アクセス許可</string>
-    <string name="infosheet_about_p_external">Trackbook は、Android の外部ストレージに地図タイルをキャッシュする osmdroid を使用します。地図キャッシュは、ユーザー向けファイル・システムの最上位レベルの osmdroid フォルダーで見つけることができます。</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">現在のトレースのマッピング</string>
     <string name="descr_map_last_track">最後のトレースのマッピング</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">メイン アクション ボタン</string>
     <string name="descr_fab_sub_menu_label_1">保存とクリア ボタンのラベル</string>
     <string name="descr_fab_sub_menu_button_1">小さな保存してクリア ボタン</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Infoark</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">Min plasssering</string>
-    <string name="menu_about">Om</string>
 
     <!-- headers -->
-    <string name="header_about">Om Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Kart</string>
-    <string name="tab_last_track">Siste Tur</string>
     <string name="tab_last_tracks">Siste Turer</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Dine registrerte turer</string>
     <string name="track_tab_onboarding_h1_part_2">… vil vises her.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">Om Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Bevegelsesopptaker for Android</string>
-    <string name="infosheet_about_h3_version">Versjon 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook er et minimalistisk program for opptak av dine bevegelser. Trackbook er bra for turgåing, reise eller trening. Når det er startet sporer det bevegelsene dine på et kart. Kartdataene kommer fra OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook er fri programvare. Kildekoden er å finne på GitHub og det er også et bra sted å rapportere feil eller bidra, hvis du er interessert. Trackbook er utgitt under MIT åpenkildekode-lisens. Trackbook bruker osmdroid til å vise kartet, som også er fri programvare utgitt med Apache-lisens.</string>
-    <string name="infosheet_about_h2_permissions">Hvilke tilganger trenger Trackbook?</string>
-    <string name="infosheet_about_h3_internet">Tilgang INTERNETT</string>
-    <string name="infosheet_about_p_internet">Trackbook må laste ned kartdata fra OpenStreetMap-tjenere og må derfor ha tilgang til Internett.</string>
-    <string name="infosheet_about_h3_network">Tilgangene ACCESS_WIFI_STATE og ACCESS_NETWORK_STATE</string>
-    <string name="infosheet_about_p_network">Trackbook bruker osmdroid til å tegne kartene. osmdroid trenger å vite gjeldende tilstand for din enhets tilkobling.</string>
-    <string name="infosheet_about_h3_location">Tilgangene ACCESS_COARSE_LOCATION og ACCESS_FINE_LOCATION</string>
-    <string name="infosheet_about_p_location">Trackbook trenger nøyaktig GPS-data for å kunne registrere bevegelsene dine. Hvis GPS-dataen ikke er tilgjengelig eller nøyaktig nok, bruker Trackbook plasseringsdata fra mobilmaster og Wi-Fi-triangulering.</string>
-    <string name="infosheet_about_h3_external">Tilganger WRITE_EXTERNAL_STORAGE</string>
-    <string name="infosheet_about_p_external">Trackbook bruker osmdroid, som hurtiglagrer fliser på Androids eksterne lagringsmedie. Du kan finne kartflisene i osmdroid-mappa på toppnivået av brukergrensesnittet.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Kartlegging av nåværende tur</string>
     <string name="descr_map_last_track">Kartlegging av forrige tur</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">Hovedhandlingsknapp</string>
     <string name="descr_fab_sub_menu_label_1">Etikett for Lagre- og Tøm-knapp</string>
     <string name="descr_fab_sub_menu_button_1">liten Lagre- og Tøm-knapp</string>

app/src/main/res/values-nl/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Informatieblad</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">Mijn locatie</string>
-    <string name="menu_about">Over</string>
 
     <!-- headers -->
-    <string name="header_about">Over Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Kaart</string>
-    <string name="tab_last_track">Laatste baan</string>
     <string name="tab_last_tracks">Laatste banen</string>
 
     <!-- notification -->
@@ -95,25 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Your recorded tracks</string>
     <string name="track_tab_onboarding_h1_part_2">… will show up here.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">Over Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Bewegingsbijhouding voor Android</string>
-    <string name="infosheet_about_h3_version">Versie 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook is een simpele app die uw bewegingen bijhoudt. Trackbook is heel handig voor wandelen, op vakantie of voor een workout. Zodra u Trackbook start begint de app uw bewegingen bij te houden op een kaart. De kaartgegevens zijn afkomstig van OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook is vrije software. U kunt de broncode vinden op GitHub. GitHub is tevens dé plek om fouten (bugs) te rapporteren of om bij te dragen. Trackbook wordt uitgebracht onder de MIT open bron-licentie. Trackbook gebruikt osmdroid om de kaart te weergeven. osmdroid is eveneens vrije software, uitgebracht onder de Apache-licentie.</string>
-    <string name="infosheet_about_h2_permissions">Welke rechten zijn vereist voor Trackbook?</string>
-    <string name="infosheet_about_h3_internet">Recht INTERNET</string>
-    <string name="infosheet_about_p_internet">Trackbook moet de kaartgegevens downloaden van OpenStreetMap-servers; hiervoor is internettoegang vereist.</string>
-    <string name="infosheet_about_h3_network">Recht TOEGANG_WIFI_STATUS en TOEGANG_NETWERKSTATUS</string>
-    <string name="infosheet_about_p_network">Trackbook gebruikt osmdroid om kaarten te weergeven. osmdroid moet daarom weten wat de huidige verbinding van uw apparaat is.</string>
-    <string name="infosheet_about_h3_location">Recht TOEGANG_COARSE_LOCATIE en TOEGANG_FINE_LOCATIE</string>
-    <string name="infosheet_about_p_location">Trackbook heeft nauwkeurige GPS-locatiegegevens nodig om uw bewegingen te kunnen bijhouden. Als de GPS-gegevens niet beschikbaar of nauwkeurig genoeg zijn, dan wordt gebruikt gemaakt van zendmasten en WiFi-triangulatie.</string>
-    <string name="infosheet_about_h3_external">Recht SCHRIJVEN_EXTERNE_OPSLAG</string>
-    <string name="infosheet_about_p_external">Trackbook gebruikt osmdroid. osmdroid cachet kaarttegels op Android\'s externe opslag. U kunt de kaartcache vinden in de osmdroid-map op het hoogste niveau van het gebruikersbestandssysteem.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Kaart van de huidige baan</string>
     <string name="descr_map_last_track">Kaart van de laatste baan</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">Hoofd-actieknop</string>
     <string name="descr_fab_sub_menu_label_1">Label van de Opslaan en wissen-knop</string>
     <string name="descr_fab_sub_menu_button_1">kleine Opslaan en wissen-knop</string>

app/src/main/res/values/strings.xml

@@ -5,15 +5,11 @@
     <string name="title_activity_infosheet">Info Sheet</string>
 
     <!-- menu entries -->
-    <string name="menu_my_location">My Location</string>
-    <string name="menu_about">About</string>
 
     <!-- headers -->
-    <string name="header_about">About Trackbook</string>
 
     <!-- tabs -->
     <string name="tab_map">Map</string>
-    <string name="tab_last_track">Last Track</string>
     <string name="tab_last_tracks">Last Tracks</string>
 
     <!-- notification -->
@@ -95,28 +91,10 @@
     <string name="track_tab_onboarding_h1_part_1">Your recorded tracks</string>
     <string name="track_tab_onboarding_h1_part_2">… will show up here.</string>
 
-    <!-- infosheet about -->
-    <string name="infosheet_about_h1_about">About Trackbook</string>
-    <string name="infosheet_about_h2_recorder">Movement Recorder for Android</string>
-    <string name="infosheet_about_h3_version">Version 1.0 (Astronomy Domine)</string>
-    <string name="infosheet_about_p_bare">Trackbook is a bare bones app for recording your movements. Trackbook is great for hiking, vacation or workout. Once started it traces your movements on a map. The map data is provided by OpenStreetMap (OSM).</string>
-    <string name="infosheet_about_p_free">Trackbook is free software. You can find the code on GitHub. GitHub is also a good place to file bugs or even to contribute, if you are interested. Trackbook is published under the MIT open source license. Trackbook uses osmdroid to display the map, which is also free software published under the Apache License.</string>
-    <string name="infosheet_about_p_github" translatable="false">https://github.com/y20k/trackbook</string>
-    <string name="infosheet_about_p_osmdroid" translatable="false">https://github.com/osmdroid/osmdroid</string>
-    <string name="infosheet_about_p_license" translatable="false">https://opensource.org/licenses/MIT</string>
-    <string name="infosheet_about_h2_permissions">Which Permissions does Trackbook need?</string>
-    <string name="infosheet_about_h3_internet">Permission INTERNET</string>
-    <string name="infosheet_about_p_internet">Trackbook needs to download map data from OpenStreetMap servers and therefore needs access to the internet.</string>
-    <string name="infosheet_about_h3_network">Permissions ACCESS_WIFI_STATE and ACCESS_NETWORK_STATE</string>
-    <string name="infosheet_about_p_network">Trackbook uses osmdroid to draw its maps. osmdroid needs to know the current state of your device’s connectivity.</string>
-    <string name="infosheet_about_h3_location">Permissions ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION</string>
-    <string name="infosheet_about_p_location">Trackbook needs accurate GPS location data to be able to record your movements. If the GPS data is not available or not accurate enough Trackbook uses location data from cell tower and WiFi triangulation.</string>
-    <string name="infosheet_about_h3_external">Permission WRITE_EXTERNAL_STORAGE</string>
-    <string name="infosheet_about_p_external">Trackbook uses osmdroid, which caches map tiles on Android\'s external storage. You can find the map cache in the osmdroid folder on the top level of the user-facing file system.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Mapping of current track</string>
     <string name="descr_map_last_track">Mapping of last track</string>
+    <string name="descr_fab_my_location">My Location Button</string>
     <string name="descr_fab_main">Main Action Button</string>
     <string name="descr_fab_sub_menu_label_1">Label of the Save and Clear button</string>
     <string name="descr_fab_sub_menu_button_1">small Save and Clear button</string>