Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #687

This commit is contained in:
stom79 2019-01-02 14:47:33 +01:00
parent 9b097e93f7
commit e66d3ac7fb
9 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
View File

@ -46,6 +46,7 @@ import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.style.UnderlineSpan;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@ -805,6 +806,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
private void manageButtonVisibility(){
if( relationship == null)
return;
Log.v(Helper.TAG,"relationship.isRequested()= " + relationship.isRequested());
account_follow.setEnabled(true);
if( account.getId() != null && account.getId().equals(userId)){
account_follow.hide();
@ -816,8 +818,9 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
account_follow.show();
}else if( relationship.isRequested()){
account_follow_request.setVisibility(View.VISIBLE);
account_follow.hide();
doAction = action.NOTHING;
account_follow.setImageResource(R.drawable.ic_hourglass_full);
account_follow.show();
doAction = action.UNFOLLOW;
}else if( relationship.isFollowing()){
account_follow.setImageResource(R.drawable.ic_user_times);
doAction = action.UNFOLLOW;

BIN
app/src/main/res/drawable-hdpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
app/src/main/res/drawable-ldpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

BIN
app/src/main/res/drawable-mdpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 B

BIN
app/src/main/res/drawable-xhdpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 133 B

BIN
app/src/main/res/drawable-xxhdpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 219 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_hourglass_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

11
app/src/main/res/drawable/green_border.xml Normal file
View File

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

20
app/src/main/res/layout/activity_show_account.xml
View File

@ -173,30 +173,30 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<TextView
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:visibility="gone"
android:layout_marginTop="5dp"
android:id="@+id/account_followed_by"
android:layout_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:maxLines="1"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_follow_request"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
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:gravity="center"
android:textColor="?attr/colorAccent"
android:text="@string/request_sent"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>