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

move profile counters down

Browse Source
This commit is contained in:
sk
2023-02-02 15:46:26 +01:00
parent e22cb07d63
commit 35e0897869
1 changed files with 144 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.RecursiveSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" <me.grishka.appkit.views.RecursiveSwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/refresh_layout" android:id="@+id/refresh_layout"
@@ -22,7 +23,6 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:clipToPadding="false"> android:clipToPadding="false">
<org.joinmastodon.android.ui.views.CoverImageView <org.joinmastodon.android.ui.views.CoverImageView
@@ -58,7 +58,7 @@
android:layout_height="112dp" android:layout_height="112dp"
android:layout_below="@id/cover" android:layout_below="@id/cover"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="-40dp" android:layout_marginTop="-56dp"
android:layout_marginStart="14dp" android:layout_marginStart="14dp"
android:outlineProvider="@null" android:outlineProvider="@null"
android:background="@drawable/profile_ava_bg"> android:background="@drawable/profile_ava_bg">
@@ -74,103 +74,11 @@
</FrameLayout> </FrameLayout>
<LinearLayout
android:id="@+id/profile_counters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/cover"
android:layout_toEndOf="@id/avatar_border"
android:gravity="end">
<LinearLayout
android:id="@+id/posts_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="4dp">
<TextView
android:id="@+id/posts_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
android:singleLine="true"
android:ellipsize="end"
tools:text="123" />
<TextView
android:id="@+id/posts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
android:singleLine="true"
android:ellipsize="middle"
tools:text="posts" />
</LinearLayout>
<LinearLayout
android:id="@+id/following_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:padding="4dp"
android:orientation="vertical"
android:background="?android:selectableItemBackgroundBorderless"
android:gravity="center_horizontal">
<TextView
android:id="@+id/following_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
android:singleLine="true"
android:ellipsize="end"
tools:text="123"/>
<TextView
android:id="@+id/following_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
android:singleLine="true"
android:ellipsize="middle"
tools:text="following"/>
</LinearLayout>
<LinearLayout
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:padding="4dp"
android:orientation="vertical"
android:background="?android:selectableItemBackgroundBorderless"
android:gravity="center_horizontal">
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
android:singleLine="true"
android:ellipsize="end"
tools:text="123"/>
<TextView
android:id="@+id/followers_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
android:singleLine="true"
android:ellipsize="middle"
tools:text="followers"/>
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/profile_action_btn_wrap" android:id="@+id/profile_action_btn_wrap"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/profile_counters" android:layout_below="@id/cover"
android:layout_alignParentEnd="true"> android:layout_alignParentEnd="true">
<FrameLayout <FrameLayout
@@ -233,19 +141,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_border" android:layout_below="@id/avatar_border"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="17dp" android:layout_marginTop="17dp"
android:layout_marginBottom="0.4dp" android:layout_marginBottom="0.4dp"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@style/m3_headline_small" android:textAppearance="@style/m3_headline_small"
tools:text="Eugen" /> tools:text="Eugen" />
<TextView <TextView
android:id="@+id/username" android:id="@+id/username"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginHorizontal="16dp"
android:layout_below="@id/name" android:layout_below="@id/name"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
@@ -253,26 +160,14 @@
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
tools:text="\@Gargron" /> tools:text="\@Gargron" />
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textAppearance="@style/m3_body_large"
android:textSize="16sp"
tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
<EditText <EditText
android:id="@+id/name_edit" android:id="@+id/name_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_border" android:layout_below="@id/avatar_border"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_body_large" android:textAppearance="@style/m3_body_large"
android:textSize="16sp" android:textSize="16sp"
android:background="@drawable/edit_text_border" android:background="@drawable/edit_text_border"
@@ -281,13 +176,25 @@
android:elevation="0dp" android:elevation="0dp"
tools:text="Eugen" /> tools:text="Eugen" />
<FrameLayout
android:id="@+id/bio_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username"
android:layout_marginHorizontal="16dp">
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_body_large"
android:textSize="16sp"
tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
<EditText <EditText
android:id="@+id/bio_edit" android:id="@+id/bio_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/username"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textAppearance="@style/m3_body_large" android:textAppearance="@style/m3_body_large"
android:textSize="16sp" android:textSize="16sp"
android:background="@drawable/edit_text_border" android:background="@drawable/edit_text_border"
@@ -296,13 +203,117 @@
android:elevation="0dp" android:elevation="0dp"
tools:text="Founder, CEO and lead developer @Mastodon, Germany." /> tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
</FrameLayout>
<View
android:id="@+id/border_top"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@id/bio_container"
android:layout_marginTop="16dp"
android:background="?attr/colorPollVoted"/>
<LinearLayout
android:id="@+id/profile_counters"
android:background="?colorBackgroundLightest"
android:layout_below="@id/border_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
<LinearLayout
android:id="@+id/posts_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:minHeight="36dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/posts_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="123" />
<TextView
android:id="@+id/posts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle"
tools:text="posts" />
</LinearLayout>
<LinearLayout
android:id="@+id/following_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:orientation="horizontal"
android:minHeight="36dp"
android:gravity="center_vertical"
android:background="@drawable/bg_text_button">
<TextView
android:id="@+id/following_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="123"/>
<TextView
android:id="@+id/following_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle"
tools:text="following"/>
</LinearLayout>
<LinearLayout
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:orientation="horizontal"
android:minHeight="36dp"
android:gravity="center_vertical"
android:background="@drawable/bg_text_button">
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="123"/>
<TextView
android:id="@+id/followers_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4sp"
android:textAppearance="@style/m3_body_large"
android:singleLine="true"
android:ellipsize="middle"
tools:text="followers"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<org.joinmastodon.android.ui.tabs.TabLayout <org.joinmastodon.android.ui.tabs.TabLayout
android:id="@+id/tabbar" android:id="@+id/tabbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="38dp" android:layout_height="38dp"
android:layout_marginLeft="4dp" android:paddingHorizontal="4dp"
android:layout_marginRight="4dp" android:background="?colorBackgroundLightest"
app:tabPaddingStart="12dp" app:tabPaddingStart="12dp"
app:tabPaddingEnd="12dp" app:tabPaddingEnd="12dp"
app:tabMinWidth="0dp" app:tabMinWidth="0dp"
@@ -311,6 +322,13 @@
app:tabIndicatorColor="?android:textColorPrimary" app:tabIndicatorColor="?android:textColorPrimary"
app:tabMode="scrollable" app:tabMode="scrollable"
app:tabGravity="start"/> app:tabGravity="start"/>
<View
android:id="@+id/border_bottom"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="?attr/colorPollVoted"/>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"