Fix issue #687
This commit is contained in:
parent
9b097e93f7
commit
e66d3ac7fb
|
@ -46,6 +46,7 @@ import android.text.Spanned;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
import android.text.style.ForegroundColorSpan;
|
import android.text.style.ForegroundColorSpan;
|
||||||
import android.text.style.UnderlineSpan;
|
import android.text.style.UnderlineSpan;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
@ -805,6 +806,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
|
||||||
private void manageButtonVisibility(){
|
private void manageButtonVisibility(){
|
||||||
if( relationship == null)
|
if( relationship == null)
|
||||||
return;
|
return;
|
||||||
|
Log.v(Helper.TAG,"relationship.isRequested()= " + relationship.isRequested());
|
||||||
account_follow.setEnabled(true);
|
account_follow.setEnabled(true);
|
||||||
if( account.getId() != null && account.getId().equals(userId)){
|
if( account.getId() != null && account.getId().equals(userId)){
|
||||||
account_follow.hide();
|
account_follow.hide();
|
||||||
|
@ -816,8 +818,9 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
|
||||||
account_follow.show();
|
account_follow.show();
|
||||||
}else if( relationship.isRequested()){
|
}else if( relationship.isRequested()){
|
||||||
account_follow_request.setVisibility(View.VISIBLE);
|
account_follow_request.setVisibility(View.VISIBLE);
|
||||||
account_follow.hide();
|
account_follow.setImageResource(R.drawable.ic_hourglass_full);
|
||||||
doAction = action.NOTHING;
|
account_follow.show();
|
||||||
|
doAction = action.UNFOLLOW;
|
||||||
}else if( relationship.isFollowing()){
|
}else if( relationship.isFollowing()){
|
||||||
account_follow.setImageResource(R.drawable.ic_user_times);
|
account_follow.setImageResource(R.drawable.ic_user_times);
|
||||||
doAction = action.UNFOLLOW;
|
doAction = action.UNFOLLOW;
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 146 B |
Binary file not shown.
After Width: | Height: | Size: 254 B |
Binary file not shown.
After Width: | Height: | Size: 120 B |
Binary file not shown.
After Width: | Height: | Size: 133 B |
Binary file not shown.
After Width: | Height: | Size: 219 B |
Binary file not shown.
After Width: | Height: | Size: 216 B |
|
@ -0,0 +1,11 @@
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
|
||||||
|
<solid android:color="@android:color/transparent" />
|
||||||
|
<stroke android:width="1dip" android:color="@color/verified_text"/>
|
||||||
|
<corners
|
||||||
|
android:radius="2dp">
|
||||||
|
</corners>
|
||||||
|
<padding android:bottom="1dip"
|
||||||
|
android:left="4dip"
|
||||||
|
android:right="4dip"
|
||||||
|
android:top="1dip"/>
|
||||||
|
</shape>
|
|
@ -173,30 +173,30 @@
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:orientation="vertical">
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
android:id="@+id/account_followed_by"
|
android:id="@+id/account_followed_by"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:textColor="?attr/colorAccent"
|
android:textColor="@color/verified_text"
|
||||||
|
android:background="@drawable/green_border"
|
||||||
android:text="@string/followed_by"
|
android:text="@string/followed_by"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/account_follow_request"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:id="@+id/account_follow_request"
|
||||||
|
android:textColor="@color/mastodonC4"
|
||||||
|
android:background="@drawable/blue_border"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:textColor="?attr/colorAccent"
|
|
||||||
android:text="@string/request_sent"
|
android:text="@string/request_sent"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
/>
|
/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
Loading…
Reference in New Issue