diff options
Diffstat (limited to '')
-rw-r--r-- | app/src/main/res/layout/activity_create_multi_reddit.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_edit_multi_reddit.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_selected_subreddits.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_select_subreddits_or_users_options_bottom_sheet.xml | 47 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-es/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-hi/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-hr/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-pt-rBR/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-tr-rTR/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
15 files changed, 66 insertions, 19 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 af7affcc..5b088546 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -109,7 +109,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:text="@string/select_subreddits" + android:text="@string/select_subreddits_and_users" android:textSize="?attr/font_default" android:textColor="?attr/primaryTextColor" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml index 408b13c7..2e2442eb 100644 --- a/app/src/main/res/layout/activity_edit_multi_reddit.xml +++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml @@ -115,7 +115,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:text="@string/select_subreddits" + android:text="@string/select_subreddits_and_users" android:textSize="?attr/font_default" android:textColor="?attr/primaryTextColor" android:clickable="true" diff --git a/app/src/main/res/layout/activity_selected_subreddits.xml b/app/src/main/res/layout/activity_selected_subreddits.xml index eade8be2..9482cba4 100644 --- a/app/src/main/res/layout/activity_selected_subreddits.xml +++ b/app/src/main/res/layout/activity_selected_subreddits.xml @@ -4,11 +4,11 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/coordinator_layout_selected_subreddits_activity" + android:id="@+id/coordinator_layout_selected_subreddits_and_users_activity" tools:context=".activities.AccountPostsActivity"> <com.google.android.material.appbar.AppBarLayout - android:id="@+id/appbar_layout_selected_subreddits_activity" + android:id="@+id/appbar_layout_selected_subreddits_and_users_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> @@ -18,10 +18,10 @@ android:layout_height="match_parent" app:layout_scrollFlags="scroll|enterAlways" app:titleEnabled="false" - app:toolbarId="@+id/toolbar_selected_subreddits_activity"> + app:toolbarId="@+id/toolbar_selected_subreddits_and_users_activity"> <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_selected_subreddits_activity" + android:id="@+id/toolbar_selected_subreddits_and_users_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" @@ -33,13 +33,13 @@ </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view_selected_subreddits_activity" + android:id="@+id/recycler_view_selected_subreddits_and_users_activity" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/fab_selected_subreddits_activity" + android:id="@+id/fab_selected_subreddits_and_users_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" diff --git a/app/src/main/res/layout/fragment_select_subreddits_or_users_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_select_subreddits_or_users_options_bottom_sheet.xml new file mode 100644 index 00000000..ca9950ac --- /dev/null +++ b/app/src/main/res/layout/fragment_select_subreddits_or_users_options_bottom_sheet.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:overScrollMode="never"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/select_subreddits_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/subreddit" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/select_users_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/user" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d4068354..84405d32 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -491,7 +491,7 @@ Funktioniert vielleicht nicht auf Android 11"</string> <string name="multi_reddit_name_hint">"Name (Max. 50 Zeichen)"</string> <string name="multi_reddit_description_hint">"Beschreibung"</string> <string name="private_multi_reddit">"Privat"</string> - <string name="select_subreddits">"Subreddits auswählen"</string> + <string name="select_subreddits_and_users">"Subreddits auswählen"</string> <string name="no_multi_reddit_name">"Wo ist der Name?"</string> <string name="create_multi_reddit_failed">"Kann dieses Multireddit nicht erstellen"</string> <string name="duplicate_multi_reddit">"Dieses Multireddit existiert bereits"</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6419c67e..cf688202 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -502,7 +502,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Nombre (Max. 50 Caracteres)"</string> <string name="multi_reddit_description_hint">"Descripción"</string> <string name="private_multi_reddit">"Privado"</string> - <string name="select_subreddits">"Selecciona Subreddits"</string> + <string name="select_subreddits_and_users">"Selecciona Subreddits"</string> <string name="no_multi_reddit_name">"Introduce un nombre"</string> <string name="create_multi_reddit_failed">"Ocurrió un error creando este multireddit"</string> <string name="duplicate_multi_reddit">"Este multireddit ya existe"</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 24a5fbcf..3d16b411 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -531,7 +531,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Nom ( Max. 50 caractères )"</string> <string name="multi_reddit_description_hint">"Description"</string> <string name="private_multi_reddit">"Privé"</string> - <string name="select_subreddits">"Sélectionnez des Subreddits"</string> + <string name="select_subreddits_and_users">"Sélectionnez des Subreddits"</string> <string name="no_multi_reddit_name">"Où est le nom ?"</string> <string name="create_multi_reddit_failed">"Impossible de créer ce multireddit"</string> <string name="duplicate_multi_reddit">"Ce multireddit existe déjà"</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 158888e1..44141878 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -522,7 +522,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"नाम (अधिकतम 50 वर्ण)"</string> <string name="multi_reddit_description_hint">"विवरण "</string> <string name="private_multi_reddit">"गुप्त "</string> - <string name="select_subreddits">"सबरैडिट चुनें "</string> + <string name="select_subreddits_and_users">"सबरैडिट चुनें "</string> <string name="no_multi_reddit_name">"नाम कहाँ है? "</string> <string name="create_multi_reddit_failed">"इस मल्टीरैडिट का निर्माण असफल "</string> <string name="duplicate_multi_reddit">"यह मल्टीरैडिट पहले से उपलब्ध है "</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 5ee49cff..d1455ae8 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -489,7 +489,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Ime (max. 50 znakova)"</string> <string name="multi_reddit_description_hint">"Opis"</string> <string name="private_multi_reddit">"Privatno"</string> - <string name="select_subreddits">"Odaberi podreddite"</string> + <string name="select_subreddits_and_users">"Odaberi podreddite"</string> <string name="no_multi_reddit_name">"Gdje je ime?"</string> <string name="create_multi_reddit_failed">"Nije moguće stvoriti ovaj multireddit"</string> <string name="duplicate_multi_reddit">"Ovaj multireddit već postoji"</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d404728c..b2be9297 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -500,7 +500,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Nome (massimo 50 caratteri)"</string> <string name="multi_reddit_description_hint">"Descrizione"</string> <string name="private_multi_reddit">"Privato"</string> - <string name="select_subreddits">"Seleziona Subreddit"</string> + <string name="select_subreddits_and_users">"Seleziona Subreddit"</string> <string name="no_multi_reddit_name">"Dov'è il nome?"</string> <string name="create_multi_reddit_failed">"Impossibile creare questo multireddit"</string> <string name="duplicate_multi_reddit">"Il multireddit esiste già"</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 01c478b6..c2509673 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -523,7 +523,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"名前 (最大50文字)"</string> <string name="multi_reddit_description_hint">"詳細"</string> <string name="private_multi_reddit">"プライベート"</string> - <string name="select_subreddits">"Subredditを選択"</string> + <string name="select_subreddits_and_users">"Subredditを選択"</string> <string name="no_multi_reddit_name">"名前が必要です。"</string> <string name="create_multi_reddit_failed">"このカスタムフィードを作成できませんでした"</string> <string name="duplicate_multi_reddit">"このカスタムフィードは既に存在しています"</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 81f4493a..24c70f5b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -476,7 +476,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Nome (Limite de 50 caracteres)"</string> <string name="multi_reddit_description_hint">"Descrição"</string> <string name="private_multi_reddit">"Privado"</string> - <string name="select_subreddits">"Selecionar Subreddits"</string> + <string name="select_subreddits_and_users">"Selecionar Subreddits"</string> <string name="no_multi_reddit_name">"Onde está o nome?"</string> <string name="create_multi_reddit_failed">"Não foi possível criar este multiReddit"</string> <string name="duplicate_multi_reddit">"Este multiReddit já existe"</string> diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 37f7aff0..b8c14681 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -485,7 +485,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"Ad (Maks 50 Karakter)"</string> <string name="multi_reddit_description_hint">"Açıklama"</string> <string name="private_multi_reddit">"Özel"</string> - <string name="select_subreddits">"Subredditleri Seç"</string> + <string name="select_subreddits_and_users">"Subredditleri Seç"</string> <string name="no_multi_reddit_name">"Ad nerede?"</string> <string name="create_multi_reddit_failed">"Bu multireddit oluşturulamıyor"</string> <string name="duplicate_multi_reddit">"Bu multireddit zaten var"</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1b2cedd4..9da3879e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -491,7 +491,7 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="multi_reddit_name_hint">"名称(最多50个字符)"</string> <string name="multi_reddit_description_hint">"描述"</string> <string name="private_multi_reddit">"私人的"</string> - <string name="select_subreddits">"选择板块"</string> + <string name="select_subreddits_and_users">"选择板块"</string> <string name="no_multi_reddit_name">"名字在哪里?"</string> <string name="create_multi_reddit_failed">"不能创建这个复合reddit"</string> <string name="duplicate_multi_reddit">"这个复合reddit已经存在"</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d845d04c..640db5b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -608,7 +608,7 @@ <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> - <string name="select_subreddits">Select Subreddits</string> + <string name="select_subreddits_and_users">Select Subreddits and Users</string> <string name="no_multi_reddit_name">Where is the name?</string> <string name="create_multi_reddit_failed">Cannot create this multireddit</string> <string name="duplicate_multi_reddit">This multireddit already exists</string> |