diff options
author | Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> | 2024-09-10 19:08:13 +0000 |
---|---|---|
committer | Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> | 2024-09-10 19:08:13 +0000 |
commit | fbc00b1cb9d2d813a0ea07123850633b0392b86d (patch) | |
tree | fa2948a7abe0af6e4bd7be9186b1b82b383dcfae /app/src/main/res | |
parent | 464cc1c4de775ca6fafc1e03977bb91ae44f81c3 (diff) | |
download | infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar.gz infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar.bz2 infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar.lz infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar.xz infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.tar.zst infinity-for-reddit-fbc00b1cb9d2d813a0ea07123850633b0392b86d.zip |
New UI design in CreateMultiRedditActivity.
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_create_multi_reddit.xml | 134 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 102 insertions, 33 deletions
diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml index e1b3a3e1..de9a8145 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -43,46 +43,116 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <EditText - android:id="@+id/multi_reddit_name_edit_text_create_multi_reddit_activity" + <com.google.android.material.card.MaterialCardView + android:id="@+id/input_card_view_create_multi_reddit_activity" + style="?attr/materialCardViewFilledStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" - android:hint="@string/multi_reddit_name_hint" - android:inputType="textMultiLine" - android:textSize="?attr/font_default" - android:background="#00000000" - android:textColor="?attr/primaryTextColor" - android:fontFamily="?attr/font_family" - android:maxLength="50" /> - - <View - android:id="@+id/divider_1_create_multi_reddit_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_marginTop="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + app:cardCornerRadius="12dp"> - <EditText - android:id="@+id/description_edit_text_create_multi_reddit_activity" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/multi_reddit_name_explanation_text_input_layout_create_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="8dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:text="@string/multi_reddit_name_explanation" + android:textSize="?attr/font_default" + android:textColor="?attr/primaryTextColor" + android:fontFamily="?attr/font_family" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/multi_reddit_name_text_input_layout_create_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/multi_reddit_name_edit_text_create_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:hint="@string/multi_reddit_name_hint" + android:inputType="textMultiLine" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:maxLength="50" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/description_text_input_layout_create_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingBottom="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/description_edit_text_create_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:hint="@string/multi_reddit_description_hint" + android:inputType="textMultiLine" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </com.google.android.material.textfield.TextInputLayout> + + </LinearLayout> + + </com.google.android.material.card.MaterialCardView> + + <com.google.android.material.chip.ChipGroup android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:hint="@string/multi_reddit_description_hint" - android:inputType="textMultiLine" - android:textSize="?attr/font_default" - android:background="#00000000" - android:textColor="?attr/primaryTextColor" - android:fontFamily="?attr/font_family" /> + app:chipSpacingHorizontal="16dp"> - <View - android:id="@+id/divider_2_create_multi_reddit_activity" - android:layout_width="match_parent" - android:layout_height="1dp"/> + <com.google.android.material.chip.Chip + android:id="@+id/select_subreddit_chip_create_multi_reddit_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/select_subreddits_and_users" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + style="@style/Widget.Material3.Chip.Assist" /> - <LinearLayout + <com.google.android.material.chip.Chip + android:id="@+id/visibility_chip_create_multi_reddit_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/private_multi_reddit" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:checked="true" + style="@style/Widget.Material3.Chip.Filter" /> + + </com.google.android.material.chip.ChipGroup> + + <!--<LinearLayout android:id="@+id/visibility_wrapper_linear_layout_create_multi_reddit_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground"> @@ -94,10 +164,9 @@ android:layout_weight="1" android:text="@string/private_multi_reddit" android:textSize="?attr/font_default" - android:textColor="?attr/primaryTextColor" android:fontFamily="?attr/font_family" /> - <Switch + <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/visibility_switch_create_multi_reddit_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -112,11 +181,10 @@ android:padding="16dp" android:text="@string/select_subreddits_and_users" android:textSize="?attr/font_default" - android:textColor="?attr/primaryTextColor" android:fontFamily="?attr/font_family" android:clickable="true" android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:background="?attr/selectableItemBackground" />--> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee33c49d..07952129 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -736,6 +736,7 @@ <string name="device_default">Device Default</string> <string name="set_by_battery_saver">Set by Battery Saver</string> + <string name="multi_reddit_name_explanation">The name should be unique.</string> <string name="multi_reddit_name_hint">Name (Max 50 Characters)</string> <string name="multi_reddit_description_hint">Description</string> <string name="private_multi_reddit">Private</string> |