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

use new account switcher

Browse Source
This commit is contained in:
sk
2023-05-30 22:42:56 +02:00
parent 71b6b2f451
commit 10dfe0327e
12 changed files with 397 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,79 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<org.joinmastodon.android.ui.views.CheckableRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="52dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<ImageView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_margin="16dp"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:importantForAccessibility="no"/>
<View
android:id="@+id/radiobtn"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerInParent="true"
android:layout_toStartOf="@+id/extra_btn_wrap"
android:layout_alignWithParentIfMissing="true"
android:layout_marginEnd="20dp"
android:layout_marginStart="12dp"
android:duplicateParentState="true" />
<FrameLayout
android:id="@id/extra_btn_wrap"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="12dp"
android:visibility="gone">
<View
android:layout_width="1dp"
android:layout_height="36dp"
android:layout_gravity="center_vertical|start"
android:background="?colorPollVoted" />
<ImageButton
android:id="@+id/extra_btn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:contentDescription="@string/sk_open_in_app"
android:tooltipText="@string/sk_open_in_app"
android:src="@drawable/ic_fluent_open_24_regular"
android:background="?android:selectableItemBackground" />
</FrameLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/avatar"
android:layout_toStartOf="@id/radiobtn"
android:layout_centerInParent="true"
android:orientation="vertical">
<TextView
android:id="@+id/display_name"
android:layout_width="wrap_content"
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="24dp"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"/>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="24dp"
android:textSize="14sp"
android:textColor="?android:textColorSecondary"
android:textColor="?colorM3OnSurfaceVariant"
android:textAppearance="@style/m3_body_medium"
android:singleLine="true"
android:gravity="center_vertical"
android:ellipsize="end"/>
</LinearLayout>
<TextView
android:id="@+id/add_account"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:text="@string/add_account"
android:singleLine="true"
android:visibility="gone"
android:ellipsize="end"/>
<Space
android:layout_width="0px"
android:layout_height="1px"
android:layout_weight="1"/>
<View
android:id="@+id/current"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@drawable/ic_fluent_checkmark_24_filled"
android:backgroundTint="?android:textColorSecondary"
android:contentDescription="@string/current_account"/>
<ImageButton
android:id="@+id/more"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_fluent_more_vertical_24_regular"
android:tint="?android:textColorSecondary"
android:contentDescription="@string/more_options"
android:background="?android:selectableItemBackgroundBorderless"/>
</LinearLayout>
</org.joinmastodon.android.ui.views.CheckableRelativeLayout>

31
mastodon/src/main/res/layout/item_external_share_heading.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/icon"
android:src="@drawable/ic_fluent_share_28_regular"
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginHorizontal="16dp"
android:importantForAccessibility="no"
tools:ignore="RtlSymmetry" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/sk_external_share_or_open_title"
android:textAppearance="@style/alert_title"
android:textColor="?colorM3OnSurface"
android:gravity="center_vertical" />
</LinearLayout>

15
mastodon/src/main/res/layout/item_text_with_icon.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="56dp"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurface"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="end"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:drawablePadding="24dp"
android:drawableTint="?colorM3OnSurfaceVariant"
tools:text="List Item"/>