Merge remote-tracking branch 'megalodon_main/main'
# Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.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/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java # mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java # mastodon/src/main/res/drawable/bg_note_edit.xml # mastodon/src/main/res/layout/fragment_profile.xml # metadata/uk/full_description.txt
This commit is contained in:
LucasGGamerM
@@ -13,7 +13,7 @@
|
||||
<org.joinmastodon.android.ui.views.NestedRecyclerScrollView
|
||||
android:id="@+id/scroller"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:nestedScrollingEnabled="true">
|
||||
|
||||
<org.joinmastodon.android.ui.views.CustomDrawingOrderLinearLayout
|
||||
@@ -50,7 +50,7 @@
|
||||
android:text="@string/follows_you"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="#fff"
|
||||
android:textSize="14dp"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
@@ -80,11 +80,13 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/cover"
|
||||
android:layout_alignParentEnd="true">
|
||||
android:layout_alignParentEnd="true"
|
||||
android:clipChildren="false">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="48dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="4dp">
|
||||
|
||||
@@ -95,7 +97,8 @@
|
||||
style="@style/Widget.Mastodon.M3.Button.Tonal"
|
||||
android:background="@drawable/bg_button_m3_tonal_circle_selector"
|
||||
android:paddingStart="12dp"
|
||||
android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
|
||||
android:drawableStart="@drawable/ic_fluent_alert_24_selector"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/notify_progress"
|
||||
@@ -112,6 +115,7 @@
|
||||
<FrameLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="48dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="16dp">
|
||||
@@ -219,7 +223,7 @@
|
||||
android:layout_below="@id/username"
|
||||
android:id="@+id/note_edit_wrap"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:visibility="gone">
|
||||
|
||||
@@ -227,32 +231,44 @@
|
||||
android:id="@+id/note_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingVertical="16dp"
|
||||
android:inputType="textMultiLine|textCapSentences"
|
||||
android:minHeight="52dp"
|
||||
android:paddingVertical="15dp"
|
||||
android:textColor="?colorM3OnSurface"
|
||||
android:inputType="text|textMultiLine|textCapSentences"
|
||||
android:singleLine="false"
|
||||
android:drawablePadding="12dp"
|
||||
android:drawableTint="?android:textColorSecondary"
|
||||
android:background="@drawable/bg_note_edit"
|
||||
android:paddingEnd="48dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:paddingEnd="52dp"
|
||||
android:paddingStart="20dp"
|
||||
android:elevation="0dp"
|
||||
android:visibility="gone"
|
||||
android:hint="@string/mo_personal_note"/>
|
||||
android:hint="@string/mo_personal_note"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="52dp"
|
||||
android:layout_height="52dp"
|
||||
android:layout_gravity="end">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/note_save_btn"
|
||||
android:layout_width="52dp"
|
||||
android:layout_height="52dp"
|
||||
android:visibility="invisible"
|
||||
android:background="@drawable/bg_button_m3_text_circle"
|
||||
android:tooltipText="@string/sk_confirm_changes"
|
||||
android:contentDescription="@string/sk_confirm_changes"
|
||||
android:src="@drawable/ic_fluent_checkmark_24_regular"/>
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/note_save_progress"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
style="?android:progressBarStyleSmall"
|
||||
android:indeterminate="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/note_edit_confirm"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:paddingHorizontal="6dp"
|
||||
android:layout_marginBottom="7dp"
|
||||
android:visibility="invisible"
|
||||
android:layout_gravity="right|bottom"
|
||||
android:background="@drawable/bg_button_m3_text_circle"
|
||||
android:tooltipText="@string/mo_personal_note_confirm"
|
||||
android:contentDescription="@string/mo_personal_note_confirm"
|
||||
android:src="@drawable/ic_fluent_checkmark_24_regular"
|
||||
/>
|
||||
</FrameLayout>
|
||||
|
||||
<org.joinmastodon.android.ui.views.LinkedTextView
|
||||
@@ -287,19 +303,7 @@
|
||||
android:hint="@string/display_name"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:padding="16dp"
|
||||
tools:text="Eugen"
|
||||
android:autofillHints="" />
|
||||
|
||||
<!-- <org.joinmastodon.android.ui.views.LinkedTextView-->
|
||||
<!-- android:id="@+id/bio"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_below="@id/note_edit_wrap"-->
|
||||
<!-- 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." />-->
|
||||
tools:text="Eugen" />
|
||||
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
||||
|
||||
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
||||
@@ -338,7 +342,8 @@
|
||||
<me.grishka.appkit.views.UsableRecyclerView
|
||||
android:id="@+id/metadata"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:paddingTop="4dp" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
Reference in New Issue
Block a user