mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-10-05 21:39:50 +02:00
Resolve conflicts: Some refactors on media activities.
This commit is contained in:
@@ -83,10 +83,6 @@
|
||||
android:label="@string/multi_reddit_listing_activity_label"
|
||||
android:parentActivityName=".Activity.MainActivity"
|
||||
android:theme="@style/AppTheme.NoActionBar" />
|
||||
<activity
|
||||
android:name=".Activity.ViewGIFActivity"
|
||||
android:parentActivityName=".Activity.MainActivity"
|
||||
android:theme="@style/AppTheme.Draggable" />
|
||||
<activity
|
||||
android:name=".Activity.AccountSavedThingActivity"
|
||||
android:label="@string/account_saved_thing_activity_label"
|
||||
@@ -290,7 +286,7 @@
|
||||
android:parentActivityName=".Activity.MainActivity"
|
||||
android:theme="@style/AppTheme.NoActionBar" />
|
||||
<activity
|
||||
android:name=".Activity.ViewImageActivity"
|
||||
android:name=".Activity.ViewImageOrGifActivity"
|
||||
android:parentActivityName=".Activity.MainActivity"
|
||||
android:theme="@style/AppTheme.Draggable" />
|
||||
<activity
|
||||
|
Reference in New Issue
Block a user