mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from Infinity

Browse Source 
This commit merges the changes that were made in the upstream infinity repo
This commit is contained in:
Balazs Toldi
2023-10-27 15:10:00 +02:00
parent 262d9f02ba
commit 4397e09016
182 changed files with 12490 additions and 11105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/menu/customize_comment_filter_activity.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_save_customize_comment_filter_activity"
android:orderInCategory="1"
android:title="@string/action_save"
android:icon="@drawable/ic_check_circle_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_save_to_database_customize_comment_filter_activity"
android:orderInCategory="2"
android:title="@string/action_save_to_database"
android:icon="@drawable/ic_save_to_database_24dp"
app:showAsAction="ifRoom" />
</menu>

12
app/src/main/res/menu/view_subreddit_detail_activity.xml
View File

@@ -38,7 +38,12 @@
<item
android:id="@+id/unblock_community_view_subreddit_detail_activity"
android:orderInCategory="5"
android:title="@string/unblock_community"
android:title="@string/unblock_community" />
<item
android:id="@+id/action_add_to_home_screen_view_subreddit_detail_activity"
android:orderInCategory="6"
android:title="@string/action_add_to_home_screen"
app:showAsAction="never" />
@@ -54,6 +59,11 @@
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_wiki_view_subreddit_detail_activity"
android:orderInCategory="9"
android:title="@string/action_go_to_wiki"
app:showAsAction="never" />
<item
android:id="@+id/action_contact_mods_view_subreddit_detail_activity"