properly report when feeds/cats list is empty, bump version
This commit is contained in:
parent
d381abd82a
commit
72975a9a03
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.fox.ttrss"
|
package="org.fox.ttrss"
|
||||||
android:versionCode="138"
|
android:versionCode="139"
|
||||||
android:versionName="1.16" >
|
android:versionName="1.17" >
|
||||||
|
|
||||||
<uses-sdk
|
<uses-sdk
|
||||||
android:minSdkVersion="8"
|
android:minSdkVersion="8"
|
||||||
|
@ -4,9 +4,34 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="fill_parent" >
|
android:layout_height="fill_parent" >
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent">
|
<LinearLayout
|
||||||
<TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView>
|
android:id="@+id/loading_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:gravity="center" >
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/loading_message"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge" >
|
||||||
|
</TextView>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
|
|
||||||
|
<ListView
|
||||||
|
android:id="@+id/feeds"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" >
|
||||||
|
</ListView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/no_feeds"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:text="@string/no_feeds"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:visibility="invisible" >
|
||||||
|
</TextView>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
@ -1,16 +1,37 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/feeds_fragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="fill_parent" >
|
||||||
|
|
||||||
android:layout_height="fill_parent" android:layout_width="match_parent" android:id="@+id/feeds_fragment">
|
<LinearLayout
|
||||||
<LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent">
|
android:id="@+id/loading_container"
|
||||||
<TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView>
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:gravity="center" >
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/loading_message"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge" >
|
||||||
|
</TextView>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
|
|
||||||
|
|
||||||
<TextView android:id="@+id/no_feeds"
|
<ListView
|
||||||
android:visibility="invisible"
|
android:id="@+id/feeds"
|
||||||
android:layout_gravity="center" android:color="#909090"
|
android:layout_width="match_parent"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_feeds"></TextView>
|
android:layout_height="match_parent" >
|
||||||
|
</ListView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/no_feeds"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:text="@string/no_feeds"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:visibility="invisible" >
|
||||||
|
</TextView>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
@ -258,6 +258,14 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
|
|||||||
|
|
||||||
m_activity.setProgressBarVisibility(false);
|
m_activity.setProgressBarVisibility(false);
|
||||||
|
|
||||||
|
if (getView() != null) {
|
||||||
|
ListView list = (ListView)getView().findViewById(R.id.feeds);
|
||||||
|
|
||||||
|
if (list != null) {
|
||||||
|
list.setEmptyView(getView().findViewById(R.id.no_feeds));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
try {
|
try {
|
||||||
JsonArray content = result.getAsJsonArray();
|
JsonArray content = result.getAsJsonArray();
|
||||||
@ -285,6 +293,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
|
|||||||
setLoadingStatus(R.string.no_feeds_to_display, false);
|
setLoadingStatus(R.string.no_feeds_to_display, false);
|
||||||
else */
|
else */
|
||||||
|
|
||||||
|
m_adapter.notifyDataSetInvalidated();
|
||||||
m_activity.setLoadingStatus(R.string.blank, false);
|
m_activity.setLoadingStatus(R.string.blank, false);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -392,6 +392,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
|
|||||||
protected void onPostExecute(JsonElement result) {
|
protected void onPostExecute(JsonElement result) {
|
||||||
if (isDetached()) return;
|
if (isDetached()) return;
|
||||||
|
|
||||||
|
if (getView() != null) {
|
||||||
|
ListView list = (ListView)getView().findViewById(R.id.feeds);
|
||||||
|
|
||||||
|
if (list != null) {
|
||||||
|
list.setEmptyView(getView().findViewById(R.id.no_feeds));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
m_activity.setProgressBarVisibility(false);
|
m_activity.setProgressBarVisibility(false);
|
||||||
|
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
@ -415,6 +423,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
|
|||||||
else */
|
else */
|
||||||
|
|
||||||
m_activity.setLoadingStatus(R.string.blank, false);
|
m_activity.setLoadingStatus(R.string.blank, false);
|
||||||
|
m_adapter.notifyDataSetInvalidated();
|
||||||
|
|
||||||
if (m_enableFeedIcons && !m_feedIconsChecked &&
|
if (m_enableFeedIcons && !m_feedIconsChecked &&
|
||||||
Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
|
Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
|
||||||
|
Loading…
Reference in New Issue
Block a user