Add dev-Variants

leanback/build.gradle

@@ -2,12 +2,16 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+
+String appName = "Chaosflix"
+
 android {
     buildToolsVersion '27.0.3'
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "de.nicidienase.chaosflix"
+        manifestPlaceholders = [label: appName]
         minSdkVersion rootProject.ext.minSDK
         targetSdkVersion rootProject.ext.targetSDK
         // odd for touch, even for leanback
@@ -17,6 +21,8 @@ android {
     }
     buildTypes {
         debug {
+            applicationIdSuffix ".dev"
+            manifestPlaceholders = [label: appName + "-dev"]
             minifyEnabled false
             useProguard false
         }

leanback/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon_notext_144x144"
-        android:label="@string/app_name"
+        android:label="${label}"
         android:supportsRtl="true"
         android:name="de.nicidienase.chaosflix.ChaosflixApplication"
         android:theme="@style/AppTheme">
@@ -22,7 +22,7 @@
             android:name=".activities.ConferencesActivity"
             android:banner="@drawable/banner"
             android:icon="@drawable/icon"
-            android:label="@string/app_name"
+            android:label="${label}"
             android:logo="@drawable/icon"
             android:screenOrientation="landscape">
             <intent-filter>

logo.svg

@@ -15,7 +15,7 @@
    viewBox="0 0 297 210.00001"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
    sodipodi:docname="logo.svg"
    inkscape:export-filename="/home/felix/projects/chaosflix/app/src/main/res/drawable/chaosflix_logo.png"
    inkscape:export-xdpi="96"
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
+     inkscape:zoom="0.98994949"
-     inkscape:cx="132.28049"
+     inkscape:cx="485.24479"
-     inkscape:cy="-193.37467"
+     inkscape:cy="398.54135"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -37,7 +37,7 @@
      inkscape:window-width="1916"
      inkscape:window-height="1040"
      inkscape:window-x="1920"
-     inkscape:window-y="20"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      inkscape:snap-nodes="false"
      inkscape:snap-global="false" />
@@ -415,5 +415,16 @@
        d="m -29.698628,372.60359 a 25.886282,25.886282 0 0 0 -25.29148,26.0072 25.886282,25.886282 0 0 0 25.546245,25.75657 25.886282,25.886282 0 0 0 26.213388,-25.07754 25.886282,25.886282 0 0 0 -24.600567,-26.66142 z m 0.593764,6.97581 v 5e-4 c 10.443691,0 18.910923,8.46678 18.912021,18.91203 a 18.91117,18.91117 0 0 1 -9.312092,16.26774 25.671369,25.671369 0 0 0 0.196371,-3.10059 c 0,-2.51838 -0.36568,-5.001 -1.06867,-7.24504 a 10.286325,10.286325 0 0 0 2.314588,-0.94671 c 1.084686,-0.61179 2.089285,-1.46362 2.587955,-2.60449 0.387853,-0.88884 0.442371,-1.88497 0.468189,-2.85461 0.03078,-1.11087 0.03323,-2.22174 -0.02687,-3.33106 -0.0172,-0.31746 -0.0405,-0.63505 -0.104387,-0.94671 -0.06425,-0.31168 -0.17142,-0.61739 -0.347265,-0.88212 -0.309362,-0.46596 -0.827741,-0.78323 -1.381829,-0.86403 a 1.9138959,1.9138959 0 0 0 -0.773594,0.0424 1.6129979,1.6129979 0 0 0 -0.677992,0.36948 c -0.287057,0.26742 -0.458552,0.64137 -0.546224,1.02423 -0.129681,0.56562 -0.0893,1.15374 -0.03927,1.73168 0.07308,0.89038 0.171035,1.78773 0.07287,2.6758 -0.03848,0.34822 -0.107458,0.69856 -0.280604,1.00252 a 1.8277054,1.8277054 0 0 1 -0.579292,0.60927 2.4075687,2.4075687 0 0 1 -0.778764,0.33021 2.8527592,2.8527592 0 0 1 -1.529107,-0.0625 c -0.437507,-0.147 -0.950618,-0.49077 -1.309997,-0.89556 0.04765,-0.072 0.104138,-0.13825 0.150379,-0.21135 a 7.0818767,7.0818767 0 0 0 1.026292,-3.17759 c 0.0858,-1.13242 -0.094,-2.26519 -0.168981,-3.39876 -0.05383,-0.78958 -0.05763,-1.5829 -0.10387,-2.37401 -0.05387,-0.91385 -0.165415,-1.82965 -0.42168,-2.70888 -0.09312,-0.31897 -0.20724,-0.63546 -0.388088,-0.91364 a 2.0454907,2.0454907 0 0 0 -0.866617,-0.75396 1.8496377,1.8496377 0 0 0 -1.137914,-0.12712 c -0.322837,0.0685 -0.620988,0.22832 -0.882632,0.42994 -0.261268,0.20125 -0.487574,0.44445 -0.700733,0.69609 a 10.628779,10.628779 0 0 0 -1.514636,2.35748 5.2091524,5.2091524 0 0 0 -1.593185,0 10.64494,10.64494 0 0 0 -1.513604,-2.35748 c -0.213551,-0.25164 -0.439087,-0.4942 -0.700733,-0.69505 -0.261266,-0.20201 -0.559671,-0.36168 -0.882116,-0.43098 -0.385548,-0.0647 -0.732186,-0.0306 -1.131197,0.12712 a 2.043182,2.043182 0 0 0 -0.867129,0.75138 c -0.180851,0.27897 -0.294516,0.59761 -0.387575,0.91622 -0.256656,0.87921 -0.368366,1.79479 -0.422196,2.70939 -0.04624,0.79074 -0.04952,1.58162 -0.103354,2.37195 -0.07505,1.13319 -0.253639,2.26751 -0.167431,3.40031 0.08466,1.1201 0.433451,2.22113 1.02371,3.17655 0.03852,0.0546 0.0845,0.11944 0.130741,0.18294 -1.603002,0.74109 -3.037501,1.86044 -4.135665,3.24373 -0.665673,0.8392 -1.219454,1.79158 -1.454173,2.83703 -0.234704,1.04544 -0.12685,2.19366 0.443383,3.10059 0.320535,0.50906 0.772173,0.90915 1.26969,1.2516 -0.07891,0.80804 -0.120606,1.62446 -0.123507,2.44326 a 25.714849,25.714849 0 0 0 0.188103,3.07836 18.911939,18.911939 0 0 1 -5.279782,-4.6395 c -0.0099,-0.11466 -0.02582,-0.22847 -0.03462,-0.34313 -0.06735,-1.23128 0.07464,-2.49125 0.567925,-3.62097 0.604102,-1.3829 1.701533,-2.50711 2.282548,-3.90002 0.323932,-0.77725 0.478242,-1.63131 0.400491,-2.47014 -0.07696,-0.83881 -0.391472,-1.66173 -0.927073,-2.312 -0.43211,-0.52331 -1.014555,-0.93612 -1.674834,-1.09657 a 2.562635,2.562635 0 0 0 -0.504362,-0.0693 c -0.510995,-0.0192 -1.028228,0.11716 -1.437639,0.41961 -0.45943,0.33936 -0.7641,0.87408 -0.844909,1.43971 -0.08042,0.56485 0.06168,1.15521 0.371036,1.63504 0.121596,0.18893 0.268056,0.36022 0.401526,0.54106 0.133135,0.18007 0.256077,0.37388 0.321427,0.58859 0.114741,0.37748 0.04568,0.78993 -0.104386,1.15548 -0.149677,0.36438 -0.374333,0.69234 -0.578259,1.03095 -0.400557,0.6649 -0.718253,1.37327 -0.995288,2.09858 a 18.911939,18.911939 0 0 1 -1.235583,-6.70294 c 0,-10.44485 8.466765,-18.91202 18.910476,-18.91202 z m -5.289086,23.31227 11.322307,6.13296 -11.322307,6.13915 v -5.44256 a 2.5357005,2.5357005 0 0 0 1.149285,-0.17828 2.4021819,2.4021819 0 0 0 0.927591,-0.66818 2.177855,2.177855 0 0 0 0.483693,-1.03249 c 0.07311,-0.42594 0.008,-0.87167 -0.168984,-1.26607 a 2.5349309,2.5349309 0 0 0 -0.811317,-0.99271 2.7423274,2.7423274 0 0 0 -1.580268,-0.52865 z"
        id="path4485-1-3-3-6-6"
        inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.05555534px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="20.198355"
+       y="197.70935"
+       id="text197"><tspan
+         sodipodi:role="line"
+         id="tspan195"
+         x="20.198355"
+         y="197.70935"
+         style="fill:#ffffff;stroke-width:0.26458332">DEV</tspan></text>
   </g>
 </svg>

touch/build.gradle

@@ -3,6 +3,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
+String appName = "Chaosflix"
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -10,6 +12,7 @@ android {
         applicationId "de.nicidienase.chaosflix"
         minSdkVersion rootProject.ext.minSDK
         targetSdkVersion rootProject.ext.targetSDK
+        manifestPlaceholders = [label: appName]
         // odd for touch, even for leanback
         versionCode 27
         versionName "0.3.0"
@@ -17,6 +20,8 @@ android {
     }
     buildTypes {
         debug {
+            applicationIdSuffix ".dev"
+            manifestPlaceholders = [label: appName + "-dev"]
             minifyEnabled false
             useProguard false
         }

touch/src/main/AndroidManifest.xml

@@ -14,13 +14,13 @@
         android:name="de.nicidienase.chaosflix.ChaosflixApplication"
         android:allowBackup="true"
         android:icon="@drawable/icon_notext"
-        android:label="@string/app_name"
+        android:label="${label}"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme">
+        tools:replace="android:label,android:theme">
         <activity
             android:name=".SplashActivity"
-            android:label="@string/app_name"
+            android:label="${label}"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>