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

Unique resource ids 2
jonasoreland · Aug 22, 2020 · c8eb2ba · c8eb2ba
2 parents 97e968a + 6e30da2
commit c8eb2ba
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 10 deletions.
diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 <h1>What's new</h1>
-<h2>v2.2.2.3</h2>
+<h2>v2.2.2.4</h2>
 <p>
 <ul>
     <li>#961 Resource ids must be unique</li>

diff --git a/app/res/layout/account.xml b/app/res/layout/account.xml
@@ -61,7 +61,9 @@
         <TableRow
             android:id="@+id/account_table_row1"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:minWidth="48dp"
+            android:minHeight="48dp" />
 
     </TableLayout>
 

diff --git a/app/res/layout/feed_widget_item.xml b/app/res/layout/feed_widget_item.xml
@@ -19,7 +19,7 @@
     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/feed_widget_item"
+    android:id="@+id/feed_widget_item_layout"
     android:layout_width="fill_parent"
     android:layout_height="44dp"
     android:layout_margin="10dp"

diff --git a/app/res/layout/manage_workouts_list_row.xml b/app/res/layout/manage_workouts_list_row.xml
@@ -25,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
+        android:minHeight="48dp"
         android:checked="true"/>
 
 </LinearLayout>
diff --git a/app/res/layout/step_button.xml b/app/res/layout/step_button.xml
@@ -15,7 +15,7 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/step_button"
+    android:id="@+id/step_button_layout"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"

diff --git a/app/res/layout/title_spinner.xml b/app/res/layout/title_spinner.xml
@@ -16,7 +16,7 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/title_spinner"
+    android:id="@+id/title_spinner_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_marginBottom="4dp"

diff --git a/app/res/xml/audio_cue_settings.xml b/app/res/xml/audio_cue_settings.xml
@@ -46,6 +46,7 @@
 		android:defaultValue="1000"
 		android:inputType="number"
 		android:key="@string/cue_distance_intervall"
+		android:minHeight="48dp"
 		android:persistent="true"
 		android:title="@string/Cue_intervall_m" />
 

diff --git a/app/res/xml/settings.xml b/app/res/xml/settings.xml
@@ -70,13 +70,15 @@
             android:defaultValue="15"
             android:inputType="number"
             android:key="@string/pref_battery_level_low_threshold"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Low_HRM_battery_level" />
 
         <org.runnerup.widget.TextPreference
             android:defaultValue="75"
             android:inputType="number"
             android:key="@string/pref_battery_level_high_threshold"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/High_HRM_battery_level" />
 
@@ -132,13 +134,15 @@
             android:defaultValue="1000"
             android:inputType="number"
             android:key="@string/pref_pollInterval"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Poll_interval_ms" />
 
         <org.runnerup.widget.TextPreference
             android:defaultValue="0"
             android:inputType="number"
             android:key="@string/pref_pollDistance"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Poll_distance_m" />
 
@@ -192,6 +196,7 @@
             <org.runnerup.widget.TextPreference
                 android:key="@string/pref_path_simplification_tolerance"
                 android:defaultValue="3"
+                android:minHeight="48dp"
                 android:persistent="true"
                 android:inputType="number"
                 android:title="@string/path_simplification_tolerance"
@@ -233,6 +238,7 @@
             android:defaultValue="1000"
             android:inputType="number"
             android:key="@string/pref_autolap"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Autolap_m"
             android:enabled="true" />
@@ -256,6 +262,7 @@
             android:dependency="@string/pref_autopause_active"
             android:inputType="number"
             android:key="@string/pref_autopause_afterseconds"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Autopause_after_s"
             android:enabled="true"/>
@@ -265,6 +272,7 @@
             android:dependency="@string/pref_autopause_active"
             android:inputType="number"
             android:key="@string/pref_autopause_minpace"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Autopause_min_pace_minkm"
             android:enabled="true"/>
@@ -281,6 +289,7 @@
             android:dependency="@string/pref_countdown_active"
             android:inputType="number"
             android:key="@string/pref_countdown_time"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Countdown_time_s" />
 
@@ -296,6 +305,7 @@
             android:dependency="@string/pref_step_countdown_active"
             android:inputType="number"
             android:key="@string/pref_step_countdown_time"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Step_countdown_time_s" />
 
@@ -360,6 +370,7 @@
             android:defaultValue="@string/mapboxDefaultStyle"
             android:inputType="text"
             android:key="@string/pref_mapbox_default_style"
+            android:minHeight="48dp"
             android:persistent="true"
             android:title="@string/Mapbox_default_style" />
     </PreferenceScreen>
@@ -382,6 +393,7 @@
                 android:defaultValue="mm(31);kz(5,13);sg(5)"
                 android:dependency="@string/pref_pace_graph_smoothing"
                 android:key="@string/pref_pace_graph_smoothing_filters"
+                android:minHeight="48dp"
                 android:persistent="true"
                 android:inputType="none"
                 android:title="@string/Smooth_pace_filters" />

diff --git a/app/src/main/org/runnerup/feedwidget/FeedWidgetService.java b/app/src/main/org/runnerup/feedwidget/FeedWidgetService.java
@@ -71,7 +71,7 @@ private RemoteViews getViewFactorizedAt(int position) {
                 if (FeedList.isActivity(tmp)) {
                     Intent fillInIntent = new Intent();
                     rv = new RemoteViews(getPackageName(), R.layout.feed_widget_item);
-                    rv.setOnClickFillInIntent(R.id.feed_widget_item, fillInIntent);
+                    rv.setOnClickFillInIntent(R.id.feed_widget_item_layout, fillInIntent);
                     String src = getSynchronizerName(tmp.getAsLong(Constants.DB.FEED.ACCOUNT_ID));
                     if (tmp.containsKey(Constants.DB.FEED.USER_IMAGE_URL)) {
                         Bitmap b = FeedImageLoader.LoadImageSync(tmp.getAsString(Constants.DB.FEED.USER_IMAGE_URL));

diff --git a/app/src/main/org/runnerup/view/StepButton.java b/app/src/main/org/runnerup/view/StepButton.java
@@ -73,7 +73,7 @@ public StepButton(Context context, AttributeSet attrs) {
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         inflater.inflate(R.layout.step_button, this);
         formatter = new Formatter(context);
-        mLayout = findViewById(R.id.step_button);
+        mLayout = findViewById(R.id.step_button_layout);
         mIntensityIcon = findViewById(R.id.step_icon);
         mDurationValue = findViewById(R.id.step_duration_value);
         mGoalValue = findViewById(R.id.step_goal_value);

diff --git a/app/src/main/org/runnerup/widget/TitleSpinner.java b/app/src/main/org/runnerup/widget/TitleSpinner.java
@@ -42,7 +42,7 @@ public TitleSpinner(Context context, AttributeSet attrs) {
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         inflater.inflate(R.layout.title_spinner, this);
 
-        mLayout = findViewById(R.id.title_spinner);
+        mLayout = findViewById(R.id.title_spinner_layout);
         mLabel = findViewById(R.id.title);
         mValue = findViewById(R.id.value);
         mSpinner = findViewById(R.id.spinner);

diff --git 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.3'
-    versionCode = 263
+    versionName = '2.2.2.4'
+    versionCode = 264
     latestBaseVersionCode = 15000000
 
     travisBuild = System.getenv("TRAVIS") == "true"