From 165626fc6ced3d469fe70681ebdd6fcf45503d8e Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Thu, 22 Dec 2016 04:07:30 +0100 Subject: [PATCH] Added flavour secondlion* --- app/build.gradle | 12 ++++++++++++ app/src/main/AndroidManifest.xml | 12 ++++++------ app/src/main/res/layout/browser__fragment.xml | 2 +- app/src/main/res/layout/main__app_bar.xml | 4 ++-- app/src/main/res/menu/main__menu_bottom.xml | 2 +- app/src/main/res/menu/main__menu_top.xml | 2 +- .../menu/main__menu_top__notifications_dropdown.xml | 2 +- crowdin.yaml | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dce91556..78c3bb27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,6 +22,18 @@ android { } } + productFlavors { + flavorDandelion { + applicationId "com.github.dfa.diaspora_android" + manifestPlaceholders = [appName: "dandelion*"] + } + + flavorSecondlion { + applicationId "com.github.dfa.diaspora_android2" + manifestPlaceholders = [appName: "secondlion*"] + } + } + lintOptions { disable 'MissingTranslation' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0ba3b1b7..1f8bbb27 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,12 +12,12 @@ android:allowBackup="false" android:icon="@drawable/ic_launcher" android:name="com.github.dfa.diaspora_android.App" - android:label="@string/app_name" + android:label="${appName}" android:theme="@style/DiasporaLight" > + android:label="${appName}"> diff --git a/app/src/main/res/layout/browser__fragment.xml b/app/src/main/res/layout/browser__fragment.xml index 9682a505..96daf8b1 100644 --- a/app/src/main/res/layout/browser__fragment.xml +++ b/app/src/main/res/layout/browser__fragment.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" - tools:context=".activity.MainActivity"> + tools:context="com.github.dfa.diaspora_android.activity.MainActivity"> + tools:context="com.github.dfa.diaspora_android.activity.MainActivity"> + app:layout_behavior="com.github.dfa.diaspora_android.ui.BottomBarBehavior"> diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml index 81575627..236525b6 100644 --- a/app/src/main/res/menu/main__menu_top.xml +++ b/app/src/main/res/menu/main__menu_top.xml @@ -1,7 +1,7 @@