summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-23 23:18:18 +0300
committerAndrew Dolgov <[email protected]>2011-11-23 23:18:18 +0300
commitc18ed97aa4b10d844e008c9dd610f775b5aaff8e (patch)
treec6176e2222df92f81ec0e19e369e49cd2bf43d1d /src
parent212031e3cf86a6fbf4f1c4b882a342b4a5b736a3 (diff)
add misc drawables
update layouts
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java2
-rw-r--r--src/org/fox/ttrss/MainActivity.java14
2 files changed, 13 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 10cabeb1..6a3e4d27 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -62,7 +62,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener {
list.setOnItemClickListener(this);
if (m_feed != null) refresh();
-
+
return view;
}
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 3123efa3..f46ea80a 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -88,13 +88,17 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect
ArticleFragment af = new ArticleFragment();
FragmentTransaction ft = getFragmentManager().beginTransaction();
+ ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
ft.replace(R.id.feeds_fragment, new FeedsFragment());
ft.replace(R.id.headlines_fragment, hf);
ft.replace(R.id.article_fragment, af);
- ft.hide(af);
- ft.hide(hf);
+ //ft.hide(hf);
+ //ft.hide(af);
ft.commit();
+ findViewById(R.id.article_fragment).setVisibility(View.GONE);
+ findViewById(R.id.headlines_fragment).setVisibility(View.GONE);
+
LoginRequest ar = new LoginRequest();
ar.setApi(m_prefs.getString("ttrss_url", null));
@@ -264,6 +268,8 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect
ft.replace(R.id.headlines_fragment, hf);
ft.addToBackStack(null);
ft.commit();
+
+ findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE);
}
public Article getSelectedArticle() {
@@ -276,6 +282,9 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect
m_selectedArticle = article;
+ article.unread = false;
+
+
ArticleFragment frag = new ArticleFragment();
FragmentTransaction ft = getFragmentManager().beginTransaction();
@@ -286,6 +295,7 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect
ft.addToBackStack(null);
ft.commit();
+ findViewById(R.id.article_fragment).setVisibility(View.VISIBLE);
}
public Feed getActiveFeed() {