diff options
| -rw-r--r-- | CONTRIBUTING.md | 12 | ||||
| -rwxr-xr-x | build.gradle | 2 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 5 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 10 |
4 files changed, 17 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 172084f5..15bbce72 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,9 @@ ## Contributing code the right way -*or: how I learned to post merge requests without crying myself to sleep* +TLDR: it works pretty much like Github. + +1. Make an account on Gogs +2. Fork the repository you're interested in +3. Do the needful +4. File a pull request with your changes against master branch. -1. Post your idea on the forums. Preferably post diffs if you got them. Mention your gitlab username. -2. If your idea was accepted, request developer permissions for the project via Gitlab. -2. When you have developer privileges you can make branches, check them out, work on them locally, push them back and post merge requests. -3. Usual stuff applies: don't post unrelated issues in one merge request, try to not screw up indenting (tt-rss mostly uses tab characters), try to respect surrounding formatting style, etc. -4. That's it.
\ No newline at end of file diff --git a/build.gradle b/build.gradle index dad1e485..ae5a0eb1 100755 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index eb23e812..8126a1f0 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" package="org.fox.ttrss" - android:versionCode="447" - android:versionName="1.213"> + android:versionCode="448" + android:versionName="1.214"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index cf242daf..02f98a4d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -203,10 +203,16 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi class FeedOrderComparator implements Comparator<Feed> { @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.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) return -1; else if (!a.is_cat && b.is_cat) |