iamthefij
/
tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feeds fragment: use order_id for categories

This commit is contained in:
Andrew Dolgov 2017-06-26 16:53:33 +03:00
parent f729a6ced7
commit 39140ba3ee
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.android.tools.build:gradle:2.3.3'
} }
} }

5
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,9 +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"
xmlns:tools="http://schemas.android.com/tools"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="447" android:versionCode="448"
android:versionName="1.213"> android:versionName="1.214">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

10
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
View File

@ -203,10 +203,16 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
class FeedOrderComparator implements Comparator<Feed> { class FeedOrderComparator implements Comparator<Feed> {
@Override @Override
public int compare(Feed a, Feed b) { public int compare(Feed a, Feed b) {
Log.d(TAG, "A:" + a.title + " " + a.is_cat + " " + a.order_id);
Log.d(TAG, "B:" + b.title + " " + b.is_cat + " " + b.order_id);
if (a.id >= 0 && b.id >= 0) if (a.id >= 0 && b.id >= 0)
if (a.is_cat && b.is_cat) if (a.is_cat && b.is_cat)
return a.title.toUpperCase().compareTo(b.title.toUpperCase()); if (a.order_id != 0 && b.order_id != 0)
return a.order_id - b.order_id;
else
return a.title.toUpperCase().compareTo(b.title.toUpperCase());
else if (a.is_cat && !b.is_cat) else if (a.is_cat && !b.is_cat)
return -1; return -1;
else if (!a.is_cat && b.is_cat) else if (!a.is_cat && b.is_cat)