1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-12 15:21:11 +01:00

Merge branch 'master' into poddy_as_podsource

This commit is contained in:
Gregor Santner 2016-10-14 00:44:23 +02:00
commit 110598ea85
56 changed files with 2028 additions and 322 deletions

View file

@ -11,7 +11,7 @@
android:icon="@drawable/ic_launcher"
android:name="com.github.dfa.diaspora_android.App"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/DiasporaLight" >
<provider
android:name="com.github.dfa.diaspora_android.data.HashtagProvider"
@ -25,20 +25,20 @@
<activity
android:name=".activity.SettingsActivity"
android:launchMode="singleInstance"
android:theme="@style/AppTheme"
android:theme="@style/DiasporaLight.NoActionBar"
android:label="@string/settings" />
<activity
android:name=".activity.AboutActivity"
android:label="@string/about_activity__title_about_app"
android:theme="@style/AppTheme.NoActionBar"/>
android:theme="@style/DiasporaLight.NoActionBar"/>
<activity
android:name=".activity.MainActivity"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustResize"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/AppTheme.NoActionBar"
android:theme="@style/DiasporaLight.NoActionBar"
android:label="@string/diaspora">
<intent-filter>