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

set master/detail transitions like w/ custom tab

Browse Source
This commit is contained in:
Andrew Dolgov 2015-11-30 04:41:27 +03:00
parent 5205be67eb
commit d4c9e097bb
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="382" android:versionCode="383"
android:versionName="1.154" > android:versionName="1.155" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"

10
org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
View File

@ -297,4 +297,14 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
super.onBackPressed(); super.onBackPressed();
} }
@Override
public void onPause() {
super.onPause();
if (isFinishing()) {
overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
}
}
} }

1
org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
View File

@ -452,6 +452,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
// mysterious crashes somewhere in gl layer (?) on some feeds if we use activitycompat transitions here on LP so welp // mysterious crashes somewhere in gl layer (?) on some feeds if we use activitycompat transitions here on LP so welp
startActivityForResult(intent, HEADLINES_REQUEST); startActivityForResult(intent, HEADLINES_REQUEST);
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
} else { } else {

10
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
View File

@ -203,4 +203,14 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); super.onBackPressed();
} }
@Override
public void onPause() {
super.onPause();
if (isFinishing()) {
overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
}
}
} }

5
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
View File

@ -115,7 +115,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
if (m_drawerToggle != null) m_drawerToggle.syncState(); if (m_drawerToggle != null) m_drawerToggle.syncState();
} }
public void openFeedArticles(int feedId, boolean isCat) { /*public void openFeedArticles(int feedId, boolean isCat) {
if (isSmallScreen()) { if (isSmallScreen()) {
Intent intent = new Intent(OfflineMasterActivity.this, OfflineDetailActivity.class); Intent intent = new Intent(OfflineMasterActivity.this, OfflineDetailActivity.class);
@ -124,7 +124,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
intent.putExtra("article", 0); intent.putExtra("article", 0);
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
} }
} }*/
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
@ -341,6 +341,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
intent.putExtra("article", articleId); intent.putExtra("article", articleId);
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
} else { } else {
refresh(); refresh();