From 4fdeba248aef881118be3fd0133ec3f8e6b35b09 Mon Sep 17 00:00:00 2001 From: Vavassor Date: Wed, 1 Mar 2017 16:01:49 -0500 Subject: [PATCH] Sixth Alpha Release --- app/build.gradle | 4 ++-- .../main/java/com/keylesspalace/tusky/AccountFragment.java | 7 ++++++- app/src/main/res/values/colors.xml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9b496e16f..ea1a33d49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.keylesspalace.tusky" minSdkVersion 15 targetSdkVersion 25 - versionCode 5 - versionName "1.0.0-alpha.5" + versionCode 6 + versionName "1.0.0-alpha.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary true } diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java index c0ddbbd5c..c3e7be81c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java @@ -243,7 +243,12 @@ public class AccountFragment extends Fragment implements AccountActionListener, setFetchTimelineState(FooterViewHolder.State.END_OF_TIMELINE); } } else { - adapter.update(accounts); + if (accounts.size() > 0) { + setFetchTimelineState(FooterViewHolder.State.LOADING); + adapter.update(accounts); + } else { + setFetchTimelineState(FooterViewHolder.State.END_OF_TIMELINE); + } } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 769877952..8c1a1c01c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -59,7 +59,7 @@ #009F6F #BFBFBF #4F4F4F - #BFAF00 + #ffec21 #B0B0B0 #CFCFCF #34444C