Merge pull request #961 from gerhardol/feature/unique-resource-ids

Unique resource ids
jonasoreland · Aug 22, 2020 · 97e968a · 97e968a
2 parents 037e2aa + 648a7f9
commit 97e968a
Show file tree

Hide file tree

Showing 45 changed files with 153 additions and 263 deletions.
diff --git a/ANT-Android-SDKs b/ANT-Android-SDKs
diff --git 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/app/res/drawable/fab_compat_bg.xml b/app/res/drawable/fab_compat_bg.xml
diff --git a/app/res/layout-v15/feed_row_activity.xml b/app/res/layout-v15/feed_row_activity.xml
diff --git a/app/res/layout-v15/history.xml b/app/res/layout-v15/history.xml
diff --git a/app/res/layout-v15/start_fab.xml b/app/res/layout-v15/start_fab.xml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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 [email protected]
-  ~
-  ~  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>
diff --git a/app/res/layout-v14/feed_widget.xml → app/res/layout/feed_widget.xml b/app/res/layout-v14/feed_widget.xml → app/res/layout/feed_widget.xml
diff --git a/app/res/layout-v14/feed_widget_item.xml → app/res/layout/feed_widget_item.xml b/app/res/layout-v14/feed_widget_item.xml → app/res/layout/feed_widget_item.xml
diff --git 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
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
-  ~ Copyright (C) 2012 [email protected]
-  ~
-  ~  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"
+      ~ Copyright (C) 2012 [email protected]
+      ~
+      ~  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/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"
@@ -28,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"
@@ -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>
diff --git 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
@@ -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">