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 @@