Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2026-03-05 12:01:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dm-notifications-enhancements' into dm-notifications-enhancements

Browse source
This commit is contained in:
Ammar Githam 2021-01-24 23:40:56 +09:00
commit ea7236dcc1
44 changed files with 782 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/res/menu/collection_posts_menu.xml Normal file
View file

@ -0,0 +1,21 @@
<?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/edit"
android:icon="@android:drawable/ic_menu_edit"
android:title="@string/edit_collection"
app:showAsAction="always" />
<item
android:id="@+id/delete"
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/delete_collection"
app:showAsAction="always" />
<item
android:id="@+id/layout"
android:title="@string/layout"
app:showAsAction="never" />
</menu>

22
app/src/main/res/menu/saved_collection_select_menu.xml Normal file
View file

@ -0,0 +1,22 @@
<?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_add"
android:icon="@drawable/ic_add"
android:title="@string/add_to_collection"
android:titleCondensed="@string/action_download"
app:showAsAction="always" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_cancel"
android:title="@string/remove_from_collection"
android:titleCondensed="@string/action_download"
app:showAsAction="always" />
<item
android:id="@+id/action_download"
android:icon="@drawable/ic_download"
android:title="@string/action_download"
android:titleCondensed="@string/action_download"
app:showAsAction="always" />
</menu>

10
app/src/main/res/navigation/direct_messages_nav_graph.xml
View file

@ -76,6 +76,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<include app:graph="@navigation/user_search_nav_graph" />
<action

10
app/src/main/res/navigation/discover_nav_graph.xml
View file

@ -70,6 +70,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<include app:graph="@navigation/notification_viewer_nav_graph" />
<action

10
app/src/main/res/navigation/feed_nav_graph.xml
View file

@ -70,6 +70,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<include app:graph="@navigation/notification_viewer_nav_graph" />
<action

10
app/src/main/res/navigation/hashtag_nav_graph.xml
View file

@ -38,6 +38,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<action
android:id="@+id/action_global_profileFragment"
app:destination="@id/profile_nav_graph">

10
app/src/main/res/navigation/location_nav_graph.xml
View file

@ -38,6 +38,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<action
android:id="@+id/action_global_profileFragment"
app:destination="@id/profile_nav_graph">

10
app/src/main/res/navigation/notification_viewer_nav_graph.xml
View file

@ -61,6 +61,16 @@
app:nullable="false" />
</action>
<include app:graph="@navigation/saved_nav_graph" />
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<fragment
android:id="@+id/storyViewerFragment"
android:name="awais.instagrabber.fragments.StoryViewerFragment"

6
app/src/main/res/navigation/profile_nav_graph.xml
View file

@ -86,7 +86,11 @@
<action
android:id="@+id/action_global_savedCollectionsFragment"
app:destination="@id/saved_nav_graph" />
app:destination="@id/saved_nav_graph">
<argument
android:name="isSaving"
app:argType="boolean" />
</action>
<fragment
android:id="@+id/profileFragment"

4
app/src/main/res/navigation/saved_nav_graph.xml
View file

@ -78,6 +78,10 @@
android:name="awais.instagrabber.fragments.SavedCollectionsFragment"
android:label="@string/saved"
tools:layout="@layout/fragment_saved_collections" >
<argument
android:name="isSaving"
app:argType="boolean"
android:defaultValue="false" />
<action
android:id="@+id/action_savedCollectionsFragment_to_collectionPostsFragment"
app:destination="@id/collectionPostsFragment" />

6
app/src/main/res/values/strings.xml
View file

@ -99,6 +99,12 @@
<string name="remove_all_acc_warning">This will remove all added accounts from the app!\nTo remove just one account, long tap the account from the account switcher dialog.\nDo you want to continue?</string>
<string name="time_settings">Date format</string>
<string name="saved_create_collection">Create new collection</string>
<string name="edit_collection">Edit collection name</string>
<string name="delete_collection">Delete collection</string>
<string name="delete_collection_confirm">Are you sure you want to delete this collection?</string>
<string name="delete_collection_note">All contained media will remain in other collections.</string>
<string name="add_to_collection">Add to collection...</string>
<string name="remove_from_collection">Remove from collection</string>
<string name="liked">Liked</string>
<string name="saved">Saved</string>
<string name="tagged">Tagged</string>