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

remove manual transitions

Browse Source
This commit is contained in:
Andrew Dolgov 2015-02-11 18:28:59 +03:00
parent bf9173fa24
commit 97f177186b
9 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml
View File

@ -3,7 +3,7 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="LOCAL" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" /> <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
<option name="modules"> <option name="modules">

2
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
View File

@ -453,8 +453,6 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
intent.putExtra("articles", (Parcelable)hf.getAllArticles()); intent.putExtra("articles", (Parcelable)hf.getAllArticles());
startActivityForResult(intent, HEADLINES_REQUEST); startActivityForResult(intent, HEADLINES_REQUEST);
overridePendingTransition(R.anim.right_slide_in, 0);
} else { } else {
invalidateOptionsMenu(); invalidateOptionsMenu();
} }

3
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
View File

@ -163,7 +163,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
setResult(Activity.RESULT_OK, resultIntent); setResult(Activity.RESULT_OK, resultIntent);
finish(); finish();
overridePendingTransition(0, R.anim.right_slide_out);
return true; return true;
default: default:
Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
@ -321,7 +320,5 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
setResult(Activity.RESULT_OK, resultIntent); setResult(Activity.RESULT_OK, resultIntent);
super.onBackPressed(); super.onBackPressed();
overridePendingTransition(0, R.anim.right_slide_out);
} }
} }

2
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
View File

@ -335,8 +335,6 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
overridePendingTransition(R.anim.right_slide_in, 0);
} else { } else {
refresh(); refresh();
} }

2
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
View File

@ -132,7 +132,6 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
finish(); finish();
overridePendingTransition(0, R.anim.right_slide_out);
return true; return true;
default: default:
Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
@ -201,6 +200,5 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); super.onBackPressed();
overridePendingTransition(0, R.anim.right_slide_out);
} }
} }

9
org.fox.ttrss/src/main/res/anim/right_slide_in.xml
View File

@ -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>

9
org.fox.ttrss/src/main/res/anim/right_slide_out.xml
View File

@ -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>

8
org.fox.ttrss/src/main/res/values/style.xml
View File

@ -10,9 +10,9 @@
<item name="headlineSelectedBackground">#88b0f0</item> <item name="headlineSelectedBackground">#88b0f0</item>
<item name="headlineUnreadBackground">@android:color/white</item> <item name="headlineUnreadBackground">@android:color/white</item>
<item name="headlineNormalBackground">#f5f5f5</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="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="headlineUnreadTextColor">@android:color/primary_text_light</item>
<item name="headlineSelectedTextColor">#ffffff</item> <item name="headlineSelectedTextColor">#ffffff</item>
<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item> <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
@ -105,8 +105,8 @@
<item name="feedlistBackground">#1c1d1e</item> <item name="feedlistBackground">#1c1d1e</item>
<item name="headlinesBackground">#1c1d1e</item> <item name="headlinesBackground">#1c1d1e</item>
<item name="articleBackground">#1c1d1e</item> <item name="articleBackground">#1c1d1e</item>
<item name="feedsSelectedBackground">?colorPrimaryDark</item> <item name="feedsSelectedBackground">#1c1c1c</item>
<item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> <item name="feedlistSelectedTextColor">?feedlistTextColor</item>
<item name="articleHeader">?colorPrimaryDark</item> <item name="articleHeader">?colorPrimaryDark</item>
<item name="articleHeaderTextColor">@android:color/white</item> <item name="articleHeaderTextColor">@android:color/white</item>
<item name="floatingActionButtonStyle">@style/FabTheme</item> <item name="floatingActionButtonStyle">@style/FabTheme</item>