Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-01-22 04:50:17 +01:00
Code Issues Releases Wiki Activity

fully switched to jitpack

Browse Source 
use decelerate animation for quick return
This commit is contained in:
Mariotaku Lee 2015-03-26 22:26:52 +08:00
parent 13f33291bc
commit 4f34fb4780
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "libraries/ColorPicker"]
path = libraries/ColorPicker
url = https://github.com/uucky/ColorPicker-Android.git

1
libraries/ColorPicker

@ -1 +0,0 @@
Subproject commit 30dd3c3e8c738f8308ccf1b2400f6595a885d0dc

5
settings.gradle
View File

@ -11,7 +11,4 @@ include ':twidere.donate.nyanwp.wear'
include ':twidere.component.nyan'
include ':twidere.extension.streaming'
include ':twidere.extension.twitlonger'
include ':twidere.extension.push.xiaomi'
include ':ColorPicker'
project(':ColorPicker').projectDir = file('libraries/ColorPicker/library')
include ':twidere.extension.push.xiaomi'

2
twidere/build.gradle
View File

@ -75,13 +75,13 @@ dependencies {
compile 'com.github.mariotaku:MessageBubbleView:1.0'
compile 'com.github.mariotaku:DragSortListView:0.6.1'
compile 'com.github.mariotaku:SlidingMenu:1.3'
compile 'com.github.uucky:ColorPicker-Android:0.9.1'
googleCompile 'com.google.android.gms:play-services-maps:7.0.0'
googleCompile 'com.google.maps.android:android-maps-utils:0.3.4'
fdroidCompile 'org.osmdroid:osmdroid-android:4.3'
fdroidCompile 'org.slf4j:slf4j-simple:1.7.10'
compile project(':twidere.component.common')
compile project(':twidere.component.nyan')
compile project(':ColorPicker')
compile fileTree(dir: 'libs/main', include: ['*.jar'])
googleCompile fileTree(dir: 'libs/google', include: ['*.jar'])
}

2
twidere/src/main/java/org/mariotaku/twidere/activity/support/HomeActivity.java
View File

@ -59,6 +59,7 @@ import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.FrameLayout.LayoutParams;
import android.widget.Toast;
@ -233,6 +234,7 @@ public class HomeActivity extends BaseActionBarActivity implements OnClickListen
if (offset <= 0) return;
animator = ObjectAnimator.ofFloat(this, ControlBarOffsetProperty.SINGLETON, offset, 0);
}
animator.setInterpolator(new DecelerateInterpolator());
animator.addListener(this);
animator.setDuration(DURATION);
animator.start();

5
twidere/src/main/res/values/strings.xml
View File

@ -56,7 +56,6 @@
<string name="unfavorite">Unfavorite</string>
<string name="reply">Reply</string>
<string name="share">Share</string>
<string name="share_via_twidere">Share via Twidere</string>
<string name="view_image">Image</string>
<string name="view_map">Map</string>
<string name="view_status">View tweet</string>
@ -100,8 +99,8 @@
<string name="users_favorited_this">Users favorited this</string>
<string name="reply_to">Reply to <xliff:g id="user_name">%s</xliff:g></string>
<string name="quote_user">Quote <xliff:g id="user_name">%s</xliff:g></string>
<string name="time_source"><xliff:g id="time">%1$s</xliff:g>, via <xliff:g id="source">%2$s</xliff:g></string>
<string name="source">via <xliff:g id="source">%s</xliff:g></string>
<string name="time_source"><xliff:g id="time">%1$s</xliff:g> · <xliff:g id="source">%2$s</xliff:g></string>
<string name="source"><xliff:g id="source">%s</xliff:g></string>
<string name="filters">Filters</string>
<string name="users">Users</string>
<string name="user">User</string>