Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix icon with the lite version

This commit is contained in:
Thomas 2020-07-14 19:26:39 +02:00
parent 9edc0448fc
commit c737afb566
4 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -68,7 +68,7 @@ android {
res.srcDirs = ['src/main/res', 'src/fdroid/res','src/common/res'] res.srcDirs = ['src/main/res', 'src/fdroid/res','src/common/res']
} }
lite { lite {
manifest.srcFile "src/main/AndroidManifest.xml" manifest.srcFile "src/lite/AndroidManifest.xml"
java.srcDirs = ['src/main/java', 'src/lite/java'] java.srcDirs = ['src/main/java', 'src/lite/java']
res.srcDirs = ['src/main/res', 'src/lite/res'] res.srcDirs = ['src/main/res', 'src/lite/res']
} }

16
app/src/common/AndroidManifest.xml
View File

@ -34,6 +34,22 @@
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:replace="android:allowBackup"> tools:replace="android:allowBackup">
<activity-alias
android:name=".activities.MainActivity.Bubbles"
android:enabled="true"
android:icon="@mipmap/ic_launcher_bubbles"
android:roundIcon="@mipmap/ic_launcher_bubbles_round"
android:targetActivity=".activities.MainActivity">
<meta-data
android:name="icon"
android:value="bubbles" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity <activity
android:name="app.fedilab.android.activities.PhotoEditorActivity" android:name="app.fedilab.android.activities.PhotoEditorActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"

18
app/src/lite/AndroidManifest.xml
View File

@ -27,12 +27,26 @@
android:icon="@mipmap/ic_launcher_lite" android:icon="@mipmap/ic_launcher_lite"
android:label="@string/app_name_lite" android:label="@string/app_name_lite"
android:largeHeap="true" android:largeHeap="true"
android:roundIcon="@mipmap/ic_launcher_bubbles_round" android:roundIcon="@mipmap/ic_launcher_lite_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppThemeDark" android:theme="@style/AppThemeDark"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:replace="android:allowBackup,android:icon, android:label"> tools:replace="android:allowBackup,android:icon, android:roundIcon, android:label">
<activity-alias
android:name=".activities.MainActivity.Bubbles"
android:enabled="true"
android:icon="@mipmap/ic_launcher_lite"
android:roundIcon="@mipmap/ic_launcher_lite_round"
android:targetActivity=".activities.MainActivity">
<meta-data
android:name="icon"
android:value="bubbles" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
</application> </application>
</manifest> </manifest>

55
app/src/main/AndroidManifest.xml
View File

@ -115,7 +115,6 @@
<activity <activity
android:name="app.fedilab.android.activities.MainActivity" android:name="app.fedilab.android.activities.MainActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" android:launchMode="singleTask"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
@ -164,20 +163,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity-alias
android:name=".activities.MainActivity.Bubbles"
android:enabled="true"
android:icon="@mipmap/ic_launcher_bubbles"
android:roundIcon="@mipmap/ic_launcher_bubbles_round"
android:targetActivity=".activities.MainActivity">
<meta-data
android:name="icon"
android:value="bubbles" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias <activity-alias
android:name=".activities.MainActivity.Fediverse" android:name=".activities.MainActivity.Fediverse"
@ -258,17 +244,14 @@
<activity <activity
android:name="app.fedilab.android.activities.MastodonRegisterActivity" android:name="app.fedilab.android.activities.MastodonRegisterActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.PeertubeRegisterActivity" android:name="app.fedilab.android.activities.PeertubeRegisterActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.MastodonShareRegisterActivity" android:name="app.fedilab.android.activities.MastodonShareRegisterActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden"> android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -285,7 +268,6 @@
<activity <activity
android:name="app.fedilab.android.activities.LoginActivity" android:name="app.fedilab.android.activities.LoginActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden"> android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -301,124 +283,105 @@
<activity <activity
android:name="app.fedilab.android.activities.ShowAccountActivity" android:name="app.fedilab.android.activities.ShowAccountActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.TootInfoActivity" android:name="app.fedilab.android.activities.TootInfoActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.HashTagActivity" android:name="app.fedilab.android.activities.HashTagActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.WebviewConnectActivity" android:name="app.fedilab.android.activities.WebviewConnectActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name" /> />
<activity <activity
android:name="app.fedilab.android.activities.PeertubeActivity" android:name="app.fedilab.android.activities.PeertubeActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name" /> />
<activity <activity
android:name="app.fedilab.android.activities.PlaylistsActivity" android:name="app.fedilab.android.activities.PlaylistsActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" /> android:theme="@style/AppThemeDark_NoActionBar" />
<activity <activity
android:name=".activities.WebviewActivity" android:name=".activities.WebviewActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name" /> />
<activity <activity
android:name="app.fedilab.android.activities.SlideMediaActivity" android:name="app.fedilab.android.activities.SlideMediaActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" android:launchMode="singleTask"
android:noHistory="true" android:noHistory="true"
android:theme="@style/TransparentDark" /> android:theme="@style/TransparentDark" />
<activity <activity
android:name="app.fedilab.android.activities.SearchResultActivity" android:name="app.fedilab.android.activities.SearchResultActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.SearchResultTabActivity" android:name="app.fedilab.android.activities.SearchResultTabActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.ListActivity" android:name="app.fedilab.android.activities.ListActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.WhoToFollowActivity" android:name="app.fedilab.android.activities.WhoToFollowActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.ShowConversationActivity" android:name="app.fedilab.android.activities.ShowConversationActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.AboutActivity" android:name="app.fedilab.android.activities.AboutActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.BookmarkActivity" android:name="app.fedilab.android.activities.BookmarkActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.SettingsActivity" android:name="app.fedilab.android.activities.SettingsActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.AdminActivity" android:name="app.fedilab.android.activities.AdminActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.AccountReportActivity" android:name="app.fedilab.android.activities.AccountReportActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.ReorderTimelinesActivity" android:name="app.fedilab.android.activities.ReorderTimelinesActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.PartnerShipActivity" android:name="app.fedilab.android.activities.PartnerShipActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.InstanceActivity" android:name="app.fedilab.android.activities.InstanceActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.PrivacyActivity" android:name="app.fedilab.android.activities.PrivacyActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.TootActivity" android:name="app.fedilab.android.activities.TootActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/AppThemeDark" android:theme="@style/AppThemeDark"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
@ -426,19 +389,16 @@
android:name="app.fedilab.android.activities.PixelfedComposeActivity" android:name="app.fedilab.android.activities.PixelfedComposeActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/AppThemeDark" android:theme="@style/AppThemeDark"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.EditProfileActivity" android:name="app.fedilab.android.activities.EditProfileActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.CustomSharingActivity" android:name="app.fedilab.android.activities.CustomSharingActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.InstanceHealthActivity" android:name="app.fedilab.android.activities.InstanceHealthActivity"
@ -464,28 +424,23 @@
<activity <activity
android:name="app.fedilab.android.activities.PeertubeUploadActivity" android:name="app.fedilab.android.activities.PeertubeUploadActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.LiveNotificationSettingsAccountsActivity" android:name="app.fedilab.android.activities.LiveNotificationSettingsAccountsActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/Base.V7.Theme.AppCompat.Dialog" android:theme="@style/Base.V7.Theme.AppCompat.Dialog"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.MutedInstanceActivity" android:name="app.fedilab.android.activities.MutedInstanceActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.PeertubeEditUploadActivity" android:name="app.fedilab.android.activities.PeertubeEditUploadActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<activity <activity
android:name="app.fedilab.android.activities.GroupActivity" android:name="app.fedilab.android.activities.GroupActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppThemeDark_NoActionBar" android:theme="@style/AppThemeDark_NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />