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

fix appending new headlines on scroll

Browse Source 
remove unused stuff from preferences
This commit is contained in:
Andrew Dolgov 2012-09-16 23:19:12 +04:00
parent 67752b2c57
commit 556196cf6a
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/preferences.xml
View File

@ -94,11 +94,6 @@
android:summary="@string/combined_mode_summary"
android:title="@string/combined_mode" />
<CheckBoxPreference
android:defaultValue="false"
android:key="tablet_article_swipe"
android:title="@string/tablet_article_swipe" />
<CheckBoxPreference
android:defaultValue="true"
android:key="justify_article_text"

1
src/org/fox/ttrss/FeedsActivity.java
View File

@ -225,6 +225,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
//intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right);
startActivityForResult(intent, 0);
}
} else {

2
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -359,7 +359,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
final boolean isCat = m_feed.is_cat;
int skip = 0;
if (!m_feed.equals(TinyApplication.getInstance())) {
if (!m_feed.equals(TinyApplication.getInstance().m_activeFeed)) {
append = false;
}

5
src/org/fox/ttrss/PreferencesActivity.java
View File

@ -20,11 +20,6 @@ public class PreferencesActivity extends PreferenceActivity {
addPreferencesFromResource(R.xml.preferences);
if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE) {
PreferenceCategory category = (PreferenceCategory)findPreference("category_look_and_feel");
category.removePreference(findPreference("tablet_article_swipe"));
}
findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false));
findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {

3
src/org/fox/ttrss/types/Feed.java
View File

@ -32,6 +32,9 @@ public class Feed implements Comparable<Feed>, Parcelable {
if (feed == this)
return true;
if (feed == null)
return false;
return feed.id == this.id && (this.title == null || this.title.equals(feed.title)) && this.is_cat == feed.is_cat;
}