jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/323987 )
Change subject: Update: hide description length on error, show on edit ...................................................................... Update: hide description length on error, show on edit Bug: T148203 Change-Id: Ib94d135e925124bd79da5ef6f27cfb09ca1fa122 --- M app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java M app/src/main/res/layout/view_description_edit.xml M app/src/main/res/values-ar/strings.xml M app/src/main/res/values-ast/strings.xml M app/src/main/res/values-be/strings.xml M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-cs/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-diq/strings.xml M app/src/main/res/values-es/strings.xml M app/src/main/res/values-fi/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-jv/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-lb/strings.xml M app/src/main/res/values-lt/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-nb/strings.xml M app/src/main/res/values-ne/strings.xml M app/src/main/res/values-nl/strings.xml M app/src/main/res/values-pa/strings.xml M app/src/main/res/values-pl/strings.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-sk/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-tr/strings.xml M app/src/main/res/values-uk/strings.xml M app/src/main/res/values-ur/strings.xml M app/src/main/res/values-vi/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml M app/src/main/res/values/strings.xml M app/src/main/res/values/styles.xml 42 files changed, 9 insertions(+), 70 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java index 4579265..96dec4d 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java @@ -3,14 +3,11 @@ import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.TextInputLayout; -import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; @@ -33,7 +30,6 @@ @BindView(R.id.view_description_edit_save_button) FloatingActionButton saveButton; @BindView(R.id.view_description_edit_text) EditText pageDescriptionText; @BindView(R.id.view_description_edit_text_layout) TextInputLayout pageDescriptionLayout; - @BindView(R.id.view_description_edit_char_count) TextView charCountText; @BindView(R.id.view_description_edit_progress_bar) ProgressBar progressBar; @Nullable private PageTitle pageTitle; @@ -103,7 +99,7 @@ callback = OnTextChanged.Callback.AFTER_TEXT_CHANGED) void pageDescriptionTextChanged() { updateSaveButtonVisible(); - updateCharCount(); + setError(null); } @VisibleForTesting void setTitle(@Nullable CharSequence text) { @@ -130,19 +126,5 @@ private void showProgressBar(boolean show) { progressBar.setVisibility(show ? View.VISIBLE : View.GONE); - } - - private void updateCharCount() { - int charCount = pageDescriptionText.getText().length(); - int maxChars = getResources().getInteger(R.integer.description_max_chars); - charCountText.setText(String.format(getResources() - .getString(R.string.description_edit_char_count), charCount, maxChars)); - @ColorInt int color = charCount > maxChars - ? getColor(R.color.foundation_red) : getColor(R.color.foundation_gray); - charCountText.setTextColor(color); - } - - @ColorInt private int getColor(@ColorRes int id) { - return ContextCompat.getColor(getContext(), id); } } \ No newline at end of file diff --git a/app/src/main/res/layout/view_description_edit.xml b/app/src/main/res/layout/view_description_edit.xml index 7cb9c6e..198dcee 100644 --- a/app/src/main/res/layout/view_description_edit.xml +++ b/app/src/main/res/layout/view_description_edit.xml @@ -76,7 +76,10 @@ android:layout_marginRight="16dp" android:layout_marginLeft="16dp" android:textAlignment="viewStart" - android:gravity="start"> + android:gravity="start" + app:counterEnabled="true" + app:counterMaxLength="140" + app:counterOverflowTextAppearance="@style/CounterOverflowTextAppearance"> <org.wikipedia.views.PlainPasteEditText style="@style/RtlAwareTextView" android:id="@+id/view_description_edit_text" @@ -84,16 +87,6 @@ android:layout_height="wrap_content" android:hint="@string/description_edit_text_hint"/> </android.support.design.widget.TextInputLayout> - - <TextView - android:id="@+id/view_description_edit_char_count" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:gravity="end" - tools:text="0 / 140"/> </LinearLayout> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index bb9ea81..065b6ef 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">ما هذا؟</string> <string name="description_edit_text_hint">اكتب وصفًا!</string> <string name="description_edit_save">احفظ</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">أضف وصفًا</string> </resources> diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index cc549c4..ccc3047 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">¿Qué ye esto?</string> <string name="description_edit_text_hint">Escribe una descripción</string> <string name="description_edit_save">Guardar</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Amiesta una descripción</string> </resources> diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 9ada5a6..7bd165d 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -134,6 +134,5 @@ <string name="view_featured_image_card_download">Загрузіць</string> <string name="view_continue_reading_card_subtitle_today">Сёння</string> <string name="description_edit_save">Захаваць</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Дадаць апісанне</string> </resources> diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index aaaa3b6..11a9232 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">এটি কী?</string> <string name="description_edit_text_hint">একটি বিবরণ লিখুন!</string> <string name="description_edit_save">সংরক্ষণ</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">বিবরণ যোগ করুন</string> </resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b4b9b69..8979a35 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -298,6 +298,5 @@ <string name="description_edit_help_hint">Co to je?</string> <string name="description_edit_text_hint">Udělejte popis!</string> <string name="description_edit_save">Uložit</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Přidat popis</string> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 10fd3f6..85f2c37 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Hvad er dette?</string> <string name="description_edit_text_hint">Skriv en beskrivelse!</string> <string name="description_edit_save">Gem</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Tilføj beskrivelse</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dc95558..cfe4cf8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Was ist das?</string> <string name="description_edit_text_hint">Verfasse eine Beschreibung!</string> <string name="description_edit_save">Speichern</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Beschreibung hinzufügen</string> </resources> diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml index 84b4d4d..aa4feea 100644 --- a/app/src/main/res/values-diq/strings.xml +++ b/app/src/main/res/values-diq/strings.xml @@ -172,6 +172,5 @@ <string name="description_edit_help_hint">No çıko?</string> <string name="description_edit_text_hint">Selasnayış bınusnên</string> <string name="description_edit_save">Qeyd kerê</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Senasnayış cı kerê</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 725ffda..90851b9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">¿Qué es esto?</string> <string name="description_edit_text_hint">Escribe una descripción.</string> <string name="description_edit_save">Guardar</string> - <string name="description_edit_char_count">%1$d/%2$d</string> <string name="description_edit_add_description">Añadir descripción</string> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b7b51e4..7d03005 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -298,6 +298,5 @@ <string name="description_edit_help_hint">Mikä tämä on?</string> <string name="description_edit_text_hint">Kirjoita kuvaus!</string> <string name="description_edit_save">Tallenna</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Lisää kuvaus</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 93975b7..bcc6cf8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -302,6 +302,5 @@ <string name="description_edit_help_hint">Qu’est-ce que c’est ?</string> <string name="description_edit_text_hint">Écrire une description !</string> <string name="description_edit_save">Enregistrer</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Ajouter une description</string> </resources> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 3fba1dc..2de87a4 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Que é isto?</string> <string name="description_edit_text_hint">Escribe unha descrición!</string> <string name="description_edit_save">Gardar</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Engadir unha descrición</string> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6df77bd..0068e74 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Apa ini?</string> <string name="description_edit_text_hint">Tuliskan deskripsi!</string> <string name="description_edit_save">Simpan</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Tambah deskripsi</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 388e0d8..f89a705 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -300,6 +300,5 @@ <string name="description_edit_help_hint">Cos\'è questo?</string> <string name="description_edit_text_hint">Scrivi una descrizione!</string> <string name="description_edit_save">Salva</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Aggiungi descrizione</string> </resources> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index fed1126..f8d46d3 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">מה זה?</string> <string name="description_edit_text_hint">נא לכתוב תיאור!</string> <string name="description_edit_save">שמירה</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">הוספת תיאור</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a08d58d..14ee0c1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">これは何?</string> <string name="description_edit_text_hint">要約欄を記入してください</string> <string name="description_edit_save">保存</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">説明を追加</string> </resources> diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml index 87bf7e3..70d7560 100644 --- a/app/src/main/res/values-jv/strings.xml +++ b/app/src/main/res/values-jv/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Apa iki?</string> <string name="description_edit_text_hint">Nulis gambaran!</string> <string name="description_edit_save">Simpen</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Nambah gambaran</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 84284eb..79ce23e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">이것은 무엇입니까?</string> <string name="description_edit_text_hint">설명을 입력하십시오!</string> <string name="description_edit_save">저장</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">설명 추가</string> </resources> diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml index a22c2dd..69386c4 100644 --- a/app/src/main/res/values-lb/strings.xml +++ b/app/src/main/res/values-lb/strings.xml @@ -294,6 +294,5 @@ <string name="description_edit_help_hint">Wat ass dat?</string> <string name="description_edit_text_hint">Eng Beschreiwung schreiwen!</string> <string name="description_edit_save">Späicheren</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Beschreiwung derbäisetzen</string> </resources> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index ab95a12..af0042f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -280,6 +280,5 @@ <string name="description_edit_help_hint">Kas tai?</string> <string name="description_edit_text_hint">Parašykite aprašymą!</string> <string name="description_edit_save">Išsaugoti</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Pridėti aprašymą</string> </resources> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 80fb2b2..21dbf7d 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Што е ова?</string> <string name="description_edit_text_hint">Напишете опис!</string> <string name="description_edit_save">Зачувај</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Додај опис</string> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index a0d54a9..e77da21 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">Apakah ini?</string> <string name="description_edit_text_hint">Tulis keterangan!</string> <string name="description_edit_save">Simpan</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Tambah penerangan</string> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a280d40..c26aa8e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Hva er dette?</string> <string name="description_edit_text_hint">Skriv en beskrivelse!</string> <string name="description_edit_save">Lagre</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Legg til beskrivelse</string> </resources> diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 54f05b4..e910b6b 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -286,6 +286,5 @@ <string name="description_edit_help_hint">यो के हो?</string> <string name="description_edit_text_hint">कुनै विवरण लेख्नुहोस्!</string> <string name="description_edit_save">बचत गर्नुहोस्</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">विवरण थप्नुहोस्</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2559352..852a8d2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">Wat is dit?</string> <string name="description_edit_text_hint">Geef een beschrijving op!</string> <string name="description_edit_save">Opslaan</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Beschrijving toevoegen</string> </resources> diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index 0ebe8d6..225ee65 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -280,6 +280,5 @@ <string name="description_edit_help_hint">ਇਹ ਕੀ ਹੈ?</string> <string name="description_edit_text_hint">ਵੇਰਵਾ ਭਰੋ</string> <string name="description_edit_save">ਸਾਂਭੋ</string> - <string name="description_edit_char_count">%1$d/%2$d</string> <string name="description_edit_add_description">ਵੇਰਵਾ ਸੋਧੋ</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 43c7341..f749353 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -280,6 +280,5 @@ <string name="description_edit_help_hint">Co to jest?</string> <string name="description_edit_text_hint">Podaj opis!</string> <string name="description_edit_save">Zapisz</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Dodaj opis</string> </resources> diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index eab5ff3..54cf0ef 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -448,7 +448,6 @@ <string name="description_edit_text_hint">Hint text that is shown when the description field is empty.</string> <string name="description_edit_save">Hint for the button that is pressed for saving the new description. {{Identical|Save}}</string> - <string name="description_edit_char_count">Label that displays the character count of the description being entered. The %1$d symbol is replaced with the number of characters in the current description, and the %2$d symbol is replaced with the maximum allowed characters.</string> <string name="description_edit_add_description">Label that prompts the user to add a description to an article that does not yet have one.</string> <string name="description_edit_success_saved">Message that the description the user just added was saved.</string> <string name="description_edit_success_encouragement">Message that the user made Wikipedia better for everyone</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6e32c79..458080e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Что это?</string> <string name="description_edit_text_hint">Написать описание!</string> <string name="description_edit_save">Сохранить</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Добавить описание</string> </resources> diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml index b6262a2..9b702fc 100644 --- a/app/src/main/res/values-sd/strings.xml +++ b/app/src/main/res/values-sd/strings.xml @@ -296,6 +296,5 @@ <string name="description_edit_help_hint">ھي ڇاھي؟</string> <string name="description_edit_text_hint">ڪو تفصيل لکو!</string> <string name="description_edit_save">سانڍيو</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">تفصيل شامل ڪريو</string> </resources> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 64d09fe..951dce1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Čo je toto?</string> <string name="description_edit_text_hint">Napíšte popis!</string> <string name="description_edit_save">Uložiť</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Pridať popis</string> </resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b66b632..acd68d5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">Vad är detta?</string> <string name="description_edit_text_hint">Skriv en beskrivning!</string> <string name="description_edit_save">Spara</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Lägg till beskrivning</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index bbb13ab..6044a0f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">Bu nedir?</string> <string name="description_edit_text_hint">Bir açıklama yazın!</string> <string name="description_edit_save">Kaydet</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Açıklama ekle</string> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 9e5bf29..9fea846 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -302,6 +302,5 @@ <string name="description_edit_help_hint">Що це?</string> <string name="description_edit_text_hint">Напишіть опис!</string> <string name="description_edit_save">Зберегти</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Додати опис</string> </resources> diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 48c7555..0a85ba9 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -300,6 +300,5 @@ <string name="description_edit_help_hint">یہ کیا ہے؟</string> <string name="description_edit_text_hint">وضاحت لکھیں</string> <string name="description_edit_save">محفوظ کریں</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">وضاحت شامل کریں</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index fef04c3..39fff66 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -299,6 +299,5 @@ <string name="description_edit_help_hint">Đây là gì?</string> <string name="description_edit_text_hint">Đặt miêu tả!</string> <string name="description_edit_save">Lưu</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Thêm miêu tả</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index bd8cc6b..e369d9f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">這是什麼?</string> <string name="description_edit_text_hint">寫一段描述!</string> <string name="description_edit_save">儲存</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">增加描述</string> </resources> diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index c036e53..99a6ee9 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -301,6 +301,5 @@ <string name="description_edit_help_hint">这是什么?</string> <string name="description_edit_text_hint">写一段描述!</string> <string name="description_edit_save">保存</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">添加描述</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe07690..40150de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -338,7 +338,6 @@ <string name="description_edit_help_hint">What\'s this?</string> <string name="description_edit_text_hint">Write a description!</string> <string name="description_edit_save">Save</string> - <string name="description_edit_char_count">%1$d / %2$d</string> <string name="description_edit_add_description">Add description</string> <!-- /Description editing --> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 660d6a8..dfa2f94 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -252,4 +252,7 @@ <item name="android:windowContentOverlay">@null</item> </style> -</resources> \ No newline at end of file + <style name="CounterOverflowTextAppearance" parent="@style/TextAppearance.Design.Counter.Overflow"> + <item name="android:textColor">@color/foundation_red</item> + </style> +</resources> -- To view, visit https://gerrit.wikimedia.org/r/323987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib94d135e925124bd79da5ef6f27cfb09ca1fa122 Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits