From caddbd8501f7d5d4ef271fb0e8ffed882f35fdaf Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 23 Dec 2019 21:43:00 +0100
Subject: [PATCH] MarkerDetailActivity: removed leftover statistic
 functionality.

---
 .../opentracks/MarkerEditActivity.java        | 34 ++++---------------
 src/main/res/layout/marker_edit.xml           | 16 ---------
 2 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
index 13d73b8b1..1dc29566f 100644
--- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
@@ -46,9 +46,6 @@ public class MarkerEditActivity extends AbstractActivity {
     private Waypoint waypoint;
 
     // UI elements
-    private View statisticsSection;
-    private EditText statisticsName;
-    private View waypointSection;
     private EditText waypointName;
     private AutoCompleteTextView waypointMarkerType;
     private EditText waypointDescription;
@@ -63,10 +60,6 @@ public class MarkerEditActivity extends AbstractActivity {
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
 
         // Setup UI elements
-        statisticsSection = findViewById(R.id.marker_edit_statistics_section);
-        statisticsName = findViewById(R.id.marker_edit_statistics_name);
-
-        waypointSection = findViewById(R.id.marker_edit_waypoint_section);
         waypointName = findViewById(R.id.marker_edit_waypoint_name);
         waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type);
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line);
@@ -122,8 +115,6 @@ public class MarkerEditActivity extends AbstractActivity {
         });
 
         if (newMarker) {
-            statisticsSection.setVisibility(View.GONE);
-            waypointSection.setVisibility(View.VISIBLE);
             int nextWaypointNumber = trackId == -1L ? -1 : new ContentProviderUtils(this).getNextWaypointNumber(trackId);
             if (nextWaypointNumber == -1) {
                 nextWaypointNumber = 0;
@@ -139,16 +130,9 @@ public class MarkerEditActivity extends AbstractActivity {
                 finish();
                 return;
             }
-            boolean statistics = false; //TODO REMOVE
-            statisticsSection.setVisibility(statistics ? View.VISIBLE : View.GONE);
-            waypointSection.setVisibility(statistics ? View.GONE : View.VISIBLE);
-            if (statistics) {
-                statisticsName.setText(waypoint.getName());
-            } else {
-                waypointName.setText(waypoint.getName());
-                waypointMarkerType.setText(waypoint.getCategory());
-                waypointDescription.setText(waypoint.getDescription());
-            }
+            waypointName.setText(waypoint.getName());
+            waypointMarkerType.setText(waypoint.getCategory());
+            waypointDescription.setText(waypoint.getDescription());
         }
     }
 
@@ -167,14 +151,10 @@ public class MarkerEditActivity extends AbstractActivity {
      * Saves a marker.
      */
     private void saveMarker() {
-        boolean statistics = false; //TODO REMOVE
-        if (statistics) {
-            waypoint.setName(statisticsName.getText().toString());
-        } else {
-            waypoint.setName(waypointName.getText().toString());
-            waypoint.setCategory(waypointMarkerType.getText().toString());
-            waypoint.setDescription(waypointDescription.getText().toString());
-        }
+        waypoint.setName(waypointName.getText().toString());
+        waypoint.setCategory(waypointMarkerType.getText().toString());
+        waypoint.setDescription(waypointDescription.getText().toString());
+
         new ContentProviderUtils(this).updateWaypoint(waypoint);
     }
 }
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index 5865cb0d8..244e399c0 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -33,22 +33,6 @@ limitations under the License.
                 android:text="@string/generic_name" />
 
             <LinearLayout
-                android:id="@+id/marker_edit_statistics_section"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <EditText
-                    android:id="@+id/marker_edit_statistics_name"
-                    style="@style/EditNameMarker"
-                    android:drawableLeft="@drawable/ic_marker_blue_pushpin"
-                    android:hint="@string/generic_name"
-                    android:imeOptions="actionDone"
-                    android:importantForAutofill="no" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/marker_edit_waypoint_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">