Browse Source

fix navigation actions for fdroid

renovate/org.robolectric-robolectric-4.x
Austin Huang 4 years ago
parent
commit
f584b51f64
No known key found for this signature in database GPG Key ID: 84C23AA04587A91F
  1. 6
      app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java
  2. 3
      app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
  3. 2
      app/src/main/res/navigation/notification_viewer_nav_graph.xml
  4. 4
      app/src/main/res/navigation/profile_nav_graph.xml

6
app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java

@ -354,8 +354,7 @@ public class DirectMessageSettingsFragment extends Fragment implements ConfirmDi
} }
if (TextUtils.isEmpty(user.getUsername())) return; if (TextUtils.isEmpty(user.getUsername())) return;
final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections
.actionGlobalProfileFragment()
.setUsername("@" + user.getUsername());
.actionGlobalProfileFragment("@" + user.getUsername());
NavHostFragment.findNavController(this).navigate(directions); NavHostFragment.findNavController(this).navigate(directions);
}, },
(position, user) -> { (position, user) -> {
@ -393,8 +392,7 @@ public class DirectMessageSettingsFragment extends Fragment implements ConfirmDi
@Override @Override
public void onClick(final int position, final PendingUser pendingUser) { public void onClick(final int position, final PendingUser pendingUser) {
final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections
.actionGlobalProfileFragment()
.setUsername("@" + pendingUser.getUser().getUsername());
.actionGlobalProfileFragment("@" + pendingUser.getUser().getUsername());
NavHostFragment.findNavController(DirectMessageSettingsFragment.this).navigate(directions); NavHostFragment.findNavController(DirectMessageSettingsFragment.this).navigate(directions);
} }

3
app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java

@ -1447,8 +1447,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
private void navigateToUser(@NonNull final String username) { private void navigateToUser(@NonNull final String username) {
final ProfileNavGraphDirections.ActionGlobalProfileFragment direction = ProfileNavGraphDirections final ProfileNavGraphDirections.ActionGlobalProfileFragment direction = ProfileNavGraphDirections
.actionGlobalProfileFragment()
.setUsername("@" + username);
.actionGlobalProfileFragment("@" + username);
NavHostFragment.findNavController(DirectMessageThreadFragment.this).navigate(direction); NavHostFragment.findNavController(DirectMessageThreadFragment.this).navigate(direction);
} }

2
app/src/main/res/navigation/notification_viewer_nav_graph.xml

@ -13,7 +13,7 @@
<argument <argument
android:name="username" android:name="username"
app:argType="string" app:argType="string"
app:nullable="true" />
app:nullable="false" />
</action> </action>
<action <action

4
app/src/main/res/navigation/profile_nav_graph.xml

@ -56,7 +56,6 @@
app:destination="@id/profile_nav_graph"> app:destination="@id/profile_nav_graph">
<argument <argument
android:name="username" android:name="username"
android:defaultValue=""
app:argType="string" app:argType="string"
app:nullable="false" /> app:nullable="false" />
</action> </action>
@ -82,6 +81,9 @@
android:name="targetId" android:name="targetId"
android:defaultValue="0L" android:defaultValue="0L"
app:argType="long" /> app:argType="long" />
<action
android:id="@+id/action_notifications_to_story"
app:destination="@id/storyViewerFragment" />
</action> </action>
<fragment <fragment

Loading…
Cancel
Save