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

fixed #756 

improved follow button elevation
This commit is contained in:
Mariotaku Lee 2017-04-08 18:08:59 +08:00
parent 06b354f393
commit 8ca86a00f9
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -35,7 +35,7 @@ subprojects {
libVersions = [ libVersions = [
Kotlin : '1.1.1', Kotlin : '1.1.1',
SupportLib : '25.3.1', SupportLib : '25.3.1',
MariotakuCommons : '0.9.12', MariotakuCommons : '0.9.13',
RestFu : '0.9.44', RestFu : '0.9.44',
ObjectCursor : '0.9.16', ObjectCursor : '0.9.16',
PlayServices : '10.2.1', PlayServices : '10.2.1',

3
twidere/src/main/java/org/mariotaku/twidere/model/DefaultFeatures.java
View File

@ -10,6 +10,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.JsonToken;
import org.mariotaku.commons.logansquare.LoganSquareMapperFinder;
import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.GET;
import org.mariotaku.restfu.http.HttpRequest; import org.mariotaku.restfu.http.HttpRequest;
import org.mariotaku.restfu.http.HttpResponse; import org.mariotaku.restfu.http.HttpResponse;
@ -61,7 +62,7 @@ public class DefaultFeatures {
HttpRequest request = new HttpRequest.Builder().method(GET.METHOD).url(REMOTE_SETTINGS_URL).build(); HttpRequest request = new HttpRequest.Builder().method(GET.METHOD).url(REMOTE_SETTINGS_URL).build();
final HttpResponse response = client.newCall(request).execute(); final HttpResponse response = client.newCall(request).execute();
try { try {
final JsonMapper<DefaultFeatures> mapper = LoganSquare.mapperFor(DefaultFeatures.class); final JsonMapper<DefaultFeatures> mapper = LoganSquareMapperFinder.mapperFor(DefaultFeatures.class);
final JsonParser jsonParser = LoganSquare.JSON_FACTORY.createParser(response.getBody().stream()); final JsonParser jsonParser = LoganSquare.JSON_FACTORY.createParser(response.getBody().stream());
if (jsonParser.getCurrentToken() == null) { if (jsonParser.getCurrentToken() == null) {
jsonParser.nextToken(); jsonParser.nextToken();

9
twidere/src/main/res/layout/header_user.xml
View File

@ -47,6 +47,8 @@
android:layout_below="@+id/profileBannerSpace" android:layout_below="@+id/profileBannerSpace"
android:layout_toEndOf="@+id/profileImage" android:layout_toEndOf="@+id/profileImage"
android:layout_toRightOf="@+id/profileImage" android:layout_toRightOf="@+id/profileImage"
android:clipChildren="false"
android:clipToPadding="false"
android:minWidth="48dp" android:minWidth="48dp"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/element_spacing_xsmall" android:paddingBottom="@dimen/element_spacing_xsmall"
@ -58,10 +60,12 @@
<FrameLayout <FrameLayout
android:id="@+id/followContainer" android:id="@+id/followContainer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/element_size_normal"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:clipChildren="false"
android:clipToPadding="false"
android:minHeight="@dimen/element_size_normal" android:minHeight="@dimen/element_size_normal"
android:minWidth="@dimen/element_size_normal"> android:minWidth="@dimen/element_size_normal">
@ -69,7 +73,7 @@
android:id="@+id/follow" android:id="@+id/follow"
style="?buttonStyleSmall" style="?buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" android:visibility="gone"
app:iabColor="@android:color/transparent" app:iabColor="@android:color/transparent"
@ -89,7 +93,6 @@
</FrameLayout> </FrameLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"