Browse Source
Merge branch 'master' into pr/503
renovate/org.robolectric-robolectric-4.x
Austin Huang
4 years ago
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
2 changed files with
4 additions and
3 deletions
-
app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
-
app/src/main/java/awais/instagrabber/webservices/StoriesService.java
|
@ -739,8 +739,10 @@ public class StoryViewerFragment extends Fragment { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
binding.storiesList.setVisibility((storyModels.size() == 1 && currentFeedStoryIndex == -1) ? View.GONE : View.VISIBLE); |
|
|
binding.storiesList.setVisibility((storyModels.size() == 1 && currentFeedStoryIndex == -1) ? View.GONE : View.VISIBLE); |
|
|
binding.btnBackward.setVisibility(currentFeedStoryIndex == -1 ? View.GONE : View.VISIBLE); |
|
|
|
|
|
binding.btnForward.setVisibility(currentFeedStoryIndex == -1 ? View.GONE : View.VISIBLE); |
|
|
|
|
|
|
|
|
if (currentFeedStoryIndex == -1) { |
|
|
|
|
|
binding.btnBackward.setVisibility(View.GONE); |
|
|
|
|
|
binding.btnForward.setVisibility(View.GONE); |
|
|
|
|
|
} |
|
|
storiesViewModel.getList().setValue(storyModels); |
|
|
storiesViewModel.getList().setValue(storyModels); |
|
|
currentStory = storyModels.get(0); |
|
|
currentStory = storyModels.get(0); |
|
|
refreshStory(); |
|
|
refreshStory(); |
|
|
|
@ -246,7 +246,6 @@ public class StoriesService extends BaseService { |
|
|
final boolean highlight, |
|
|
final boolean highlight, |
|
|
final ServiceCallback<List<StoryModel>> callback) { |
|
|
final ServiceCallback<List<StoryModel>> callback) { |
|
|
final String url = buildUrl(id, isLoc, isHashtag, highlight); |
|
|
final String url = buildUrl(id, isLoc, isHashtag, highlight); |
|
|
Log.d("austin_debug", url); |
|
|
|
|
|
final Call<String> userStoryCall = repository.getUserStory(Constants.I_USER_AGENT, url); |
|
|
final Call<String> userStoryCall = repository.getUserStory(Constants.I_USER_AGENT, url); |
|
|
userStoryCall.enqueue(new Callback<String>() { |
|
|
userStoryCall.enqueue(new Callback<String>() { |
|
|
@Override |
|
|
@Override |
|
|