From 8c9a9b39e76be788a50e14f62481497b67ee90d8 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Fri, 7 Aug 2020 17:02:31 -0400 Subject: [PATCH] layout adjustments --- app/build.gradle | 4 +-- .../instagrabber/activities/StoryViewer.java | 4 +-- .../customviews/RemixDrawerLayout.java | 4 +-- app/src/main/res/layout/activity_main.xml | 31 ++++++++++++------- app/src/main/res/layout/item_feed_bottom.xml | 11 +++---- app/src/main/res/layout/layout_feed_view.xml | 1 - fastlane/metadata/android/changelogs/42.txt | 7 +++++ 7 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 fastlane/metadata/android/changelogs/42.txt diff --git a/app/build.gradle b/app/build.gradle index da978aae..76c30794 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { minSdkVersion 16 targetSdkVersion 29 - versionCode 41 - versionName '17.5' + versionCode 42 + versionName '17.6' multiDexEnabled true diff --git a/app/src/main/java/awais/instagrabber/activities/StoryViewer.java b/app/src/main/java/awais/instagrabber/activities/StoryViewer.java index 65ffd1dd..a15f1d03 100755 --- a/app/src/main/java/awais/instagrabber/activities/StoryViewer.java +++ b/app/src/main/java/awais/instagrabber/activities/StoryViewer.java @@ -105,6 +105,7 @@ public final class StoryViewer extends BaseLanguageActivity { private String url, username; private int slidePos = 0, lastSlidePos = 0; private final String cookie = settingsHelper.getString(Constants.COOKIE); + private boolean fetching = false; @Override protected void onCreate(@Nullable final Bundle savedInstanceState) { @@ -152,7 +153,6 @@ public final class StoryViewer extends BaseLanguageActivity { if ((isRightSwipe == true && index == 0) || (isRightSwipe == false && index == storyFeed.length - 1)) Toast.makeText(getApplicationContext(), R.string.no_more_stories, Toast.LENGTH_SHORT).show(); else { - boolean fetching = false; final FeedStoryModel feedStoryModel = isRightSwipe ? (index == 0 ? null : storyFeed[index - 1]) : (storyFeed.length == index + 1 ? null : storyFeed[index + 1]); @@ -728,7 +728,7 @@ final String url = "https://www.instagram.com/stories/reel/seen"; protected Void doInBackground(String... rawAction) { final String action = rawAction[0]; final String url = "https://i.instagram.com/api/v1/direct_v2/create_group_thread/"; -try { + try { final HttpURLConnection urlConnection = (HttpURLConnection) new URL(url).openConnection(); urlConnection.setRequestMethod("POST"); urlConnection.setRequestProperty("User-Agent", Constants.I_USER_AGENT); diff --git a/app/src/main/java/awais/instagrabber/customviews/RemixDrawerLayout.java b/app/src/main/java/awais/instagrabber/customviews/RemixDrawerLayout.java index 9b4cfc34..ebfc4e80 100755 --- a/app/src/main/java/awais/instagrabber/customviews/RemixDrawerLayout.java +++ b/app/src/main/java/awais/instagrabber/customviews/RemixDrawerLayout.java @@ -27,9 +27,7 @@ import awais.instagrabber.R; public final class RemixDrawerLayout extends MouseDrawer implements MouseDrawer.DrawerListener { private final FrameLayout frameLayout; private View drawerView; - private RecyclerView highlightsList; - private RecyclerView feedPosts; - private RecyclerView feedStories; + private RecyclerView highlightsList, feedPosts, feedStories; private float startX; public RemixDrawerLayout(@NonNull final Context context) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e2c5ed71..2ffe1d10 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -32,30 +32,37 @@ layout="@layout/layout_feed_view" /> - - + android:layout_height="wrap_content"> + + + + + + android:tag="@android:string/yes" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - + + diff --git a/app/src/main/res/layout/item_feed_bottom.xml b/app/src/main/res/layout/item_feed_bottom.xml index 5e2afcb7..2e5e104b 100755 --- a/app/src/main/res/layout/item_feed_bottom.xml +++ b/app/src/main/res/layout/item_feed_bottom.xml @@ -15,9 +15,9 @@ android:orientation="horizontal"> @@ -40,9 +40,8 @@ android:orientation="horizontal"> diff --git a/app/src/main/res/layout/layout_feed_view.xml b/app/src/main/res/layout/layout_feed_view.xml index ab003602..c6a36067 100644 --- a/app/src/main/res/layout/layout_feed_view.xml +++ b/app/src/main/res/layout/layout_feed_view.xml @@ -42,7 +42,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:paddingTop="8dp" tools:listitem="@layout/item_feed" /> \ No newline at end of file diff --git a/fastlane/metadata/android/changelogs/42.txt b/fastlane/metadata/android/changelogs/42.txt new file mode 100644 index 00000000..c06452da --- /dev/null +++ b/fastlane/metadata/android/changelogs/42.txt @@ -0,0 +1,7 @@ +The Answer to the Ultimate Question of Life, the Universe, and Everything is 42. + +This update mostly consists of layout changes. + +* Implements #36 and #37, both massively improve the feed stories bar +* Story viewer will tell you to slow down if you scroll across users too fast (Instead of launching another window) +* \ No newline at end of file