# 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
270 lines
9.0 KiB
XML
270 lines
9.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<me.grishka.appkit.views.FragmentRootLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<ScrollView
|
|
android:id="@+id/scroller"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:clipChildren="false">
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/display_name_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:minHeight="80dp"
|
|
android:paddingTop="4dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/display_name"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="56dp"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textPersonName|textCapWords"
|
|
android:autofillHints="name"
|
|
android:singleLine="true"
|
|
android:hint="@string/display_name"/>
|
|
|
|
<View
|
|
android:layout_width="24dp"
|
|
android:layout_height="24dp"
|
|
android:layout_gravity="start|top"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_marginTop="12dp"
|
|
android:backgroundTint="?colorM3OnSurfaceVariant"
|
|
android:background="@drawable/ic_outline_person_24"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/username_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="80dp"
|
|
android:paddingTop="4dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/username"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="56dp"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textFilter|textNoSuggestions"
|
|
android:autofillHints="username"
|
|
android:singleLine="true"
|
|
android:layoutDirection="ltr"
|
|
android:hint="@string/username"/>
|
|
|
|
<TextView
|
|
android:id="@+id/domain"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="56dp"
|
|
android:layout_gravity="right|top"
|
|
android:layout_marginRight="20dp"
|
|
android:layout_marginTop="8dp"
|
|
android:paddingLeft="8dp"
|
|
android:paddingRight="16dp"
|
|
android:textAppearance="@style/m3_body_large"
|
|
android:gravity="center_vertical"
|
|
android:textColor="?colorM3OnSurface"
|
|
tools:text="\@mastodon.social"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/email_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="4dp"
|
|
android:paddingBottom="12dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/email"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="56dp"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textEmailAddress"
|
|
android:autofillHints="emailAddress"
|
|
android:singleLine="true"
|
|
android:hint="@string/email"/>
|
|
|
|
<View
|
|
android:layout_width="24dp"
|
|
android:layout_height="24dp"
|
|
android:layout_gravity="start|top"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_marginTop="12dp"
|
|
android:backgroundTint="?colorM3OnSurfaceVariant"
|
|
android:background="@drawable/ic_outline_email_24"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/password_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="4dp"
|
|
android:paddingBottom="12dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/password"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="56dp"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textPassword"
|
|
android:autofillHints="password"
|
|
android:singleLine="true"
|
|
android:fontFamily="sans-serif"
|
|
android:hint="@string/password"/>
|
|
|
|
<View
|
|
android:layout_width="24dp"
|
|
android:layout_height="24dp"
|
|
android:layout_gravity="start|top"
|
|
android:layout_marginStart="16dp"
|
|
android:layout_marginTop="12dp"
|
|
android:backgroundTint="?colorM3OnSurfaceVariant"
|
|
android:background="@drawable/ic_outline_password_24"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/password_confirm_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="4dp"
|
|
android:paddingBottom="12dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/password_confirm"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="56dp"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textPassword"
|
|
android:autofillHints="password"
|
|
android:singleLine="true"
|
|
android:fontFamily="sans-serif"
|
|
android:hint="@string/confirm_password"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="20dp"
|
|
android:layout_marginTop="-8dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingRight="16dp"
|
|
android:textAppearance="@style/m3_body_small"
|
|
android:textColor="?colorM3OnSurfaceVariant"
|
|
android:text="@string/password_note"/>
|
|
|
|
|
|
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
|
|
android:id="@+id/reason_wrap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="4dp"
|
|
android:paddingBottom="12dp"
|
|
app:labelTextColor="@color/m3_outlined_text_field_label"
|
|
android:foreground="@drawable/bg_m3_outlined_text_field">
|
|
|
|
<EditText
|
|
android:id="@+id/reason"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginBottom="12dp"
|
|
android:padding="16dp"
|
|
android:background="@null"
|
|
android:elevation="0dp"
|
|
android:inputType="textCapSentences|textMultiLine"
|
|
android:hint="@string/signup_reason"/>
|
|
|
|
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
|
|
|
|
<TextView
|
|
android:id="@+id/reason_explain"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="56dp"
|
|
android:layout_marginEnd="20dp"
|
|
android:layout_marginTop="-8dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingRight="16dp"
|
|
android:textAppearance="@style/m3_body_small"
|
|
android:textColor="?colorM3OnSurfaceVariant"
|
|
android:text="@string/signup_reason_note"/>
|
|
|
|
</LinearLayout>
|
|
|
|
</ScrollView>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/button_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:background="@drawable/bg_onboarding_panel">
|
|
|
|
<Button
|
|
android:id="@+id/btn_next"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="16dp"
|
|
android:layout_marginRight="16dp"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginBottom="16dp"
|
|
android:minWidth="145dp"
|
|
style="@style/Widget.Mastodon.M3.Button.Filled"
|
|
android:text="@string/next" />
|
|
|
|
</LinearLayout>
|
|
|
|
</me.grishka.appkit.views.FragmentRootLinearLayout> |