Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/lock-shifts-layout' into feature/copy-username

This commit is contained in:
sk 2022-11-21 20:14:47 +01:00
parent 96a56873c3 5769b378e2
commit c2c44ab25e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@ -38,6 +38,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@ -434,10 +435,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain); ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
} }
ssb.append(" "); ssb.append(" ");
Drawable lock=username.getResources().getDrawable(R.drawable.ic_fluent_lock_closed_20_filled, getActivity().getTheme()).mutate(); Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight()); lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
lock.setTint(username.getCurrentTextColor()); lock.setTint(username.getCurrentTextColor());
ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0); ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
username.setText(ssb); username.setText(ssb);
}else{ }else{
// noinspection SetTextI18n // noinspection SetTextI18n

6
mastodon/src/main/res/drawable/ic_lock.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
<group android:translateX="-2" android:translateY="-1">
<path android:pathData="M10 2c1.657 0 3 1.343 3 3v1h1c1.105 0 2 0.895 2 2v7c0 1.105-0.895 2-2 2H6c-1.105 0-2-0.895-2-2V8c0-1.105 0.895-2 2-2h1V5c0-1.657 1.343-3 3-3zm0 8.5c-0.552 0-1 0.448-1 1s0.448 1 1 1 1-0.448 1-1-0.448-1-1-1zM10 4C9.448 4 9 4.448 9 5v1h2V5c0-0.552-0.448-1-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
</group>
</vector>

5
mastodon/src/main/res/layout/fragment_profile.xml
View File

@ -210,9 +210,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/name" android:layout_below="@id/name"
android:layout_marginStart="10dp" android:layout_marginStart="16dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="-6dp"
android:layout_toStartOf="@id/profile_action_btn_wrap" > android:layout_toStartOf="@id/profile_action_btn_wrap" >
<TextView <TextView
@ -220,7 +218,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="6dp"
android:textAppearance="@style/m3_title_medium" android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
tools:text="\@Gargron" /> tools:text="\@Gargron" />