From d4c9e097bb8a7d17b802a1a6c45496654b13fa46 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 30 Nov 2015 04:41:27 +0300
Subject: set master/detail transitions like w/ custom tab

---
 org.fox.ttrss/src/main/AndroidManifest.xml                     |  4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java  | 10 ++++++++++
 org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java  |  1 +
 .../main/java/org/fox/ttrss/offline/OfflineDetailActivity.java | 10 ++++++++++
 .../main/java/org/fox/ttrss/offline/OfflineMasterActivity.java |  5 +++--
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0d179949..4b6827ae 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="382"
-    android:versionName="1.154" >
+    android:versionCode="383"
+    android:versionName="1.155" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 0a0cb8cb..6e51d033 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -297,4 +297,14 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 
         super.onBackPressed();
     }
+
+	@Override
+	public void onPause() {
+		super.onPause();
+
+		if (isFinishing()) {
+			overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+		}
+
+	}
 }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 87fc9d55..1515883c 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -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
             startActivityForResult(intent, HEADLINES_REQUEST);
+			overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
 
 
 		} else {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
index 2b69bff0..6031d730 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
@@ -203,4 +203,14 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea
 	public void onBackPressed() {
 		super.onBackPressed();
 	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+
+		if (isFinishing()) {
+			overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+		}
+
+	}
 }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
index 95f6add0..1823d133 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
@@ -115,7 +115,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
         if (m_drawerToggle != null) m_drawerToggle.syncState();
     }
 
-	public void openFeedArticles(int feedId, boolean isCat) {
+	/*public void openFeedArticles(int feedId, boolean isCat) {
 		if (isSmallScreen()) {
 			Intent intent = new Intent(OfflineMasterActivity.this, OfflineDetailActivity.class);
 			
@@ -124,7 +124,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
 			intent.putExtra("article", 0);
 			startActivityForResult(intent, 0);
 		}
-	}
+	}*/
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
@@ -341,6 +341,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
 			intent.putExtra("article", articleId);
 	 	   
 			startActivityForResult(intent, 0);
+			overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
 
 		} else {
 			refresh();
-- 
cgit v1.2.3