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

add transition animation for headlinesarticles activity

Browse Source
This commit is contained in:
Andrew Dolgov 2015-02-12 12:41:25 +03:00
parent 100ce3413e
commit 70056d68ac
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java Normal file → Executable file
View File

@ -11,6 +11,8 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Parcelable; import android.os.Parcelable;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
@ -466,8 +468,19 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
intent.putExtra("searchQuery", hf.getSearchQuery()); intent.putExtra("searchQuery", hf.getSearchQuery());
//intent.putParcelableArrayListExtra("articles", hf.getArticles()); //intent.putParcelableArrayListExtra("articles", hf.getArticles());
intent.putExtra("articles", (Parcelable)hf.getAllArticles()); intent.putExtra("articles", (Parcelable)hf.getAllArticles());
startActivityForResult(intent, HEADLINES_REQUEST); /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle());
} else {
startActivityForResult(intent, HEADLINES_REQUEST);
} */
View sharedList = hf.getView().findViewById(R.id.headlines_list);
ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST");
ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
} else { } else {
invalidateOptionsMenu(); invalidateOptionsMenu();
} }

26
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java Normal file → Executable file
View File

@ -32,8 +32,8 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
.getDefaultSharedPreferences(getApplicationContext()); .getDefaultSharedPreferences(getApplicationContext());
setAppTheme(m_prefs); setAppTheme(m_prefs);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.headlines_articles); setContentView(R.layout.headlines_articles);
@ -85,10 +85,14 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.headlines_fragment, new LoadingFragment(), null); final HeadlinesFragment hf = new HeadlinesFragment();
ft.replace(R.id.article_fragment, new LoadingFragment(), null); hf.initialize(feed, article, true, m_articles);
hf.setSearchQuery(searchQuery);
ft.commit();
ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES);
ft.replace(R.id.article_fragment, new LoadingFragment(), null);
ft.commit();
setTitle(feed.title); setTitle(feed.title);
@ -97,21 +101,15 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
public void run() { public void run() {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
HeadlinesFragment hf = new HeadlinesFragment();
hf.initialize(feed, article, true, m_articles);
hf.setSearchQuery(searchQuery);
ArticlePager af = new ArticlePager(); ArticlePager af = new ArticlePager();
af.initialize(article != null ? hf.getArticleById(article.id) : new Article(), feed, m_articles); af.initialize(article != null ? hf.getArticleById(article.id) : new Article(), feed, m_articles);
af.setSearchQuery(searchQuery); af.setSearchQuery(searchQuery);
ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES);
ft.replace(R.id.article_fragment, af, FRAG_ARTICLE); ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
ft.commit(); ft.commit();
} }
}, 25); }, 100);
} }
} }
} }

1
org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml Normal file → Executable file
View File

@ -22,6 +22,7 @@
<FrameLayout <FrameLayout
android:paddingRight="4dp" android:paddingRight="4dp"
android:id="@+id/headlines_fragment" android:id="@+id/headlines_fragment"
android:transitionName="TRANSITION:HEADLINES_LIST"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.4" android:layout_weight="0.4"

1
org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
View File

@ -12,6 +12,7 @@
<ListView <ListView
android:id="@+id/headlines_list" android:id="@+id/headlines_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:transitionName="TRANSITION:HEADLINES_LIST"
android:layout_height="match_parent" > android:layout_height="match_parent" >
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>