Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated build script version

This commit is contained in:
Mariotaku Lee 2014-12-11 14:38:40 +08:00
parent a07fbf3102
commit 8d18bdf844
9 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DragSortListView

@ -1 +1 @@
Subproject commit bed0ede61d99c45746f84a87930d271f195e35a0
Subproject commit cf66bea00da85aa4c65e62b79918e3e6909e9327

2
libraries/MenuComponent

@ -1 +1 @@
Subproject commit f988e0bdf132fdd4f6430d9de9acde64c6770730
Subproject commit 02a55799acd1c7d69067f1581c48c7eca4056950

2
libraries/MessageBubbleView

@ -1 +1 @@
Subproject commit c2abc8708204fd2437cd069f173ac8a74f601266
Subproject commit 10724315c13768d16891c0ff0926daecba39c75c

2
libraries/PullToRefresh

@ -1 +1 @@
Subproject commit d58d3151e8410524d8d223a7b78c62f3a1a5a69d
Subproject commit 08a26b0998ed227cbcaf849eb97c2351f050008e

2
libraries/RefreshNow

@ -1 +1 @@
Subproject commit 45c34152104f49e8cad50ebc86233de131ce3000
Subproject commit f4e2d5afba10ae45528d43dce3629a5db7f2738e

2
libraries/SlidingMenu

@ -1 +1 @@
Subproject commit ef54ac9c260a982279fa963bca948e8b8d0ecf01
Subproject commit 1fddbfad5b8cf72073e4bdf95a815b0585078fe1

2
twidere.wear/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 20
buildToolsVersion "21.1"
buildToolsVersion "21.1.2"
defaultConfig {
applicationId "org.mariotaku.twidere"

12
twidere/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion '21.1.1'
buildToolsVersion '21.1.2'
defaultConfig {
applicationId "org.mariotaku.twidere"
@ -81,10 +81,10 @@ android {
dependencies {
// wearApp project(':twidere.wear')
compile 'com.android.support:support-v13:21.0.2'
compile 'com.android.support:cardview-v7:21.0.2'
compile 'com.android.support:recyclerview-v7:21.0.2'
compile 'com.android.support:palette-v7:21.0.2'
compile 'com.android.support:support-v13:21.0.3'
compile 'com.android.support:cardview-v7:21.0.3'
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.android.support:palette-v7:21.0.3'
compile 'com.sothree.slidinguppanel:library:2.0.4'
compile 'it.sephiroth.android.library.imagezoom:imagezoom:2.1.1'
compile 'com.twitter:twitter-text:1.10.2'
@ -94,7 +94,7 @@ dependencies {
compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.squareup:otto:1.3.5'
googleCompile 'com.google.android.gms:play-services:6.1.71'
googleCompile 'com.google.android.gms:play-services:6.5.87'
fdroidCompile 'org.osmdroid:osmdroid-android:4.2'
fdroidCompile 'org.slf4j:slf4j-simple:1.6.1'
compile project(':SlidingMenu')

13
twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
View File

@ -348,7 +348,7 @@ public class StatusFragment extends BaseSupportFragment
private final int mTextSize;
private ParcelableStatus mStatus;
private ParcelableAccountWithCredentials mStatusAccount;
private List<ParcelableStatus> mConversation, mReplies;
private boolean mDetailMediaExpanded;
@ -410,6 +410,10 @@ public class StatusFragment extends BaseSupportFragment
}
}
public ParcelableAccountWithCredentials getStatusAccount() {
return mStatusAccount;
}
@Override
public int getStatusCount() {
return getConversationCount() + 1 + getRepliesCount() + 1;
@ -441,6 +445,11 @@ public class StatusFragment extends BaseSupportFragment
public boolean setStatus(ParcelableStatus status) {
final ParcelableStatus old = mStatus;
mStatus = status;
if (status != null) {
mStatusAccount = ParcelableAccount.getAccountWithCredentials(mContext, status.account_id);
} else {
mStatusAccount = null;
}
notifyDataSetChanged();
return !CompareUtils.objectEquals(old, status);
}
@ -889,7 +898,7 @@ public class StatusFragment extends BaseSupportFragment
mediaPreviewGrid.setVisibility(View.GONE);
mediaPreviewGrid.removeAllViews();
}
setMenuForStatus(context, menuBar.getMenu(), status);
setMenuForStatus(context, menuBar.getMenu(), status, adapter.getStatusAccount());
menuBar.show();
}