move debug resources into debug and cleanup build.gradle

build.gradle

@@ -45,11 +45,6 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        manifestPlaceholders = [
-                applicationLogo: "@mipmap/ic_launcher",
-                applicationName: "@string/app_name"
-        ]
-
         versionCode 3474
         versionName "v3.8.1"
 
@@ -67,10 +62,6 @@ android {
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
-            manifestPlaceholders = [
-                    applicationLogo: "@mipmap/ic_launcher_debug",
-                    applicationName: "OpenTracks (Debug)"
-            ]
         }
 
         release {

src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java

@@ -67,7 +67,7 @@ public class DescriptionGeneratorTest {
         track.setTrackStatistics(stats);
         track.setCategory("hiking");
         String expected = //"Created by"
-                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks</a><p>"
+                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                 + "Name: -<br>"
                 + "Activity type: hiking<br>"
                 + "Description: -<br>"
@@ -103,7 +103,7 @@ public class DescriptionGeneratorTest {
         track.setTrackStatistics(stats);
         track.setCategory("hiking");
         String expected = //"Created by"
-                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks</a><p>"
+                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"
                         + "Activity type: hiking<br>"
                         + "Description: -<br>"

src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_debug_background" />
+    <background android:drawable="@color/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_logo_color_108dp" />
 </adaptive-icon>

src/debug/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_debug_background">#8F0000</color>
+    <color name="ic_launcher_background">#8F0000</color>
 </resources>

src/debug/res/values/strings.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">OpenTracks (Debug)</string>
+</resources>

src/main/AndroidManifest.xml

@@ -52,8 +52,8 @@ limitations under the License.
         android:allowBackup="false"
         android:hasFragileUserData="true"
         android:hardwareAccelerated="true"
-        android:icon="${applicationLogo}"
+        android:icon="@mipmap/ic_launcher"
-        android:label="${applicationName}"
+        android:label="@string/app_name"
         android:theme="@style/ThemeCustom">
 
         <activity android:name=".AboutActivity" />