diff options
9 files changed, 6 insertions, 33 deletions
diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8c8430bc..59ab3835 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,7 +3,7 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> - <option name="distributionType" value="LOCAL" /> + <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" /> <option name="modules"> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index 42f9d912..ebd14bc9 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -453,8 +453,6 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra("articles", (Parcelable)hf.getAllArticles()); startActivityForResult(intent, HEADLINES_REQUEST); - overridePendingTransition(R.anim.right_slide_in, 0); - } else { invalidateOptionsMenu(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java index 6a25db7f..226ba5d1 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java @@ -163,7 +163,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL setResult(Activity.RESULT_OK, resultIntent); finish(); - overridePendingTransition(0, R.anim.right_slide_out); return true; default: Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); @@ -321,7 +320,5 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL setResult(Activity.RESULT_OK, resultIntent); super.onBackPressed(); - - overridePendingTransition(0, R.anim.right_slide_out); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index dddefa6d..a508f9aa 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -468,7 +468,7 @@ public class OnlineActivity extends CommonActivity { startActivityForResult(intent, 0); overridePendingTransition(0, 0); - + if (hasPendingOfflineData()) syncOfflineData(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java index 83b0843f..f390b890 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -335,8 +335,6 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead startActivityForResult(intent, 0); - overridePendingTransition(R.anim.right_slide_in, 0); - } else { refresh(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java index ed8ee518..f187f87e 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java @@ -132,7 +132,6 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline switch (item.getItemId()) { case android.R.id.home: finish(); - overridePendingTransition(0, R.anim.right_slide_out); return true; default: Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); @@ -201,6 +200,5 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline @Override public void onBackPressed() { super.onBackPressed(); - overridePendingTransition(0, R.anim.right_slide_out); } } diff --git a/org.fox.ttrss/src/main/res/anim/right_slide_in.xml b/org.fox.ttrss/src/main/res/anim/right_slide_in.xml deleted file mode 100644 index 2bb5acc1..00000000 --- a/org.fox.ttrss/src/main/res/anim/right_slide_in.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_decelerate_interpolator"> - <translate - android:fromXDelta="100%p" - android:toXDelta="0" - android:duration="200" - /> -</set> - diff --git a/org.fox.ttrss/src/main/res/anim/right_slide_out.xml b/org.fox.ttrss/src/main/res/anim/right_slide_out.xml deleted file mode 100644 index 134467f5..00000000 --- a/org.fox.ttrss/src/main/res/anim/right_slide_out.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_decelerate_interpolator"> - <translate - android:fromXDelta="0" - android:toXDelta="100%p" - android:duration="200" - /> -</set> - diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 64bdb43e..a33ac65c 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -10,9 +10,9 @@ <item name="headlineSelectedBackground">#88b0f0</item> <item name="headlineUnreadBackground">@android:color/white</item> <item name="headlineNormalBackground">#f5f5f5</item> - <item name="feedsSelectedBackground">?colorPrimaryDark</item> + <item name="feedsSelectedBackground">#cccccc</item> <item name="feedlistTextColor">@android:color/primary_text_light</item> - <item name="feedlistSelectedTextColor">#ffffff</item> + <item name="feedlistSelectedTextColor">?feedlistTextColor</item> <item name="headlineUnreadTextColor">@android:color/primary_text_light</item> <item name="headlineSelectedTextColor">#ffffff</item> <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item> @@ -105,8 +105,8 @@ <item name="feedlistBackground">#1c1d1e</item> <item name="headlinesBackground">#1c1d1e</item> <item name="articleBackground">#1c1d1e</item> - <item name="feedsSelectedBackground">?colorPrimaryDark</item> - <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> + <item name="feedsSelectedBackground">#1c1c1c</item> + <item name="feedlistSelectedTextColor">?feedlistTextColor</item> <item name="articleHeader">?colorPrimaryDark</item> <item name="articleHeaderTextColor">@android:color/white</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> |