chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

enable multiple hashtags in one hashtag tab (#1790)

Browse source 
* enable multiple hashtags in one hashtag tab

* add comment explaining the code in TabAdapter

* delete unused drawables

* add padding to EditText in dialog
This commit is contained in:
Konrad Pozniak 2020-05-15 22:10:29 +02:00 • committed by GitHub
commit df8dc3a198
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 105 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/res/drawable-v26/ic_edit_chip.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="24dp"
android:layout_height="24dp">
<background android:drawable="@color/tusky_blue" />
<foreground>
<inset
android:drawable="@drawable/ic_create_24dp"
android:inset="30%" />
</foreground>
</adaptive-icon>

9
app/src/main/res/drawable/ic_edit_chip.xml
View file

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?android:attr/textColorPrimary"
android:pathData="m4.5088,16.3703v3.1209H7.6297L16.8342,10.2866 13.7134,7.1658ZM19.2477,7.8732c0.3246,-0.3246 0.3246,-0.8489 0,-1.1735l-1.9474,-1.9474c-0.3246,-0.3246 -0.8489,-0.3246 -1.1735,0l-1.523,1.523 3.1209,3.1209z" />
</vector>

10
app/src/main/res/layout/item_tab_preference.xml
View file

@ -26,10 +26,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_weight="1"
android:drawablePadding="12dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="?android:attr/textColorSecondary"
android:textSize="?attr/status_text_large"
app:layout_constraintBottom_toTopOf="@id/chipGroup"
@ -57,9 +57,7 @@
android:id="@+id/chipGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginBottom="8dp"
android:paddingTop="8dp"
app:layout_constraintBottom_toBottomOf="parent">
<com.google.android.material.chip.Chip
@ -68,7 +66,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checkable="false"
tools:text="add hashtag" />
android:text="@string/add_hashtag_title"
app:chipIcon="@drawable/ic_plus_24dp"
app:chipSurfaceColor="@color/tusky_blue" />
</com.google.android.material.chip.ChipGroup>

2
app/src/main/res/values-ar/strings.xml
View file

@ -342,9 +342,7 @@
<string name="downloading_media">جارٍ تنزيل الوسائط</string>
<string name="dialog_redraft_toot_warning">هل تريد حذف وإعادة صياغة هذا التبويق؟</string>
<string name="description_status_favourited">تم تفضيله</string>
<string name="edit_hashtag_title">تعديل الوسم</string>
<string name="edit_hashtag_hint">وسم بدون #</string>
<string name="hashtag">الوسم</string>
<string name="notifications_clear">مسح</string>
<string name="notifications_apply_filter">عامل تصفية</string>
<string name="filter_apply">طَبِّق</string>

2
app/src/main/res/values-bn-rIN/strings.xml
View file

@ -416,9 +416,7 @@
<string name="hint_list_name">নামের তালিকা</string>
<string name="edit_hashtag_title">হ্যাশট্যাগ সম্পাদনা করুন</string>
<string name="edit_hashtag_hint"># ছাড়া হ্যাশট্যাগ</string>
<string name="hashtag">হ্যাশট্যাগ</string>
<string name="notifications_clear">পরিষ্কার</string>
<string name="notifications_apply_filter">ফিল্টার</string>
<string name="filter_apply">প্রয়োগ</string>

2
app/src/main/res/values-ca/strings.xml
View file

@ -420,9 +420,7 @@
<string name="description_visiblity_direct">Directe</string>
<string name="hint_list_name">Nom de la llista</string>
<string name="edit_hashtag_title">Modificar el hashtag</string>
<string name="edit_hashtag_hint">Hashtag sense #</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Netejar</string>
<string name="notifications_apply_filter">Filtrar</string>
<string name="filter_apply">Aplicar</string>

2
app/src/main/res/values-cs/strings.xml
View file

@ -364,9 +364,7 @@
<string name="description_visiblity_direct"> Přímý
</string>
<string name="hint_list_name">Název seznamu</string>
<string name="edit_hashtag_title">Upravit hashtag</string>
<string name="edit_hashtag_hint">Hashtag bez #</string>
<string name="hashtag">Hashtag</string>
<string name="compose_shortcut_long_label">Napsat toot</string>
<string name="compose_shortcut_short_label">Napsat</string>

2
app/src/main/res/values-de/strings.xml
View file

@ -329,9 +329,7 @@
<string name="error_delete_list">Liste konnte nicht gelöscht werden</string>
<string name="hint_search_people_list">Suche nach Leuten denen du folgst</string>
<string name="action_remove_from_list">Von der Liste entfernen</string>
<string name="edit_hashtag_title">Hashtag bearbeiten</string>
<string name="edit_hashtag_hint">Hashtag ohne #</string>
<string name="hashtag">Hashtag</string>
<string name="action_open_reblogger">Öffne Autor des geteilten Beitrages</string>
<string name="pref_title_public_filter_keywords">Öffentliche Zeitleisten</string>
<plurals name="favs">

3
app/src/main/res/values-eo/strings.xml
View file

@ -367,10 +367,7 @@
<string name="notification_poll_name">Enketoj</string>
<string name="notification_poll_description">Sciigoj pri enketoj kiuj finiĝis</string>
<string name="edit_hashtag_title">Redakti kradvorton</string>
<string name="edit_hashtag_hint">Kradvortoj sen #</string>
<string name="hashtag">Kradvorto</string>
<string name="notifications_clear">Viŝi</string>
<string name="notifications_apply_filter">Filtri</string>
<string name="filter_apply">Apliki</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -381,9 +381,7 @@
<string name="description_visiblity_unlisted">Sin listar</string>
<string name="description_visiblity_direct">Directo</string>
<string name="hint_list_name">Nombre de la lista</string>
<string name="edit_hashtag_title">Editar etiqueta</string>
<string name="edit_hashtag_hint">Etiqueta sin #</string>
<string name="hashtag">Etiqueta</string>
<string name="notifications_clear">Limpiar</string>
<string name="notifications_apply_filter">Filtro</string>
<string name="compose_shortcut_long_label">Componer toot</string>

2
app/src/main/res/values-eu/strings.xml
View file

@ -373,9 +373,7 @@
<string name="description_visiblity_direct">Zuzena</string>
<string name="description_poll">Inkestatu aukerekin: %1$s, %2$s, %3$s, %4$s; %5$s</string>
<string name="hint_list_name">Zerrendaren izena</string>
<string name="edit_hashtag_title">Editatu traola</string>
<string name="edit_hashtag_hint">Traola # gabe</string>
<string name="hashtag">Traola</string>
<string name="notifications_clear">Garbitu</string>
<string name="notifications_apply_filter">Iragazi</string>
<string name="filter_apply">Aplikatu</string>

2
app/src/main/res/values-fa/strings.xml
View file

@ -364,9 +364,7 @@
<string name="description_visiblity_direct">مستقیم</string>
<string name="description_poll">نظرسنجی با انتخاب‌ها: %1$s، %2$s، %3$s، %4$s؛ %5$s</string>
<string name="hint_list_name">نام فهرست</string>
<string name="edit_hashtag_title">ویرایش برچسب</string>
<string name="edit_hashtag_hint">برچسب بدون #</string>
<string name="hashtag">برچسب</string>
<string name="notifications_clear">پاک‌سازی</string>
<string name="notifications_apply_filter">پالایش</string>
<string name="filter_apply">اعمال</string>

2
app/src/main/res/values-fr/strings.xml
View file

@ -362,9 +362,7 @@
<string name="description_visiblity_direct"> Direct
</string>
<string name="hint_list_name">Nom de la liste</string>
<string name="edit_hashtag_title">Édition des hashtags</string>
<string name="edit_hashtag_hint">Hashtags sans #</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Effacer</string>
<string name="notifications_apply_filter">Filtrer</string>
<string name="filter_apply">Appliquer</string>

2
app/src/main/res/values-hu/strings.xml
View file

@ -390,9 +390,7 @@
<string name="hint_list_name">Lista neve</string>
<string name="edit_hashtag_title">Hashtag szerkesztése</string>
<string name="edit_hashtag_hint">Hashtag # nélkül</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Törlés</string>
<string name="notifications_apply_filter">Szűrés</string>
<string name="filter_apply">Alkalmaz</string>

2
app/src/main/res/values-is/strings.xml
View file

@ -428,9 +428,7 @@
<string name="hint_list_name">Heiti á lista</string>
<string name="edit_hashtag_title">Breyta myllumerki</string>
<string name="edit_hashtag_hint">Myllumerki án #</string>
<string name="hashtag">Myllumerki</string>
<string name="select_list_title">Veldu lista</string>
<string name="list">Listi</string>
<string name="notifications_clear">Hreinsa</string>

2
app/src/main/res/values-it/strings.xml
View file

@ -359,9 +359,7 @@
<string name="download_media">Scarica media</string>
<string name="downloading_media">Scaricando media</string>
<string name="edit_hashtag_title">Modifica hashtag</string>
<string name="edit_hashtag_hint">Hashtag senza #</string>
<string name="hashtag">Hashtag</string>
<string name="compose_shortcut_long_label">Componi Toot</string>

2
app/src/main/res/values-ja/strings.xml
View file

@ -398,8 +398,6 @@
<string name="pref_title_public_filter_keywords">公開タイムライン</string>
<string name="description_status_cw">閲覧注意：%s</string>
<string name="edit_hashtag_title">ハッシュタグの編集</string>
<string name="hashtag">ハッシュタグ</string>
<string name="filter_apply">適用</string>
<string name="poll_info_closed">投票終了</string>

2
app/src/main/res/values-ko/strings.xml
View file

@ -368,9 +368,7 @@
<string name="description_visiblity_direct">다이렉트</string>
<string name="description_poll">투표 선택지: %1$s, %2$s, %3$s, %4$s, %5$s</string>
<string name="hint_list_name">리스트 이름</string>
<string name="edit_hashtag_title">해시태그 편집</string>
<string name="edit_hashtag_hint">#를 제외한 해시태그</string>
<string name="hashtag">해시태그</string>
<string name="notifications_clear">알림 지우기</string>
<string name="notifications_apply_filter">필터</string>
<string name="filter_apply">적용</string>

2
app/src/main/res/values-nl/strings.xml
View file

@ -356,9 +356,7 @@
<string name="action_add_to_list">Account aan de lijst toevoegen</string>
<string name="action_remove_from_list">Account uit de lijst verwijderen</string>
<string name="hint_list_name">Naam van lijst</string>
<string name="edit_hashtag_title">Hashtag bewerken</string>
<string name="edit_hashtag_hint">Hashtag zonder #</string>
<string name="hashtag">Hashtag</string>
<string name="action_delete_and_redraft">Verwijderen en herschrijven</string>
<string name="dialog_redraft_toot_warning">Deze toot verwijderen en herschrijven\?</string>
<string name="notifications_clear">Leegmaken</string>

2
app/src/main/res/values-no-rNB/strings.xml
View file

@ -328,9 +328,7 @@
<string name="description_visiblity_private">Følgere</string>
<string name="description_visiblity_direct">Direkte</string>
<string name="hint_list_name">Listenavn</string>
<string name="edit_hashtag_title">Endre emneord</string>
<string name="edit_hashtag_hint">Emneord uten #</string>
<string name="hashtag">Emneord</string>
<string name="notifications_clear">Slett</string>
<string name="notifications_apply_filter">Filter</string>
<string name="filter_apply">Bruk</string>

2
app/src/main/res/values-oc/strings.xml
View file

@ -351,9 +351,7 @@
<string name="description_visiblity_private">Seguidors</string>
<string name="description_visiblity_direct">Dirècte</string>
<string name="hint_list_name">Nom de la lista</string>
<string name="edit_hashtag_title">Modificar las etiquetas</string>
<string name="edit_hashtag_hint">Etiquetas sens #</string>
<string name="hashtag">Etiqueta</string>
<string name="compose_shortcut_long_label">Escriure un tut</string>
<string name="compose_shortcut_short_label">Escriure</string>
<string name="action_delete_and_redraft">Suprimir e reformular</string>

2
app/src/main/res/values-pl/strings.xml
View file

@ -373,9 +373,7 @@
<string name="description_visiblity_direct">Bezpośrednio</string>
<string name="description_poll">Głosowanie z opcjami: %1$s, %2$s, %3$s, %4$s; %5$s</string>
<string name="hint_list_name">Nazwa listy</string>
<string name="edit_hashtag_title">Edytuj hashtag</string>
<string name="edit_hashtag_hint">Hashtag bez #</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Wyczyść</string>
<string name="notifications_apply_filter">Filtr</string>
<string name="filter_apply">Zastosuj</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View file

@ -356,9 +356,7 @@
<string name="description_visiblity_unlisted">Não-listado</string>
<string name="description_visiblity_direct">Direta</string>
<string name="hint_list_name">Nome da lista</string>
<string name="edit_hashtag_title">Editar hashtag</string>
<string name="edit_hashtag_hint">Hashtag sem #</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Limpar</string>
<string name="notifications_apply_filter">Filtro</string>
<string name="filter_apply">Salvar</string>

2
app/src/main/res/values-ru/strings.xml
View file

@ -394,9 +394,7 @@
Для упомянутых
</string>
<string name="hint_list_name">Название списка</string>
<string name="edit_hashtag_title">Изм. хэштег</string>
<string name="edit_hashtag_hint">Хэштег без #</string>
<string name="hashtag">Хэштег</string>
<string name="notifications_clear">Очистить</string>
<string name="notifications_apply_filter">Фильтр</string>
<string name="filter_apply">Применить</string>

2
app/src/main/res/values-sl/strings.xml
View file

@ -332,9 +332,7 @@
<string name="description_visiblity_private">Sledilci</string>
<string name="description_visiblity_direct">Neposredno</string>
<string name="hint_list_name">Ime seznama</string>
<string name="edit_hashtag_title">Uredi ključnik</string>
<string name="edit_hashtag_hint">Ključnik brez #</string>
<string name="hashtag">Ključnik</string>
<string name="notifications_clear">Počisti</string>
<string name="notifications_apply_filter">Filter</string>
<string name="filter_apply">Uporabi</string>

2
app/src/main/res/values-sv/strings.xml
View file

@ -358,9 +358,7 @@
<string name="hint_list_name">Listnamn</string>
<string name="download_media">Ladda ned media</string>
<string name="downloading_media">Laddar ned media</string>
<string name="edit_hashtag_title">Redigera hashtag</string>
<string name="edit_hashtag_hint">Hashtag utan #</string>
<string name="hashtag">Hashtag</string>
<string name="compose_shortcut_long_label">Skriv toot</string>
<string name="compose_shortcut_short_label">Skriv</string>
<string name="notifications_clear">Rensa</string>

2
app/src/main/res/values-tr/strings.xml
View file

@ -351,9 +351,7 @@
<string name="description_visiblity_direct">Direkt</string>
<string name="description_poll">Seçenekli anket: %1$s, %2$s, %3$s, %4$s; %5$s</string>
<string name="hint_list_name">Liste adı</string>
<string name="edit_hashtag_title">Hashtag\'i düzenle</string>
<string name="edit_hashtag_hint"># olmadan hashtag</string>
<string name="hashtag">Hashtag</string>
<string name="notifications_clear">Temizle</string>
<string name="notifications_apply_filter">Filtre</string>
<string name="filter_apply">Uygula</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -370,9 +370,7 @@
私信
</string>
<string name="hint_list_name">列表名</string>
<string name="edit_hashtag_title">编辑话题</string>
<string name="edit_hashtag_hint">话题名（不含前面的 # 号）</string>
<string name="hashtag">话题</string>
<string name="notifications_clear">清空</string>
<string name="notifications_apply_filter">分类</string>
<string name="filter_apply">应用</string>

2
app/src/main/res/values-zh-rHK/strings.xml
View file

@ -366,9 +366,7 @@
私信
</string>
<string name="hint_list_name">列表名</string>
<string name="edit_hashtag_title">編輯話題</string>
<string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
<string name="hashtag">話題</string>
<string name="notifications_clear">清空</string>
<string name="notifications_apply_filter">分類</string>
<string name="filter_apply">應用</string>

2
app/src/main/res/values-zh-rMO/strings.xml
View file

@ -366,9 +366,7 @@
私信
</string>
<string name="hint_list_name">列表名</string>
<string name="edit_hashtag_title">編輯話題</string>
<string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
<string name="hashtag">話題</string>
<string name="notifications_clear">清空</string>
<string name="notifications_apply_filter">分類</string>
<string name="filter_apply">應用</string>

2
app/src/main/res/values-zh-rSG/strings.xml
View file

@ -434,9 +434,7 @@
<string name="hint_list_name">列表名</string>
<string name="edit_hashtag_title">编辑话题</string>
<string name="edit_hashtag_hint">话题名（不含前面的 # 号）</string>
<string name="hashtag">话题</string>
<string name="notifications_clear">清空</string>
<string name="notifications_apply_filter">分类</string>
<string name="filter_apply">应用</string>

2
app/src/main/res/values-zh-rTW/strings.xml
View file

@ -366,9 +366,7 @@
私信
</string>
<string name="hint_list_name">列表名</string>
<string name="edit_hashtag_title">編輯話題</string>
<string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
<string name="hashtag">話題</string>
<string name="notifications_clear">清空</string>
<string name="notifications_apply_filter">分類</string>
<string name="filter_apply">應用</string>

4
app/src/main/res/values/strings.xml
View file

@ -474,9 +474,9 @@
<string name="hint_list_name">List name</string>
<string name="edit_hashtag_title">Edit hashtag</string>
<string name="add_hashtag_title">Add hashtag</string>
<string name="edit_hashtag_hint">Hashtag without #</string>
<string name="hashtag">Hashtag</string>
<string name="hashtags">Hashtags</string>
<string name="select_list_title">Select list</string>
<string name="list">List</string>
<string name="notifications_clear">Clear</string>