mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-05 12:01:35 +00:00
Added post viewer fragment. Updated almost all places to use this
Remaining places are SavedViewer and DirectMessageThreadFragment
This commit is contained in:
Ammar Githam
parent
ded09ab237
commit
13cacf43f9
56 changed files with 2991 additions and 745 deletions
|
|
@ -1,11 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/discover_nav_graph"
|
||||
app:startDestination="@id/discoverFragment">
|
||||
|
||||
<include app:graph="@navigation/post_view_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/post_view_nav_graph">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/discoverFragment"
|
||||
android:name="awais.instagrabber.fragments.main.DiscoverFragment"
|
||||
android:label="DiscoverFragment" />
|
||||
android:label="DiscoverFragment"
|
||||
tools:layout="@layout/fragment_discover" />
|
||||
</navigation>
|
||||
|
|
@ -24,9 +24,36 @@
|
|||
<argument
|
||||
android:name="username"
|
||||
app:argType="string"
|
||||
app:nullable="true" />
|
||||
</action>
|
||||
|
||||
<include app:graph="@navigation/location_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_locationFragment"
|
||||
app:destination="@id/location_nav_graph">
|
||||
<argument
|
||||
android:name="locationId"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</action>
|
||||
|
||||
<include app:graph="@navigation/post_view_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/post_view_nav_graph">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/feedFragment"
|
||||
android:name="awais.instagrabber.fragments.main.FeedFragment"
|
||||
|
|
@ -35,9 +62,6 @@
|
|||
<action
|
||||
android:id="@+id/action_feedFragment_to_storyViewerFragment"
|
||||
app:destination="@id/storyViewerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_feedFragment_to_locationFragment"
|
||||
app:destination="@id/locationFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/storyViewerFragment"
|
||||
|
|
@ -56,14 +80,4 @@
|
|||
android:name="isHashtag"
|
||||
app:argType="boolean" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/locationFragment"
|
||||
android:name="awais.instagrabber.fragments.LocationFragment"
|
||||
android:label=""
|
||||
tools:layout="@layout/fragment_location">
|
||||
<argument
|
||||
android:name="location"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</fragment>
|
||||
</navigation>
|
||||
|
|
@ -4,6 +4,21 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/hashtag_nav_graph"
|
||||
app:startDestination="@id/hashTagFragment">
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/post_view_nav_graph">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/hashTagFragment"
|
||||
android:name="awais.instagrabber.fragments.HashTagFragment"
|
||||
|
|
|
|||
42
app/src/main/res/navigation/location_nav_graph.xml
Normal file
42
app/src/main/res/navigation/location_nav_graph.xml
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/location_nav_graph"
|
||||
app:startDestination="@id/locationFragment">
|
||||
|
||||
<!--<include app:graph="@navigation/post_view_nav_graph" />-->
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/post_view_nav_graph">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/locationFragment"
|
||||
android:name="awais.instagrabber.fragments.LocationFragment"
|
||||
android:label=""
|
||||
tools:layout="@layout/fragment_location">
|
||||
<argument
|
||||
android:name="locationId"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</fragment>
|
||||
<action
|
||||
android:id="@+id/action_global_locationFragment"
|
||||
app:destination="@id/locationFragment">
|
||||
<argument
|
||||
android:name="locationId"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</action>
|
||||
</navigation>
|
||||
67
app/src/main/res/navigation/post_view_nav_graph.xml
Normal file
67
app/src/main/res/navigation/post_view_nav_graph.xml
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/post_view_nav_graph"
|
||||
app:startDestination="@id/postViewFragment">
|
||||
|
||||
<include app:graph="@navigation/hashtag_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_hashTagFragment"
|
||||
app:destination="@id/hashtag_nav_graph">
|
||||
<argument
|
||||
android:name="hashtag"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</action>
|
||||
<!--<include app:graph="@navigation/profile_nav_graph" />-->
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_profileFragment"
|
||||
app:destination="@id/profile_nav_graph">
|
||||
<argument
|
||||
android:name="username"
|
||||
app:argType="string"
|
||||
app:nullable="true" />
|
||||
</action>
|
||||
|
||||
<include app:graph="@navigation/location_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_locationFragment"
|
||||
app:destination="@id/location_nav_graph">
|
||||
<argument
|
||||
android:name="locationId"
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</action>
|
||||
<fragment
|
||||
android:id="@+id/postViewFragment"
|
||||
android:name="awais.instagrabber.fragments.PostViewFragment"
|
||||
tools:layout="@layout/item_full_post_view">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</fragment>
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/postViewFragment">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
</navigation>
|
||||
|
|
@ -16,11 +16,28 @@
|
|||
app:nullable="false" />
|
||||
</action>
|
||||
|
||||
<include app:graph="@navigation/post_view_nav_graph" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_postViewFragment"
|
||||
app:destination="@id/post_view_nav_graph">
|
||||
<argument
|
||||
android:name="index"
|
||||
app:argType="integer" />
|
||||
<argument
|
||||
android:name="idOrCodeArray"
|
||||
app:argType="string[]" />
|
||||
<argument
|
||||
android:name="isId"
|
||||
app:argType="boolean" />
|
||||
</action>
|
||||
|
||||
<action
|
||||
android:id="@+id/action_global_profileFragment"
|
||||
app:destination="@id/profileFragment">
|
||||
<argument
|
||||
android:name="username"
|
||||
android:defaultValue=""
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
</action>
|
||||
|
|
@ -29,13 +46,11 @@
|
|||
android:id="@+id/profileFragment"
|
||||
android:name="awais.instagrabber.fragments.main.ProfileFragment"
|
||||
android:label="@string/profile"
|
||||
tools:layout="@layout/fragment_profile" >
|
||||
tools:layout="@layout/fragment_profile">
|
||||
<argument
|
||||
android:name="username"
|
||||
android:defaultValue=""
|
||||
app:argType="string"
|
||||
app:nullable="false" />
|
||||
<!--<action-->
|
||||
<!-- android:id="@+id/action_profileFragment_self"-->
|
||||
<!-- app:destination="@id/profileFragment" />-->
|
||||
app:nullable="true" />
|
||||
</fragment>
|
||||
</navigation>
|
||||
Loading…
Add table
Add a link
Reference in a new issue