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

You can now follow and unfollow accounts. Revolutionary.

Browse Source
This commit is contained in:
Grishka
2022-02-13 02:33:41 +03:00
parent 0615aa34f2
commit 9232428232
5 changed files with 121 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,14 +125,31 @@
tools:text="following" />
</LinearLayout>
<Button
android:id="@+id/profile_action_btn"
<FrameLayout
android:id="@+id/profile_action_btn_wrap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/following_btn"
android:layout_margin="16dp"
tools:text="Edit Profile"/>
android:padding="16dp"
android:clipToPadding="false">
<org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/profile_action_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Edit Profile"/>
<ProgressBar
android:id="@+id/action_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
style="?android:progressBarStyleSmall"
android:elevation="10dp"
android:outlineProvider="none"
android:indeterminateTint="@color/text_button"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:id="@+id/name"
@@ -142,7 +159,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_toStartOf="@id/profile_action_btn"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_headline_small"
tools:text="Eugen" />
@@ -152,7 +169,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/name"
android:layout_marginStart="16dp"
android:layout_toStartOf="@id/profile_action_btn"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_title_medium"
android:textColor="@color/light_ui_action_button"
tools:text="\@Gargron"/>
@@ -176,7 +193,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_toStartOf="@id/profile_action_btn"
android:layout_toStartOf="@id/profile_action_btn_wrap"
android:textAppearance="@style/m3_body_large"
android:background="@drawable/edit_text_border"
android:inputType="textPersonName|textCapWords"

1
mastodon/src/main/res/values/colors.xml
View File

@@ -34,6 +34,7 @@
<color name="actionbar_bg">#FAFBFC</color>
<color name="navigation_bar_bg">#000</color>
<color name="highlight_over_dark">#80FFFFFF</color>
<color name="text_button">@color/gray_50</color>
<color name="favorite_selected">#FF9F0A</color>
<color name="boost_selected">#79BD9A</color>