# Conflicts: # README.md # build.gradle # mastodon/build.gradle # mastodon/src/main/AndroidManifest.xml # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/MainActivity.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java # mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java # mastodon/src/main/java/org/joinmastodon/android/model/Status.java # mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java # mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml # mastodon/src/main/res/color/button_text_primary_light_on_dark.xml # mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml # mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml # mastodon/src/main/res/drawable/bg_search_field.xml # mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml # mastodon/src/main/res/layout/compose_action.xml # mastodon/src/main/res/layout/compose_media_thumb.xml # mastodon/src/main/res/layout/compose_poll_option.xml # mastodon/src/main/res/layout/display_item_footer.xml # mastodon/src/main/res/layout/display_item_header.xml # mastodon/src/main/res/layout/display_item_text.xml # mastodon/src/main/res/layout/fragment_compose.xml # mastodon/src/main/res/layout/fragment_profile.xml # mastodon/src/main/res/layout/item_instance_category.xml # mastodon/src/main/res/layout/item_report_choice.xml # mastodon/src/main/res/layout/item_settings_footer.xml # mastodon/src/main/res/layout/item_settings_switch.xml # mastodon/src/main/res/layout/item_settings_theme.xml # mastodon/src/main/res/layout/item_settings_theme_subitem.xml # mastodon/src/main/res/layout/item_settings_update.xml # mastodon/src/main/res/layout/tab_bar.xml # mastodon/src/main/res/menu/mute_duration.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-fa/strings_sk.xml # mastodon/src/main/res/values-night/colors.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # mastodon/src/main/res/values-zh-rCN/strings_sk.xml # mastodon/src/main/res/values/attrs.xml # mastodon/src/main/res/values/ids.xml # mastodon/src/main/res/values/styles.xml # metadata/es/changelogs/83.txt
284 lines
8.9 KiB
XML
284 lines
8.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?colorM3SurfaceVariant"
|
|
android:elevation="2dp"
|
|
android:paddingBottom="0dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/cover"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="128dp"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginLeft="4dp"
|
|
android:layout_marginRight="4dp"
|
|
android:scaleType="centerCrop"
|
|
tools:src="#0f0"/>
|
|
|
|
<View
|
|
android:id="@+id/avatar_border"
|
|
android:layout_width="60dp"
|
|
android:layout_height="60dp"
|
|
android:layout_below="@id/cover"
|
|
android:layout_alignParentStart="true"
|
|
android:layout_marginTop="-6dp"
|
|
android:layout_marginStart="14dp"
|
|
android:background="@drawable/discover_ava_bg"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/avatar"
|
|
android:layout_width="56dp"
|
|
android:layout_height="56dp"
|
|
android:layout_below="@id/cover"
|
|
android:layout_alignParentStart="true"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_marginTop="-4dp"
|
|
android:scaleType="centerCrop"
|
|
tools:src="#f00" />
|
|
|
|
<TextView
|
|
android:id="@+id/name"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="24dp"
|
|
android:layout_toEndOf="@id/avatar"
|
|
android:layout_below="@id/cover"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginEnd="16dp"
|
|
android:singleLine="true"
|
|
android:ellipsize="end"
|
|
android:gravity="center_vertical"
|
|
android:textAppearance="@style/m3_title_medium"
|
|
tools:text="Eugen"/>
|
|
|
|
<TextView
|
|
android:id="@+id/username"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignStart="@id/name"
|
|
android:layout_alignEnd="@id/name"
|
|
android:layout_below="@id/name"
|
|
android:singleLine="true"
|
|
android:ellipsize="end"
|
|
android:gravity="center_vertical"
|
|
android:textAppearance="@style/m3_title_small"
|
|
tools:text="\@Gargron@mastodon.social"/>
|
|
|
|
<TextView
|
|
android:id="@+id/bio"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/avatar"
|
|
android:layout_marginLeft="16dp"
|
|
android:layout_marginRight="16dp"
|
|
android:layout_marginTop="8dp"
|
|
android:textAppearance="@style/m3_body_large"
|
|
tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/bio"
|
|
android:orientation="horizontal">
|
|
|
|
<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="16dp"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_gravity="bottom"
|
|
android:paddingTop="4dp"
|
|
android:gravity="center_vertical"
|
|
android:minHeight="44dp">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/posts_btn"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dp"
|
|
android:layout_marginEnd="8dp"
|
|
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:layout_marginTop="2dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:orientation="horizontal"
|
|
android:gravity="center_vertical">
|
|
<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:layout_marginTop="2dp"
|
|
android:orientation="horizontal"
|
|
android:gravity="center_vertical">
|
|
<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>
|
|
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/reject_btn_wrap"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="bottom"
|
|
android:paddingStart="8dp"
|
|
android:paddingEnd="4dp"
|
|
android:clipToPadding="false"
|
|
android:paddingBottom="8dp"
|
|
android:visibility="gone">
|
|
|
|
<org.joinmastodon.android.ui.views.ProgressBarButton
|
|
android:id="@+id/reject_btn"
|
|
style="@style/Widget.Mastodon.M3.Button.Text"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minHeight="48dp"
|
|
android:minWidth="56dp"
|
|
android:paddingStart="16dp"
|
|
android:paddingEnd="16dp"
|
|
android:drawablePadding="0dp"
|
|
android:contentDescription="@string/sk_reject_follow_request"
|
|
android:drawableStart="@drawable/ic_fluent_dismiss_24_filled"
|
|
android:singleLine="true" />
|
|
|
|
<ProgressBar
|
|
android:id="@+id/reject_progress"
|
|
style="?android:progressBarStyleSmall"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:elevation="10dp"
|
|
android:indeterminate="true"
|
|
android:outlineProvider="none"
|
|
android:visibility="gone" />
|
|
</FrameLayout>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/accept_btn_wrap"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="bottom"
|
|
android:paddingStart="4dp"
|
|
android:paddingEnd="16dp"
|
|
android:clipToPadding="false"
|
|
android:paddingBottom="8dp"
|
|
android:visibility="gone">
|
|
|
|
<org.joinmastodon.android.ui.views.ProgressBarButton
|
|
android:id="@+id/accept_btn"
|
|
style="@style/Widget.Mastodon.M3.Button.Filled"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minHeight="48dp"
|
|
android:minWidth="56dp"
|
|
android:paddingStart="16dp"
|
|
android:paddingEnd="16dp"
|
|
android:drawablePadding="0dp"
|
|
android:contentDescription="@string/sk_accept_follow_request"
|
|
android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
|
|
android:singleLine="true" />
|
|
|
|
<ProgressBar
|
|
android:id="@+id/accept_progress"
|
|
style="?android:progressBarStyleSmall"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:elevation="10dp"
|
|
android:indeterminate="true"
|
|
android:outlineProvider="none"
|
|
android:visibility="gone" />
|
|
</FrameLayout>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/action_btn_wrap"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="bottom"
|
|
android:paddingStart="8dp"
|
|
android:paddingEnd="16dp"
|
|
android:paddingBottom="8dp"
|
|
android:clipToPadding="false">
|
|
|
|
<org.joinmastodon.android.ui.views.ProgressBarButton
|
|
android:id="@+id/action_btn"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minHeight="48dp"
|
|
android:minWidth="56dp"
|
|
android:singleLine="true"
|
|
tools:text="@string/follow_back"/>
|
|
|
|
<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:visibility="gone"/>
|
|
</FrameLayout>
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout> |