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

feat(external-share): start re-design

Browse Source
This commit is contained in:
FineFindus
2023-03-17 20:36:18 +01:00
parent 8ce782b578
commit 6e5fa34be6
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
View File

@@ -8,6 +8,7 @@ import android.graphics.drawable.Animatable;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowInsets; import android.view.WindowInsets;
@@ -80,7 +81,7 @@ public class AccountSwitcherSheet extends BottomSheet{
AccountViewHolder holder = new AccountViewHolder(); AccountViewHolder holder = new AccountViewHolder();
holder.more.setVisibility(View.GONE); holder.more.setVisibility(View.GONE);
holder.currentIcon.setVisibility(View.GONE); holder.currentIcon.setVisibility(View.GONE);
holder.name.setText(R.string.add_account); holder.display_name.setText(R.string.add_account);
holder.avatar.setScaleType(ImageView.ScaleType.CENTER); holder.avatar.setScaleType(ImageView.ScaleType.CENTER);
holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled); holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary))); holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
@@ -184,6 +185,7 @@ public class AccountSwitcherSheet extends BottomSheet{
private class AccountViewHolder extends BindableViewHolder<AccountSession> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{ private class AccountViewHolder extends BindableViewHolder<AccountSession> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
private final TextView name; private final TextView name;
private final TextView display_name;
private final ImageView avatar; private final ImageView avatar;
private final ImageButton more; private final ImageButton more;
private final View currentIcon; private final View currentIcon;
@@ -192,6 +194,7 @@ public class AccountSwitcherSheet extends BottomSheet{
public AccountViewHolder(){ public AccountViewHolder(){
super(activity, R.layout.item_account_switcher, list); super(activity, R.layout.item_account_switcher, list);
name=findViewById(R.id.name); name=findViewById(R.id.name);
display_name=findViewById(R.id.display_name);
avatar=findViewById(R.id.avatar); avatar=findViewById(R.id.avatar);
more=findViewById(R.id.more); more=findViewById(R.id.more);
currentIcon=findViewById(R.id.current); currentIcon=findViewById(R.id.current);
@@ -211,6 +214,7 @@ public class AccountSwitcherSheet extends BottomSheet{
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@Override @Override
public void onBind(AccountSession item){ public void onBind(AccountSession item){
display_name.setText(item.self.displayName);
name.setText("@"+item.self.username+"@"+item.domain); name.setText("@"+item.self.username+"@"+item.domain);
if(AccountSessionManager.getInstance().getLastActiveAccountID().equals(item.getID())){ if(AccountSessionManager.getInstance().getLastActiveAccountID().equals(item.getID())){
more.setVisibility(View.GONE); more.setVisibility(View.GONE);

49
mastodon/src/main/res/layout/item_account_switcher.xml
View File

@@ -2,30 +2,53 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="wrap_content"
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="12dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView <ImageView
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_width="32dp" android:layout_width="48dp"
android:layout_height="32dp" android:layout_height="48dp"
android:padding="2dp"
android:layout_gravity="center"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <LinearLayout
android:id="@+id/name" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_weight="1"
android:layout_marginStart="24dp" <TextView
android:textSize="16sp" android:id="@+id/display_name"
android:textColor="?android:textColorPrimary" android:layout_width="wrap_content"
android:singleLine="true" android:layout_height="wrap_content"
android:ellipsize="end"/> android:layout_weight="1"
android:layout_marginStart="24dp"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:singleLine="true"
android:ellipsize="end"/>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="24dp"
android:textSize="14sp"
android:textColor="?android:textColorSecondary"
android:singleLine="true"
android:ellipsize="end"/>
</LinearLayout>
<View <View
android:id="@+id/current" android:id="@+id/current"
android:layout_gravity="end|center"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/ic_fluent_checkmark_24_filled" android:background="@drawable/ic_fluent_checkmark_24_filled"