fix appending new headlines on scroll
remove unused stuff from preferences
This commit is contained in:
parent
67752b2c57
commit
556196cf6a
@ -94,11 +94,6 @@
|
|||||||
android:summary="@string/combined_mode_summary"
|
android:summary="@string/combined_mode_summary"
|
||||||
android:title="@string/combined_mode" />
|
android:title="@string/combined_mode" />
|
||||||
|
|
||||||
<CheckBoxPreference
|
|
||||||
android:defaultValue="false"
|
|
||||||
android:key="tablet_article_swipe"
|
|
||||||
android:title="@string/tablet_article_swipe" />
|
|
||||||
|
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="true"
|
android:defaultValue="true"
|
||||||
android:key="justify_article_text"
|
android:key="justify_article_text"
|
||||||
|
@ -225,6 +225,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
|
|||||||
|
|
||||||
//intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
//intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
||||||
|
|
||||||
|
overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right);
|
||||||
startActivityForResult(intent, 0);
|
startActivityForResult(intent, 0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -359,7 +359,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
|
|||||||
final boolean isCat = m_feed.is_cat;
|
final boolean isCat = m_feed.is_cat;
|
||||||
int skip = 0;
|
int skip = 0;
|
||||||
|
|
||||||
if (!m_feed.equals(TinyApplication.getInstance())) {
|
if (!m_feed.equals(TinyApplication.getInstance().m_activeFeed)) {
|
||||||
append = false;
|
append = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,11 +20,6 @@ public class PreferencesActivity extends PreferenceActivity {
|
|||||||
|
|
||||||
addPreferencesFromResource(R.xml.preferences);
|
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("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false));
|
||||||
|
|
||||||
findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
||||||
|
@ -32,6 +32,9 @@ public class Feed implements Comparable<Feed>, Parcelable {
|
|||||||
if (feed == this)
|
if (feed == this)
|
||||||
return true;
|
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;
|
return feed.id == this.id && (this.title == null || this.title.equals(feed.title)) && this.is_cat == feed.is_cat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user