From 3e62e4a23e6074f763492771960b179405d6739e Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 22 Aug 2020 18:40:42 +0200
Subject: [PATCH 1/5] Remove Froyo specific views

Not needed when minimum target is 15
---
 app/res/drawable/fab_compat_bg.xml            |  5 --
 app/res/layout-v15/feed_row_activity.xml      |  9 ---
 app/res/layout-v15/history.xml                | 64 -------------------
 app/res/layout-v15/start_fab.xml              | 11 ----
 app/res/layout/feed_row_activity.xml          | 21 +-----
 .../{layout-v14 => layout}/feed_widget.xml    |  0
 .../feed_widget_item.xml                      |  0
 app/res/layout/history.xml                    | 41 ++++++------
 app/res/layout/start_fab.xml                  |  5 +-
 app/res/values-v14/dimens.xml                 | 10 ---
 app/res/values/dimens.xml                     |  2 +-
 .../feed_widget_provider_info.xml             |  0
 12 files changed, 29 insertions(+), 139 deletions(-)
 delete mode 100644 app/res/drawable/fab_compat_bg.xml
 delete mode 100644 app/res/layout-v15/feed_row_activity.xml
 delete mode 100644 app/res/layout-v15/history.xml
 delete mode 100644 app/res/layout-v15/start_fab.xml
 rename app/res/{layout-v14 => layout}/feed_widget.xml (100%)
 rename app/res/{layout-v14 => layout}/feed_widget_item.xml (100%)
 delete mode 100644 app/res/values-v14/dimens.xml
 rename app/res/{xml-v14 => xml}/feed_widget_provider_info.xml (100%)

diff --git a/app/res/drawable/fab_compat_bg.xml b/app/res/drawable/fab_compat_bg.xml
deleted file mode 100644
index 62e5a932b..000000000
--- a/app/res/drawable/fab_compat_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimaryFab" />
-    <corners android:radius="28dp" />
-</shape>
\ No newline at end of file
diff --git a/app/res/layout-v15/feed_row_activity.xml b/app/res/layout-v15/feed_row_activity.xml
deleted file mode 100644
index d55f6659a..000000000
--- a/app/res/layout-v15/feed_row_activity.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
-
-    <include layout="@layout/feed_row_contents" />
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/res/layout-v15/history.xml b/app/res/layout-v15/history.xml
deleted file mode 100644
index ffe86a9e7..000000000
--- a/app/res/layout-v15/history.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-      ~ Copyright (C) 2012 jonas.oreland@gmail.com
-      ~
-      ~  This program is free software: you can redistribute it and/or modify
-      ~  it under the terms of the GNU General Public License as published by
-      ~  the Free Software Foundation, either version 3 of the License, or
-      ~  (at your option) any later version.
-      ~
-      ~  This program is distributed in the hope that it will be useful,
-      ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-      ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      ~  GNU General Public License for more details.
-      ~
-      ~  You should have received a copy of the GNU General Public License
-      ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-      -->
-
-<merge android:id="@+id/tab1_layout"
-       xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
-       xmlns:tools="http://schemas.android.com/tools"
-       android:layout_width="match_parent"
-       android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/feed_actionbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:elevation="4dp"
-            app:title="@string/History"
-            tools:ignore="UnusedAttribute"/>
-
-        <ListView
-            android:id="@+id/history_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingBottom="@dimen/margin_for_fab"
-            android:scrollbarStyle="outsideOverlay"/>
-
-    </LinearLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/history_add"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|bottom"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/Add_manual_entry"
-        android:tooltipText="@string/Add_manual_entry"
-        app:backgroundTint="@color/colorPrimaryFab"
-        app:fabSize="normal"
-        app:srcCompat="@drawable/ic_add_white_24dp"
-        tools:ignore="UnusedAttribute"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/res/layout-v15/start_fab.xml b/app/res/layout-v15/start_fab.xml
deleted file mode 100644
index f33e71bf7..000000000
--- a/app/res/layout-v15/start_fab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/start_button"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:contentDescription="@string/Start"
-    android:padding="16dp"
-    app:backgroundTint="@color/colorPrimaryFab"
-    app:fabSize="normal"
-    app:srcCompat="@drawable/ic_start_white_24dp" />
\ No newline at end of file
diff --git a/app/res/layout/feed_row_activity.xml b/app/res/layout/feed_row_activity.xml
index d546c576c..d55f6659a 100644
--- a/app/res/layout/feed_row_activity.xml
+++ b/app/res/layout/feed_row_activity.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2012 - 2013 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp">
 
     <include layout="@layout/feed_row_contents" />
 
-</FrameLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/res/layout-v14/feed_widget.xml b/app/res/layout/feed_widget.xml
similarity index 100%
rename from app/res/layout-v14/feed_widget.xml
rename to app/res/layout/feed_widget.xml
diff --git a/app/res/layout-v14/feed_widget_item.xml b/app/res/layout/feed_widget_item.xml
similarity index 100%
rename from app/res/layout-v14/feed_widget_item.xml
rename to app/res/layout/feed_widget_item.xml
diff --git a/app/res/layout/history.xml b/app/res/layout/history.xml
index 1238a5fd0..ffe86a9e7 100644
--- a/app/res/layout/history.xml
+++ b/app/res/layout/history.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
-  ~ Copyright (C) 2012 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
+      ~ Copyright (C) 2012 jonas.oreland@gmail.com
+      ~
+      ~  This program is free software: you can redistribute it and/or modify
+      ~  it under the terms of the GNU General Public License as published by
+      ~  the Free Software Foundation, either version 3 of the License, or
+      ~  (at your option) any later version.
+      ~
+      ~  This program is distributed in the hope that it will be useful,
+      ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+      ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+      ~  GNU General Public License for more details.
+      ~
+      ~  You should have received a copy of the GNU General Public License
+      ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+      -->
+
 <merge android:id="@+id/tab1_layout"
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -46,16 +48,17 @@
 
     </LinearLayout>
 
-    <ImageButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/history_add"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right|bottom"
         android:layout_margin="16dp"
-        android:background="@drawable/fab_compat_bg"
         android:contentDescription="@string/Add_manual_entry"
-        android:padding="16dp"
+        android:tooltipText="@string/Add_manual_entry"
+        app:backgroundTint="@color/colorPrimaryFab"
+        app:fabSize="normal"
         app:srcCompat="@drawable/ic_add_white_24dp"
-        />
+        tools:ignore="UnusedAttribute"/>
 
 </merge>
\ No newline at end of file
diff --git a/app/res/layout/start_fab.xml b/app/res/layout/start_fab.xml
index 304a04b05..f33e71bf7 100644
--- a/app/res/layout/start_fab.xml
+++ b/app/res/layout/start_fab.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/start_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/fab_compat_bg"
     android:contentDescription="@string/Start"
     android:padding="16dp"
+    app:backgroundTint="@color/colorPrimaryFab"
+    app:fabSize="normal"
     app:srcCompat="@drawable/ic_start_white_24dp" />
\ No newline at end of file
diff --git a/app/res/values-v14/dimens.xml b/app/res/values-v14/dimens.xml
deleted file mode 100644
index 4db8c5906..000000000
--- a/app/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-    <dimen name="widget_margin">0dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index ad4618a32..74fab015c 100644
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -5,7 +5,7 @@
 Refer to App Widget Documentation for margin information
 http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     -->
-    <dimen name="widget_margin">8dp</dimen>
+    <dimen name="widget_margin">0dp</dimen>
     <dimen name="margin_for_fab">88dp</dimen>
     <dimen name="activity_margin">16dp</dimen>
 
diff --git a/app/res/xml-v14/feed_widget_provider_info.xml b/app/res/xml/feed_widget_provider_info.xml
similarity index 100%
rename from app/res/xml-v14/feed_widget_provider_info.xml
rename to app/res/xml/feed_widget_provider_info.xml

From 37812a99e342c6f4efa6c6e46c737acfaeac1c9b Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 22 Aug 2020 19:25:41 +0200
Subject: [PATCH 2/5] Make view ids unique

---
 ANT-Android-SDKs                              |  2 +-
 app/res/layout/account.xml                    | 10 +++++-----
 app/res/layout/account_row.xml                | 12 +++++------
 app/res/layout/bottom_tab_indicator.xml       |  2 +-
 app/res/layout/create_advanced_workout.xml    |  4 ++--
 app/res/layout/feed.xml                       |  2 +-
 app/res/layout/filepermission.xml             |  4 ++--
 app/res/layout/history.xml                    |  4 ++--
 app/res/layout/history_row.xml                |  2 +-
 app/res/layout/manage_workouts.xml            |  4 ++--
 app/res/layout/reportlist_row.xml             |  6 +++---
 app/res/layout/run.xml                        | 16 +++++++--------
 app/res/layout/start.xml                      |  2 +-
 app/res/layout/start_advanced.xml             |  2 +-
 app/res/layout/start_basic.xml                |  2 +-
 app/res/layout/start_interval.xml             |  4 ++--
 app/res/layout/step_dialog.xml                | 16 +++++++--------
 app/res/layout/upload.xml                     | 20 +++++++++----------
 app/res/layout/userpass.xml                   |  6 +++---
 app/res/layout/workout_row.xml                |  8 ++++----
 .../main/org/runnerup/export/SyncManager.java |  4 ++--
 .../org/runnerup/view/AccountActivity.java    |  4 ++--
 .../runnerup/view/AccountListActivity.java    | 12 +++++------
 .../org/runnerup/view/DetailActivity.java     |  6 +++---
 .../org/runnerup/view/HistoryActivity.java    |  2 +-
 .../main/org/runnerup/view/RunActivity.java   | 16 +++++++--------
 .../main/org/runnerup/view/StartActivity.java |  8 ++++----
 .../main/org/runnerup/view/StepButton.java    | 17 ++++++++--------
 .../org/runnerup/view/UploadActivity.java     |  2 +-
 wear/src/main/res/layout/searching.xml        |  2 +-
 wear/src/main/res/layout/stopped.xml          |  4 ++--
 31 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/ANT-Android-SDKs b/ANT-Android-SDKs
index 0c79ecfb7..0e31a1bbb 160000
--- a/ANT-Android-SDKs
+++ b/ANT-Android-SDKs
@@ -1 +1 @@
-Subproject commit 0c79ecfb7d582ae75f243d345296fcd1b068a5a1
+Subproject commit 0e31a1bbb9a219d6e332e22f65570b38a39d71ea
diff --git a/app/res/layout/account.xml b/app/res/layout/account.xml
index 2a1b6dd3e..fde83843b 100644
--- a/app/res/layout/account.xml
+++ b/app/res/layout/account.xml
@@ -24,14 +24,14 @@
 
     <LinearLayout
         android:layout_margin="@dimen/activity_margin"
-        android:id="@+id/name"
+        android:id="@+id/account_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:gravity="center|center_horizontal|center_vertical" >
 
         <TextView
-            android:id="@+id/account_list_name"
+            android:id="@+id/account_name"
             style="@style/AccountListText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
             android:scaleType="center" />
 
         <ImageView
-            android:id="@+id/account_list_icon"
+            android:id="@+id/account_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="48dp"
@@ -56,10 +56,10 @@
 		android:id="@+id/account_table"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/name" >
+        android:layout_below="@id/account_view" >
 
         <TableRow
-            android:id="@+id/table_row1"
+            android:id="@+id/account_table_row1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
diff --git a/app/res/layout/account_row.xml b/app/res/layout/account_row.xml
index b4fee2241..a2ffa5bfb 100644
--- a/app/res/layout/account_row.xml
+++ b/app/res/layout/account_row.xml
@@ -24,7 +24,7 @@
     android:padding="16dp">
 
     <TextView
-        android:id="@+id/section_title"
+        android:id="@+id/account_row_section_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
@@ -42,7 +42,7 @@
             android:layout_height="40dp">
 
             <ImageView
-                android:id="@+id/account_list_icon"
+                android:id="@+id/account_row_icon"
                 app:srcCompat="@drawable/circle_40dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/account_list_icon_text"
+                android:id="@+id/account_row_icon_text"
                 android:textSize="20sp"
                 android:textStyle="bold"
                 android:textColor="#ffffffff"
@@ -61,7 +61,7 @@
         </FrameLayout>
 
         <TextView
-            android:id="@+id/account_list_name"
+            android:id="@+id/account_row_name"
             style="@style/AccountListText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
             android:minHeight="48dp" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/account_list_feed"
+            android:id="@+id/account_row_feed"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
@@ -82,7 +82,7 @@
             android:contentDescription="@string/feed" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/account_list_upload"
+            android:id="@+id/account_row_upload"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
diff --git a/app/res/layout/bottom_tab_indicator.xml b/app/res/layout/bottom_tab_indicator.xml
index e32f076e6..ea106bd61 100644
--- a/app/res/layout/bottom_tab_indicator.xml
+++ b/app/res/layout/bottom_tab_indicator.xml
@@ -18,7 +18,7 @@
         tools:ignore="ContentDescription"/>
 
     <!--TextView
-        android:id="@+id/title"
+        android:id="@+id/bottom_title"
         style="@style/BottomNavigationTabText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/create_advanced_workout.xml b/app/res/layout/create_advanced_workout.xml
index f49be25d5..ce531a158 100644
--- a/app/res/layout/create_advanced_workout.xml
+++ b/app/res/layout/create_advanced_workout.xml
@@ -20,10 +20,10 @@
     android:paddingTop="8dp"
     android:scrollbarAlwaysDrawVerticalTrack="true"
     android:layout_below="@+id/new_workout_spinner"
-    android:layout_above="@+id/button_table"/>
+    android:layout_above="@+id/create_button_table"/>
 
   <TableLayout
-    android:id="@+id/button_table"
+    android:id="@+id/create_button_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
diff --git a/app/res/layout/feed.xml b/app/res/layout/feed.xml
index 9d31fead3..8dd5e3c3c 100644
--- a/app/res/layout/feed.xml
+++ b/app/res/layout/feed.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:id="@+id/tab1_layout"
+              android:id="@+id/feed_tab1_layout"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:orientation="vertical">
diff --git a/app/res/layout/filepermission.xml b/app/res/layout/filepermission.xml
index 052be80d3..f253bfc8e 100644
--- a/app/res/layout/filepermission.xml
+++ b/app/res/layout/filepermission.xml
@@ -26,14 +26,14 @@
               android:paddingTop="@dimen/dialog_padding_vert">
 
     <TextView
-        android:id="@+id/textViewAuthNotice"
+        android:id="@+id/filepermission_textViewAuthNotice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:textAppearance="?android:attr/textAppearanceSmall"/>
 
     <TableRow
-        android:id="@+id/table_row1"
+        android:id="@+id/filepermission_table_row1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
diff --git a/app/res/layout/history.xml b/app/res/layout/history.xml
index ffe86a9e7..b0afdde4a 100644
--- a/app/res/layout/history.xml
+++ b/app/res/layout/history.xml
@@ -17,7 +17,7 @@
       ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
       -->
 
-<merge android:id="@+id/tab1_layout"
+<merge android:id="@+id/history_tab1_layout"
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
@@ -30,7 +30,7 @@
         android:orientation="vertical">
 
         <androidx.appcompat.widget.Toolbar
-            android:id="@+id/feed_actionbar"
+            android:id="@+id/history_actionbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorPrimary"
diff --git a/app/res/layout/history_row.xml b/app/res/layout/history_row.xml
index b35463882..97215cfe9 100644
--- a/app/res/layout/history_row.xml
+++ b/app/res/layout/history_row.xml
@@ -21,7 +21,7 @@
     android:padding="16dp">
 
     <TextView
-        android:id="@+id/section_title"
+        android:id="@+id/history_section_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
diff --git a/app/res/layout/manage_workouts.xml b/app/res/layout/manage_workouts.xml
index bf53c8a59..7da9fdaba 100644
--- a/app/res/layout/manage_workouts.xml
+++ b/app/res/layout/manage_workouts.xml
@@ -29,10 +29,10 @@
         android:layout_alignParentRight="false"
         android:layout_alignParentLeft="false"
         android:layout_alignParentStart="false"
-        android:layout_above="@+id/button_table" />
+        android:layout_above="@+id/manage_button_table" />
 
   <TableLayout
-    android:id="@+id/button_table"
+    android:id="@+id/manage_button_tablebutton_table"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true">
diff --git a/app/res/layout/reportlist_row.xml b/app/res/layout/reportlist_row.xml
index 49de997ff..8841ff597 100644
--- a/app/res/layout/reportlist_row.xml
+++ b/app/res/layout/reportlist_row.xml
@@ -21,14 +21,14 @@
     android:orientation="horizontal" >
 
     <TextView
-        android:id="@+id/account_id"
+        android:id="@+id/reportlist_account_id"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:visibility="gone" />
 
     <TextView
-        android:id="@+id/account_name"
+        android:id="@+id/reportlist_account_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -37,7 +37,7 @@
         android:focusable="true"/>
 
     <CheckBox
-        android:id="@+id/report_sent"
+        android:id="@+id/reportlist_sent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:checked="true"
diff --git a/app/res/layout/run.xml b/app/res/layout/run.xml
index 8885a7a08..5cc915bb2 100644
--- a/app/res/layout/run.xml
+++ b/app/res/layout/run.xml
@@ -79,15 +79,15 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:id="@+id/activity_time"
+                    android:id="@+id/run_activity_time"
                     style="@style/RunInfo" />
 
                 <TextView
-                    android:id="@+id/activity_distance"
+                    android:id="@+id/run_activity_distance"
                     style="@style/RunInfo" />
 
                 <TextView
-                    android:id="@+id/activity_pace"
+                    android:id="@+id/run_activity_pace"
                     style="@style/RunInfo" />
 
                 <TextView
@@ -121,7 +121,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:id="@+id/interval_time"
+                    android:id="@+id/run_interval_time"
                     style="@style/RunInfo" />
 
                 <TextView
@@ -256,15 +256,15 @@
         android:id="@+id/workout_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/table_row1"
+        android:layout_above="@+id/run_table_row1"
         android:layout_below="@+id/countdown_layout" >
     </ListView>
 
     <TableRow
-        android:id="@+id/table_row1"
+        android:id="@+id/run_table_row1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/table_row2" >
+        android:layout_above="@+id/run_table_row2" >
 
         <Button
             android:id="@+id/new_lap_button"
@@ -292,7 +292,7 @@
     </TableRow>
 
     <TableRow
-        android:id="@+id/table_row2"
+        android:id="@+id/run_table_row2"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" >
diff --git a/app/res/layout/start.xml b/app/res/layout/start.xml
index 304ca22b1..47fc96cad 100644
--- a/app/res/layout/start.xml
+++ b/app/res/layout/start.xml
@@ -14,7 +14,7 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout android:id="@+id/tab1_layout"
+<LinearLayout android:id="@+id/start_tab1_layout"
               xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/res/layout/start_advanced.xml b/app/res/layout/start_advanced.xml
index c0aa1ce31..ca71489f4 100644
--- a/app/res/layout/start_advanced.xml
+++ b/app/res/layout/start_advanced.xml
@@ -16,7 +16,7 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:runnerup="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/tab_advanced"
+    android:id="@+id/start_advanced_tab"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/res/layout/start_basic.xml b/app/res/layout/start_basic.xml
index e4fb81043..545ac0ae3 100644
--- a/app/res/layout/start_basic.xml
+++ b/app/res/layout/start_basic.xml
@@ -17,7 +17,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:runnerup="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/tab_basic"
+    android:id="@+id/start_basic_tab"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/activity_margin"
diff --git a/app/res/layout/start_interval.xml b/app/res/layout/start_interval.xml
index 813e7ab47..dbf93409e 100644
--- a/app/res/layout/start_interval.xml
+++ b/app/res/layout/start_interval.xml
@@ -16,7 +16,7 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:runnerup="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/tab_interval"
+    android:id="@+id/start_interval_tab"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
@@ -59,7 +59,7 @@
             android:text="@string/Interval_type" />
 
         <org.runnerup.widget.TitleSpinner
-            android:id="@+id/interval_time"
+            android:id="@+id/start_interval_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:defaultValue="00:01:00"
diff --git a/app/res/layout/step_dialog.xml b/app/res/layout/step_dialog.xml
index 8054cf588..65da80932 100644
--- a/app/res/layout/step_dialog.xml
+++ b/app/res/layout/step_dialog.xml
@@ -28,7 +28,7 @@
     android:paddingBottom="@dimen/dialog_padding_vert">
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_intensity"
+        android:id="@+id/step_dialog_intensity"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:entries="@array/step_intensity_types"
@@ -37,7 +37,7 @@
         runnerup:values="@array/step_intensity_values"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_duration_type"
+        android:id="@+id/step_dialog_duration_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:entries="@array/duration_types"
@@ -46,7 +46,7 @@
         runnerup:values="@array/step_duration_values"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_duration_distance"
+        android:id="@+id/step_dialog_duration_distance"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:defaultValue="1000"
@@ -56,7 +56,7 @@
         runnerup:type="distancepicker"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_duration_time"
+        android:id="@+id/step_dialog_duration_time"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:defaultValue="00:01:00"
@@ -67,7 +67,7 @@
         runnerup:type="durationpicker"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_target_type"
+        android:id="@+id/step_dialog_target_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:entries="@array/target_types"
@@ -76,7 +76,7 @@
         runnerup:values="@array/target_values"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_target_pace_lo"
+        android:id="@+id/step_dialog_target_pace_lo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:defaultValue="00:05:00"
@@ -86,7 +86,7 @@
         runnerup:type="durationpicker"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_target_pace_hi"
+        android:id="@+id/step_dialog_target_pace_hi"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:defaultValue="00:05:30"
@@ -96,7 +96,7 @@
         runnerup:type="durationpicker"/>
 
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/step_target_hrz"
+        android:id="@+id/step_dialog_target_hrz"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:prompt="@string/Type"
diff --git a/app/res/layout/upload.xml b/app/res/layout/upload.xml
index dd6ac3c32..18fca140e 100644
--- a/app/res/layout/upload.xml
+++ b/app/res/layout/upload.xml
@@ -22,7 +22,7 @@
     android:orientation="vertical">
 
   <LinearLayout
-    android:id="@+id/name"
+    android:id="@+id/upload_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentTop="true"
@@ -46,20 +46,20 @@
   </LinearLayout>
 
   <ListView
-      android:layout_margin="@dimen/activity_margin"
+    android:layout_margin="@dimen/activity_margin"
     android:id="@+id/upload_list"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_above="@+id/account_upload_buttons"
+    android:layout_above="@+id/account_upload_button_layout"
     android:layout_alignParentStart="true"
     android:layout_alignParentLeft="true"
-    android:layout_below="@+id/name"
+    android:layout_below="@+id/upload_layout"
     android:scrollbarAlwaysDrawVerticalTrack="true">
 
   </ListView>
 
   <LinearLayout
-    android:id="@+id/account_upload_buttons"
+    android:id="@+id/account_upload_button_layout"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -73,7 +73,7 @@
       android:layout_height="wrap_content"
       android:layout_weight="1"
       android:text="@string/Select_all"
-        tools:ignore="ButtonStyle" />
+      tools:ignore="ButtonStyle" />
 
     <Button
       android:id="@+id/account_upload_clear_all"
@@ -81,7 +81,7 @@
       android:layout_height="wrap_content"
       android:layout_weight="1"
       android:text="@string/Clear_all"
-        tools:ignore="ButtonStyle" />
+      tools:ignore="ButtonStyle" />
   </LinearLayout>
 
   <LinearLayout
@@ -91,10 +91,10 @@
     android:id="@+id/account_action_buttons"
     android:layout_alignParentEnd="true"
     android:layout_alignParentBottom="true"
-      android:layout_alignParentRight="true">
+    android:layout_alignParentRight="true">
 
     <Button
-      android:id="@+id/account_upload_button"
+      android:id="@+id/upload_account_button"
       style="@style/ButtonText"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
       android:text="@string/upload" />
 
     <Button
-      android:id="@+id/account_download_button"
+      android:id="@+id/upload_account_download_button"
       style="@style/ButtonText"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
diff --git a/app/res/layout/userpass.xml b/app/res/layout/userpass.xml
index b5a845c58..204ec07e3 100644
--- a/app/res/layout/userpass.xml
+++ b/app/res/layout/userpass.xml
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/textViewAuthNotice"
+        android:id="@+id/userpass_textViewAuthNotice"
         android:layout_marginBottom="16dp" />
 
     <TableLayout
@@ -62,7 +62,7 @@
         </TableRow>
 
         <TableRow
-            android:id="@+id/table_row1"
+            android:id="@+id/userpass_table_row1"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
 
@@ -88,7 +88,7 @@
         </TableRow>
 
         <TableRow
-            android:id="@+id/table_row2"
+            android:id="@+id/userpass_table_row2"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
 
diff --git a/app/res/layout/workout_row.xml b/app/res/layout/workout_row.xml
index 2641bb3d5..e77c733d3 100644
--- a/app/res/layout/workout_row.xml
+++ b/app/res/layout/workout_row.xml
@@ -21,7 +21,7 @@
     	android:orientation="horizontal" >
     
     	<TextView
-    	    android:id="@+id/step_intensity"
+    	    android:id="@+id/workout_step_intensity"
     	    android:layout_height="wrap_content"
     	    android:layout_weight="1"
     	    android:layout_width="0dp"
@@ -29,7 +29,7 @@
     	    android:text="@string/intensity" />
 
     	<TextView
-    	    android:id="@+id/step_duration_type"
+    	    android:id="@+id/workout_step_duration_type"
     	    android:layout_width="0dp"
     	    android:layout_height="wrap_content"
     	    android:layout_weight="1"
@@ -37,14 +37,14 @@
     	    android:text="@string/distance" />
 
 	    <TextView
-	        android:id="@+id/step_duration_value"
+	        android:id="@+id/workout_step_duration_value"
 	        android:layout_width="0dp"
 	        android:layout_height="wrap_content"
 	        android:layout_weight="1"
 	        android:gravity="start" />
 
 	    <TextView
-	        android:id="@+id/step_pace"
+	        android:id="@+id/workout_step_pace"
 	        android:layout_height="wrap_content"
 	        android:layout_weight="1"
     	    android:layout_width="0dp"
diff --git a/app/src/main/org/runnerup/export/SyncManager.java b/app/src/main/org/runnerup/export/SyncManager.java
index 022ad23a7..da8c6c281 100644
--- a/app/src/main/org/runnerup/export/SyncManager.java
+++ b/app/src/main/org/runnerup/export/SyncManager.java
@@ -356,7 +356,7 @@ private void askUsernamePassword(final Synchronizer sync, final AuthMethod authM
         final TextView tv1 = view.findViewById(R.id.username);
         final TextView tv2 = view.findViewById(R.id.password_input);
         final TextView urlInput = view.findViewById(R.id.url_input);
-        final TextView tvAuthNotice = view.findViewById(R.id.textViewAuthNotice);
+        final TextView tvAuthNotice = view.findViewById(R.id.userpass_textViewAuthNotice);
         final TableRow rowUrl = view.findViewById(R.id.table_row_url);
         String authConfigStr = sync.getAuthConfig();
         final JSONObject authConfig = newObj(authConfigStr);
@@ -446,7 +446,7 @@ protected void onPostExecute(Synchronizer.Status result) {
     private void askFileUrl(final Synchronizer sync) {
         final View view = View.inflate(mActivity, R.layout.filepermission, null);
         final TextView tv1 = view.findViewById(R.id.fileuri);
-        final TextView tvAuthNotice = view.findViewById(R.id.textViewAuthNotice);
+        final TextView tvAuthNotice = view.findViewById(R.id.filepermission_textViewAuthNotice);
 
         String path;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
diff --git a/app/src/main/org/runnerup/view/AccountActivity.java b/app/src/main/org/runnerup/view/AccountActivity.java
index c2a968017..fc42b9b15 100644
--- a/app/src/main/org/runnerup/view/AccountActivity.java
+++ b/app/src/main/org/runnerup/view/AccountActivity.java
@@ -156,8 +156,8 @@ private void fillData() {
             }
 
             {
-                ImageView im = findViewById(R.id.account_list_icon);
-                TextView tv = findViewById(R.id.account_list_name);
+                ImageView im = findViewById(R.id.account_icon);
+                TextView tv = findViewById(R.id.account_name);
                 if (synchronizer.getIconId() == 0 || mSynchronizerName.equals(FileSynchronizer.NAME)) {
                     if (!TextUtils.isEmpty(synchronizer.getPublicUrl())) {
                         tv.setText(synchronizer.getPublicUrl());
diff --git a/app/src/main/org/runnerup/view/AccountListActivity.java b/app/src/main/org/runnerup/view/AccountListActivity.java
index d2df740dc..194e92942 100644
--- a/app/src/main/org/runnerup/view/AccountListActivity.java
+++ b/app/src/main/org/runnerup/view/AccountListActivity.java
@@ -173,12 +173,12 @@ public void bindView(View view, Context context, Cursor cursor) {
 
             view.setTag(synchronizer);
 
-            TextView sectionTitle = view.findViewById(R.id.section_title);
-            ImageView accountIcon = view.findViewById(R.id.account_list_icon);
-            TextView accountIconText = view.findViewById(R.id.account_list_icon_text);
-            TextView accountNameText = view.findViewById(R.id.account_list_name);
-            SwitchCompat accountUploadBox = view.findViewById(R.id.account_list_upload);
-            SwitchCompat accountFeedBox = view.findViewById(R.id.account_list_feed);
+            TextView sectionTitle = view.findViewById(R.id.account_row_section_title);
+            ImageView accountIcon = view.findViewById(R.id.account_row_icon);
+            TextView accountIconText = view.findViewById(R.id.account_row_icon_text);
+            TextView accountNameText = view.findViewById(R.id.account_row_name);
+            SwitchCompat accountUploadBox = view.findViewById(R.id.account_row_upload);
+            SwitchCompat accountFeedBox = view.findViewById(R.id.account_row_feed);
 
             // category name
             int curPosition = cursor.getPosition();
diff --git a/app/src/main/org/runnerup/view/DetailActivity.java b/app/src/main/org/runnerup/view/DetailActivity.java
index 136c3cb7d..bceab56b2 100644
--- a/app/src/main/org/runnerup/view/DetailActivity.java
+++ b/app/src/main/org/runnerup/view/DetailActivity.java
@@ -673,9 +673,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 LayoutInflater inflater = LayoutInflater.from(DetailActivity.this);
                 view = inflater.inflate(R.layout.reportlist_row, parent, false);
 
-                viewHolder.tv0 = view.findViewById(R.id.account_id);
-                viewHolder.cb = view.findViewById(R.id.report_sent);
-                viewHolder.tv1 = view.findViewById(R.id.account_name);
+                viewHolder.tv0 = view.findViewById(R.id.reportlist_account_id);
+                viewHolder.cb = view.findViewById(R.id.reportlist_sent);
+                viewHolder.tv1 = view.findViewById(R.id.reportlist_account_name);
 
                 view.setTag(viewHolder);
             } else {
diff --git a/app/src/main/org/runnerup/view/HistoryActivity.java b/app/src/main/org/runnerup/view/HistoryActivity.java
index abf0cec8a..8e54389dd 100644
--- a/app/src/main/org/runnerup/view/HistoryActivity.java
+++ b/app/src/main/org/runnerup/view/HistoryActivity.java
@@ -171,7 +171,7 @@ public void bindView(View view, Context context, Cursor cursor) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(curDate);
 
-            TextView sectionTitle = view.findViewById(R.id.section_title);
+            TextView sectionTitle = view.findViewById(R.id.history_section_title);
             int year = cal.get(Calendar.YEAR);
             int month = cal.get(Calendar.MONTH);
             if (sameMonthAsPrevious(year, month, cursor)) {
diff --git a/app/src/main/org/runnerup/view/RunActivity.java b/app/src/main/org/runnerup/view/RunActivity.java
index 58b388394..2247f4e50 100644
--- a/app/src/main/org/runnerup/view/RunActivity.java
+++ b/app/src/main/org/runnerup/view/RunActivity.java
@@ -127,15 +127,15 @@ public void onCreate(Bundle savedInstanceState) {
         pauseButton.setOnClickListener(pauseButtonClick);
         newLapButton = findViewById(R.id.new_lap_button);
         activityHeaderHr = findViewById(R.id.activity_header_hr);
-        activityTime = findViewById(R.id.activity_time);
-        activityDistance = findViewById(R.id.activity_distance);
-        activityPace = findViewById(R.id.activity_pace);
+        activityTime = findViewById(R.id.run_activity_time);
+        activityDistance = findViewById(R.id.run_activity_distance);
+        activityPace = findViewById(R.id.run_activity_pace);
         activityHr = findViewById(R.id.activity_hr);
         lapTime = findViewById(R.id.lap_time);
         lapDistance = findViewById(R.id.lap_distance);
         lapPace = findViewById(R.id.lap_pace);
         lapHr = findViewById(R.id.lap_hr);
-        intervalTime = findViewById(R.id.interval_time);
+        intervalTime = findViewById(R.id.run_interval_time);
         intervalDistance = findViewById(R.id.intervall_distance);
         tableRowInterval = findViewById(R.id.table_row_interval);
         intervalPace = findViewById(R.id.interval_pace);
@@ -533,10 +533,10 @@ private View getWorkoutRow(org.runnerup.workout.Step step, int level, View conve
                 ViewGroup parent) {
             LayoutInflater inflater = LayoutInflater.from(RunActivity.this);
             View view = inflater.inflate(R.layout.workout_row, parent, false);
-            TextView intensity = view.findViewById(R.id.step_intensity);
-            TextView durationType = view.findViewById(R.id.step_duration_type);
-            TextView durationValue = view.findViewById(R.id.step_duration_value);
-            TextView targetPace = view.findViewById(R.id.step_pace);
+            TextView intensity = view.findViewById(R.id.workout_step_intensity);
+            TextView durationType = view.findViewById(R.id.workout_step_duration_type);
+            TextView durationValue = view.findViewById(R.id.workout_step_duration_value);
+            TextView targetPace = view.findViewById(R.id.workout_step_pace);
             intensity.setPadding(level * 10, 0, 0, 0);
             intensity.setText(getResources().getText(step.getIntensity().getTextId()));
             if (step.getDurationType() != null) {
diff --git a/app/src/main/org/runnerup/view/StartActivity.java b/app/src/main/org/runnerup/view/StartActivity.java
index 7c667f35e..863072efa 100644
--- a/app/src/main/org/runnerup/view/StartActivity.java
+++ b/app/src/main/org/runnerup/view/StartActivity.java
@@ -215,17 +215,17 @@ public void onCreate(Bundle savedInstanceState) {
         tabHost.setup();
         TabSpec tabSpec = tabHost.newTabSpec(TAB_BASIC);
         tabSpec.setIndicator(WidgetUtil.createHoloTabIndicator(this, getString(R.string.Basic)));
-        tabSpec.setContent(R.id.tab_basic);
+        tabSpec.setContent(R.id.start_basic_tab);
         tabHost.addTab(tabSpec);
 
         tabSpec = tabHost.newTabSpec(TAB_INTERVAL);
         tabSpec.setIndicator(WidgetUtil.createHoloTabIndicator(this, getString(R.string.Interval)));
-        tabSpec.setContent(R.id.tab_interval);
+        tabSpec.setContent(R.id.start_interval_tab);
         tabHost.addTab(tabSpec);
 
         tabSpec = tabHost.newTabSpec(TAB_ADVANCED);
         tabSpec.setIndicator(WidgetUtil.createHoloTabIndicator(this, getString(R.string.Advanced)));
-        tabSpec.setContent(R.id.tab_advanced);
+        tabSpec.setContent(R.id.start_advanced_tab);
         tabHost.addTab(tabSpec);
 
         tabHost.setOnTabChangedListener(onTabChangeListener);
@@ -244,7 +244,7 @@ public void onCreate(Bundle savedInstanceState) {
         simpleTargetType.setOnCloseDialogListener(simpleTargetTypeClick);
 
         intervalType = findViewById(R.id.interval_type);
-        intervalTime = findViewById(R.id.interval_time);
+        intervalTime = findViewById(R.id.start_interval_time);
         intervalTime.setOnSetValueListener(onSetTimeValidator);
         intervalDistance = findViewById(R.id.interval_distance);
         intervalType.setOnSetValueListener(intervalTypeSetValue);
diff --git a/app/src/main/org/runnerup/view/StepButton.java b/app/src/main/org/runnerup/view/StepButton.java
index 16c58719b..bb2ad4315 100644
--- a/app/src/main/org/runnerup/view/StepButton.java
+++ b/app/src/main/org/runnerup/view/StepButton.java
@@ -19,7 +19,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.Resources;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
@@ -217,13 +216,13 @@ public void onClick(View v) {
     };
 
     private Runnable setupEditStep(LayoutInflater inflator, View layout) {
-        final TitleSpinner stepType = layout.findViewById(R.id.step_intensity);
+        final TitleSpinner stepType = layout.findViewById(R.id.step_dialog_intensity);
         stepType.setValue(step.getIntensity().getValue());
 
         final HRZonesListAdapter hrZonesAdapter = new HRZonesListAdapter(mContext, inflator);
-        final TitleSpinner durationType = layout.findViewById(R.id.step_duration_type);
-        final TitleSpinner durationTime = layout.findViewById(R.id.step_duration_time);
-        final TitleSpinner durationDistance = layout.findViewById(R.id.step_duration_distance);
+        final TitleSpinner durationType = layout.findViewById(R.id.step_dialog_duration_type);
+        final TitleSpinner durationTime = layout.findViewById(R.id.step_dialog_duration_time);
+        final TitleSpinner durationDistance = layout.findViewById(R.id.step_dialog_duration_distance);
         durationType.setOnSetValueListener(new TitleSpinner.OnSetValueListener() {
             @Override
             public String preSetValue(String newValue) throws IllegalArgumentException {
@@ -260,10 +259,10 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
             durationType.setValue(step.getDurationType().getValue());
         }
 
-        final TitleSpinner targetType = layout.findViewById(R.id.step_target_type);
-        final TitleSpinner targetPaceLo = layout.findViewById(R.id.step_target_pace_lo);
-        final TitleSpinner targetPaceHi = layout.findViewById(R.id.step_target_pace_hi);
-        final TitleSpinner targetHrz = layout.findViewById(R.id.step_target_hrz);
+        final TitleSpinner targetType = layout.findViewById(R.id.step_dialog_target_type);
+        final TitleSpinner targetPaceLo = layout.findViewById(R.id.step_dialog_target_pace_lo);
+        final TitleSpinner targetPaceHi = layout.findViewById(R.id.step_dialog_target_pace_hi);
+        final TitleSpinner targetHrz = layout.findViewById(R.id.step_dialog_target_hrz);
 
         if (!hrZonesAdapter.hrZones.isConfigured()) {
             targetType.addDisabledValue(DIMENSION.HRZ);
diff --git a/app/src/main/org/runnerup/view/UploadActivity.java b/app/src/main/org/runnerup/view/UploadActivity.java
index 5565e1d4b..47ae70cbe 100644
--- a/app/src/main/org/runnerup/view/UploadActivity.java
+++ b/app/src/main/org/runnerup/view/UploadActivity.java
@@ -105,7 +105,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         {
             Button dwbtn = findViewById(R.id.account_download_button);
-            Button upbtn = findViewById(R.id.account_upload_button);
+            Button upbtn = findViewById(R.id.upload_account_button);
             if (syncMode.equals(SyncManager.SyncMode.DOWNLOAD)) {
                 dwbtn.setOnClickListener(downloadButtonClick);
                 actionButton = dwbtn;
diff --git a/wear/src/main/res/layout/searching.xml b/wear/src/main/res/layout/searching.xml
index 4886cf080..a733f9945 100644
--- a/wear/src/main/res/layout/searching.xml
+++ b/wear/src/main/res/layout/searching.xml
@@ -41,7 +41,7 @@
                 app:circle_radius="32dp" />
 
             <TextView
-                android:id="@+id/txt_start"
+                android:id="@+id/txt_search_gps"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Searching_for_GPS"
diff --git a/wear/src/main/res/layout/stopped.xml b/wear/src/main/res/layout/stopped.xml
index fa381d37b..e4246336e 100644
--- a/wear/src/main/res/layout/stopped.xml
+++ b/wear/src/main/res/layout/stopped.xml
@@ -32,7 +32,7 @@
             android:orientation="vertical">
 
             <android.support.wearable.view.CircledImageView
-                android:id="@+id/icon_resume"
+                android:id="@+id/icon_stopped_resume"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/open_on_phone_animation"
@@ -41,7 +41,7 @@
                 app:circle_radius="32dp" />
 
             <TextView
-                android:id="@+id/txt_resume"
+                android:id="@+id/txt_stopped_resume"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Saving_on_phone"

From 491deda385f86765f75dbd4737b56b541220c1af Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 22 Aug 2020 21:38:42 +0200
Subject: [PATCH 3/5] Delete workout was not translated

---
 app/src/main/org/runnerup/view/CreateAdvancedWorkout.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java b/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
index e36e7d331..e31c2d81e 100644
--- a/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
+++ b/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
@@ -269,7 +269,7 @@ private void handleWorkoutFileException(Exception e) {
 
     private final View.OnClickListener discardWorkoutButtonClick = view -> {
         final AlertDialog.Builder builder = new AlertDialog.Builder(CreateAdvancedWorkout.this)
-                .setTitle("Delete workout?")
+                .setTitle(R.string.Delete_workout)
                 .setMessage(R.string.Are_you_sure)
                 .setPositiveButton(R.string.Yes,
                         (dialog, which) -> {

From 8a718fd46f6d6d20012d3aa088bb12fc573c0a4e Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 22 Aug 2020 21:40:40 +0200
Subject: [PATCH 4/5] Refactor: remove a few builder variables

---
 app/src/main/org/runnerup/export/SyncManager.java    |  6 +++---
 .../org/runnerup/view/CreateAdvancedWorkout.java     | 12 ++++++------
 app/src/main/org/runnerup/view/DetailActivity.java   |  6 +++---
 app/src/main/org/runnerup/view/StartActivity.java    | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/org/runnerup/export/SyncManager.java b/app/src/main/org/runnerup/export/SyncManager.java
index da8c6c281..d92a25a23 100644
--- a/app/src/main/org/runnerup/export/SyncManager.java
+++ b/app/src/main/org/runnerup/export/SyncManager.java
@@ -384,7 +384,7 @@ private void askUsernamePassword(final Synchronizer sync, final AuthMethod authM
             rowUrl.setVisibility(View.GONE);
         }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity)
+        new AlertDialog.Builder(mActivity)
                 .setTitle(sync.getName())
 
                 // Inflate and set the layout for the dialog
@@ -410,8 +410,8 @@ private void askUsernamePassword(final Synchronizer sync, final AuthMethod authM
                         handleAuthComplete(sync, Status.CANCEL);
                     }
                     return false;
-                });
-        builder.show();
+                })
+                .show();
     }
 
 
diff --git a/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java b/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
index e31c2d81e..70c7122ed 100644
--- a/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
+++ b/app/src/main/org/runnerup/view/CreateAdvancedWorkout.java
@@ -226,12 +226,12 @@ private void deleteStep(StepButton button) {
             try {
                 WorkoutSerializer.writeFile(ctx, advWorkoutName, advancedWorkout);
             } catch (Exception ex) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(CreateAdvancedWorkout.this)
+                new AlertDialog.Builder(CreateAdvancedWorkout.this)
                         .setTitle(R.string.Failed_to_load_workout)
                         .setMessage("" + ex.toString())
                         .setPositiveButton(R.string.OK,
-                                (dialog, which) -> dialog.dismiss());
-                builder.show();
+                                (dialog, which) -> dialog.dismiss())
+                        .show();
             }
         }
     };
@@ -268,7 +268,7 @@ private void handleWorkoutFileException(Exception e) {
     }
 
     private final View.OnClickListener discardWorkoutButtonClick = view -> {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(CreateAdvancedWorkout.this)
+        new AlertDialog.Builder(CreateAdvancedWorkout.this)
                 .setTitle(R.string.Delete_workout)
                 .setMessage(R.string.Are_you_sure)
                 .setPositiveButton(R.string.Yes,
@@ -281,7 +281,7 @@ private void handleWorkoutFileException(Exception e) {
                             finish();
                         })
                 .setNegativeButton(R.string.No,
-                        (dialog, which) -> dialog.dismiss());
-        builder.show();
+                        (dialog, which) -> dialog.dismiss())
+                .show();
     };
 }
diff --git a/app/src/main/org/runnerup/view/DetailActivity.java b/app/src/main/org/runnerup/view/DetailActivity.java
index bceab56b2..48a30ac7b 100644
--- a/app/src/main/org/runnerup/view/DetailActivity.java
+++ b/app/src/main/org/runnerup/view/DetailActivity.java
@@ -891,7 +891,7 @@ private void shareActivity() {
         final CharSequence[] items = {
                 "gpx", "tcx" /* "nike+xml" */
         };
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setTitle(getString(R.string.Share_activity))
                 .setPositiveButton(R.string.OK,
                         (dialog, w) -> {
@@ -924,7 +924,7 @@ private void shareActivity() {
                             // Do nothing but close the dialog
                             dialog.dismiss();
                         })
-                .setSingleChoiceItems(items, which[0], (dialog, w) -> which[0] = w);
-        builder.show();
+                .setSingleChoiceItems(items, which[0], (dialog, w) -> which[0] = w)
+                .show();
     }
 }
diff --git a/app/src/main/org/runnerup/view/StartActivity.java b/app/src/main/org/runnerup/view/StartActivity.java
index 863072efa..85ef666de 100644
--- a/app/src/main/org/runnerup/view/StartActivity.java
+++ b/app/src/main/org/runnerup/view/StartActivity.java
@@ -553,7 +553,7 @@ private void notificationBatteryLevel(int batteryLevel) {
         final CheckBox dontShowAgain = new CheckBox(this);
         dontShowAgain.setText(getResources().getText(R.string.Do_not_show_again));
 
-        AlertDialog prompt = new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setView(dontShowAgain)
                 .setCancelable(false)
                 .setTitle(R.string.Warning)
@@ -695,7 +695,7 @@ private boolean checkPermissions(boolean popup) {
                         : getString(R.string.GPS_permission_text_pre_Android10);
 
                 AlertDialog.Builder builder = new AlertDialog.Builder(StartActivity.this)
-                        .setTitle(getString(R.string.GPS_permission_required))
+                        .setTitle(R.string.GPS_permission_required)
                         .setNegativeButton(R.string.Cancel, (dialog, which) -> dialog.dismiss());
                 if (requestPerms.size() > 0) {
                     builder.setPositiveButton(R.string.OK, (dialog, id) -> ActivityCompat.requestPermissions(this.getParent(), permissions, REQUEST_LOCATION));
@@ -1210,12 +1210,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
             try {
                 WorkoutSerializer.writeFile(ctx, name, advancedWorkout);
             } catch (Exception ex) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(StartActivity.this)
+                new AlertDialog.Builder(StartActivity.this)
                         .setTitle(R.string.Failed_to_load_workout)
                         .setMessage("" + ex.toString())
                         .setPositiveButton(R.string.OK,
-                                (dialog, which) -> dialog.dismiss());
-                builder.show();
+                                (dialog, which) -> dialog.dismiss())
+                        .show();
             }
         }
     };

From 648a7f92dbb6beef778389231f10c5c81b5185e3 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Sat, 22 Aug 2020 21:41:07 +0200
Subject: [PATCH 5/5] Update to 2.2.2.3

---
 app/assets/changes.html | 3 ++-
 build.gradle            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/changes.html b/app/assets/changes.html
index d50f42a69..b28224b1c 100644
--- a/app/assets/changes.html
+++ b/app/assets/changes.html
@@ -5,9 +5,10 @@
 </head>
 <body>
 <h1>What's new</h1>
-<h2>v2.2.2.2</h2>
+<h2>v2.2.2.3</h2>
 <p>
 <ul>
+    <li>#961 Resource ids must be unique</li>
     <li>#960 Check for Battery Optimization when starting GPS</li>
     <li>Avoid a few exceptions</li>
     <li>Transifex ru, pl, de</li>
diff --git a/build.gradle b/build.gradle
index 85f11d9f4..bfe1f921f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,8 +31,8 @@ project.ext {
     mockitoVersion = '2.3.7'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.2.2.2'
-    versionCode = 262
+    versionName = '2.2.2.3'
+    versionCode = 263
     latestBaseVersionCode = 15000000
 
     travisBuild = System.getenv("TRAVIS") == "true"