Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2025-11-03 21:15:35 +00:00
Code Issues Releases Wiki Activity

restore dm indicator, release prep, partially address #431

Browse Source
This commit is contained in:
Austin Huang 2020-12-22 13:42:26 -05:00
parent 22fc894c9d
commit 9ca9cca33d
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
4 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 54 versionCode 55
versionName '19.0.2' versionName '19.0.3'
multiDexEnabled true multiDexEnabled true

3
app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
View File

@ -249,8 +249,8 @@ public final class FollowViewerFragment extends Fragment implements SwipeRefresh
loading = true; loading = true;
setSubtitle(R.string.followers_compare); setSubtitle(R.string.followers_compare);
allFollowing.clear(); allFollowing.clear();
binding.swipeRefreshLayout.setRefreshing(true);
if (moreAvailable) { if (moreAvailable) {
binding.swipeRefreshLayout.setRefreshing(true);
Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show();
friendshipService.getList(isFollowersList, friendshipService.getList(isFollowersList,
profileId, profileId,
@ -258,6 +258,7 @@ public final class FollowViewerFragment extends Fragment implements SwipeRefresh
isFollowersList ? followersFetchCb : followingFetchCb); isFollowersList ? followersFetchCb : followingFetchCb);
} }
else if (followersModels.size() == 0 || followingModels.size() == 0) { else if (followersModels.size() == 0 || followingModels.size() == 0) {
binding.swipeRefreshLayout.setRefreshing(true);
Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), R.string.follower_start_compare, Toast.LENGTH_LONG).show();
friendshipService.getList(!isFollowersList, friendshipService.getList(!isFollowersList,
profileId, profileId,

7
app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
View File

@ -27,6 +27,8 @@ import awais.instagrabber.models.enums.RavenExpiringMediaType;
import awais.instagrabber.models.enums.RavenMediaViewType; import awais.instagrabber.models.enums.RavenMediaViewType;
import awaisomereport.LogCollector; import awaisomereport.LogCollector;
import static awais.instagrabber.utils.Utils.settingsHelper;
public final class ResponseBodyUtils { public final class ResponseBodyUtils {
private static final String TAG = "ResponseBodyUtils"; private static final String TAG = "ResponseBodyUtils";
@ -261,7 +263,10 @@ public final class ResponseBodyUtils {
final String threadPrevCursor = data.has("prev_cursor") ? data.getString("prev_cursor") : null; final String threadPrevCursor = data.has("prev_cursor") ? data.getString("prev_cursor") : null;
final boolean threadHasOlder = data.getBoolean("has_older"); final boolean threadHasOlder = data.getBoolean("has_older");
final long unreadCount = data.optLong("read_state", 0);
final String cookie = settingsHelper.getString(Constants.COOKIE);
final String userIdFromCookie = CookieUtils.getUserIdFromCookie(cookie);
final long unreadCount = data.getJSONObject("last_seen_at").getJSONObject(userIdFromCookie).getString("item_id").equals(threadNewestCursor) ? 0 : 1;
final long lastActivityAt = data.optLong("last_activity_at"); final long lastActivityAt = data.optLong("last_activity_at");
final boolean named = data.optBoolean("named"); final boolean named = data.optBoolean("named");

44
app/src/main/res/layout/dialog_post_layout_preferences.xml
View File

@ -21,11 +21,14 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_layout" android:id="@+id/label_layout"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/layout_style" android:text="@string/layout_style"
app:layout_constraintBottom_toBottomOf="@id/layout_toggle" app:layout_constraintBottom_toBottomOf="@id/layout_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/layout_toggle" /> app:layout_constraintTop_toTopOf="@id/layout_toggle" />
<!-- Button icons do not appear in preview, but will appear <!-- Button icons do not appear in preview, but will appear
@ -67,9 +70,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_col_count" android:id="@+id/label_col_count"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/column_count" android:text="@string/column_count"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/col_count_toggle" app:layout_constraintBottom_toBottomOf="@id/col_count_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/col_count_toggle" /> app:layout_constraintTop_toTopOf="@id/col_count_toggle" />
@ -104,11 +110,14 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_show_names_toggle" android:id="@+id/label_show_names_toggle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/show_names" android:text="@string/show_names"
app:layout_constraintBottom_toBottomOf="@id/show_names_toggle" app:layout_constraintBottom_toBottomOf="@id/show_names_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/show_names_toggle" /> app:layout_constraintTop_toTopOf="@id/show_names_toggle" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
@ -116,6 +125,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
app:layout_constraintBottom_toTopOf="@id/show_avatar_toggle" app:layout_constraintBottom_toTopOf="@id/show_avatar_toggle"
app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintStart_toEndOf="@id/guideline"
app:layout_constraintTop_toBottomOf="@id/col_count_toggle" app:layout_constraintTop_toBottomOf="@id/col_count_toggle"
@ -125,9 +135,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_show_avatar_toggle" android:id="@+id/label_show_avatar_toggle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/show_avatars" android:text="@string/show_avatars"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/show_avatar_toggle" app:layout_constraintBottom_toBottomOf="@id/show_avatar_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/show_avatar_toggle" /> app:layout_constraintTop_toTopOf="@id/show_avatar_toggle" />
@ -146,9 +159,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_avatar_size" android:id="@+id/label_avatar_size"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/avatar_size" android:text="@string/avatar_size"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/avatar_size_toggle" app:layout_constraintBottom_toBottomOf="@id/avatar_size_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/avatar_size_toggle" /> app:layout_constraintTop_toTopOf="@id/avatar_size_toggle" />
@ -190,9 +206,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_corners" android:id="@+id/label_corners"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/corners" android:text="@string/corners"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/corners_toggle" app:layout_constraintBottom_toBottomOf="@id/corners_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/corners_toggle" /> app:layout_constraintTop_toTopOf="@id/corners_toggle" />
@ -227,9 +246,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_gap" android:id="@+id/label_gap"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/show_grid_gap" android:text="@string/show_grid_gap"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/show_gap_toggle" app:layout_constraintBottom_toBottomOf="@id/show_gap_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/show_gap_toggle" /> app:layout_constraintTop_toTopOf="@id/show_gap_toggle" />
@ -248,9 +270,13 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_disable_animation" android:id="@+id/label_disable_animation"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/disable_animation" android:layout_marginRight="6dp"
android:gravity="right"
android:text="@string/disable_animation"
android:layout_gravity="right"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/disable_animation_toggle" app:layout_constraintBottom_toBottomOf="@id/disable_animation_toggle"
app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintTop_toTopOf="@id/disable_animation_toggle" /> app:layout_constraintTop_toTopOf="@id/disable_animation_toggle" />