From dd1b907402d3f43a2d6fa61c79e565dd29ea0777 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 9 May 2018 23:14:59 +0200 Subject: [PATCH] updating the Empty List placeholder --- .../calendar/fragments/EventListFragment.kt | 13 +++++++++-- .../main/res/layout/fragment_event_list.xml | 22 ++++++++++++++++--- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-br/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hi-rIN/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 30 files changed, 58 insertions(+), 33 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt index bf5259678..d38dc7433 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt @@ -19,6 +19,8 @@ import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.ListEvent import com.simplemobiletools.commons.extensions.beGoneIf import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor +import com.simplemobiletools.commons.extensions.underlineText import com.simplemobiletools.commons.helpers.MONTH_SECONDS import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener import com.simplemobiletools.commons.views.MyRecyclerView @@ -39,10 +41,16 @@ class EventListFragment : MyFragmentHolder(), RefreshRecyclerViewListener { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { mView = inflater.inflate(R.layout.fragment_event_list, container, false) - val placeholderText = String.format(getString(R.string.two_string_placeholder), "${getString(R.string.no_upcoming_events)}\n", getString(R.string.add_some_events)) - mView.calendar_empty_list_placeholder.text = placeholderText mView.background = ColorDrawable(context!!.config.backgroundColor) mView.calendar_events_list_holder?.id = (System.currentTimeMillis() % 100000).toInt() + mView.calendar_empty_list_placeholder_2.apply { + setTextColor(context.getAdjustedPrimaryColor()) + underlineText() + setOnClickListener { + context.launchNewEventIntent(getNewEventDayCode()) + } + } + use24HourFormat = context!!.config.use24HourFormat updateActionBarTitle() return mView @@ -119,6 +127,7 @@ class EventListFragment : MyFragmentHolder(), RefreshRecyclerViewListener { private fun checkPlaceholderVisibility() { mView.calendar_empty_list_placeholder.beVisibleIf(mEvents.isEmpty()) + mView.calendar_empty_list_placeholder_2.beVisibleIf(mEvents.isEmpty()) mView.calendar_events_list.beGoneIf(mEvents.isEmpty()) if (activity != null) mView.calendar_empty_list_placeholder.setTextColor(activity!!.config.textColor) diff --git a/app/src/main/res/layout/fragment_event_list.xml b/app/src/main/res/layout/fragment_event_list.xml index 6e3aa7945..626f20a5b 100644 --- a/app/src/main/res/layout/fragment_event_list.xml +++ b/app/src/main/res/layout/fragment_event_list.xml @@ -21,10 +21,26 @@ android:id="@+id/calendar_empty_list_placeholder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:lineSpacingExtra="1dp" - android:padding="@dimen/big_margin" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/activity_margin" + android:gravity="center" + android:paddingLeft="@dimen/activity_margin" + android:paddingRight="@dimen/activity_margin" android:text="@string/no_upcoming_events" + android:textSize="@dimen/bigger_text_size" + android:visibility="gone"/> + + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index d9771dafc..8b140c49c 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -9,7 +9,6 @@ İllik görünüş Sadə hadisələr siyahısı Deyəsən yaxınlarda heçbir hadisə yoxdur. - Aşağıdakı Plus düyməsindən əlavə edin . Bugünə get @@ -20,6 +19,7 @@ Hadisə Hadisəni Dəyiş Yeni Hadisə + Create a new event Duplicate event Başlıq boş ola bilməz Hadisə başladığı gündən əvvəl ola bilməz diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index ae2e69734..1af0a04d5 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -9,7 +9,6 @@ Gwel bloaziek Roll darvoudoù een War a-seblant n\'ho peus darvoud ebet da zont. - Gallout a rit ouzhpennañ reoù gant an afell \"Mui\" en traoñ. Mont da hiziv @@ -20,6 +19,7 @@ Darvoud Embann an darvoud Darvoud nevez + Create a new event Duplicate event N\'hall ket an titl bezañ goullo N\'hall ket an darvoud echuiñ abretoc\'h eget ma krog diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index cc10ab761..11a31e0bf 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -9,7 +9,6 @@ Roční kalendář Jednoduchý seznam událostí Nemáte žádné nadcházející události. - Přidejte událost tlačítkem Plus dole. Přejít na dnešek @@ -20,6 +19,7 @@ Událost Upravit událost Nová událost + Create a new event Duplicate event Doplňte název Konec události nemůže být dříve než začátek diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4f0f9cd19..391d087bf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -9,7 +9,6 @@ Årlig Begivenhedsliste Du ser ikke ud til at have nogen forestående begivenheder. - Du kan tilføje nogle med plus-knappen nederst. Gå til i dag @@ -20,6 +19,7 @@ Begivenhed Rediger begivenhed Ny begivenhed + Create a new event Kopier begivenhed Indtast titel Begivenheden skal starte inden den slutter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eccb8709f..554e31f47 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,7 +9,6 @@ Jahresansicht Schlichte Terminliste Keine anstehenden Termine - Du kannst neue Termine mit dem Hinzufügen Button unten rechts erstellen. Gehe zu Heute @@ -20,6 +19,7 @@ Termin Termin bearbeiten Neuer Termin + Create a new event Duplicate event Titel darf nicht leer sein Der Termin darf nicht früher enden als er beginnt diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 26c81a35c..92a3477fb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,7 +9,6 @@ Vista anual Lista de eventos sencilla Parece que no tienes ningún evento próximo. - Puede añadir eventos con el botón Más en la parte inferior. Ir al día de hoy @@ -20,6 +19,7 @@ Evento Editar evento Nuevo evento + Create a new event Duplicate event El título no puede estar vacío El evento no puede acabar antes de iniciarse diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2d2b0239f..51b406092 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,7 +9,6 @@ Vue annuelle Liste simple d\'événements Il semblerait que vous n\'ayez aucun événement à venir. - Vous pouvez ajouter des événements avec le bouton + en bas. Aller à aujourd\'hui @@ -20,6 +19,7 @@ Événement Éditer l\'événement Nouvel événement + Create a new event Duplicate event Le titre ne peut pas être vide L\'événement ne peut pas se terminer plus tôt qu\'il ne commence diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7134354da..6179a9bc1 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -9,7 +9,6 @@ Vista anual Lista de eventos simple Semella que non ten ningún evento próximo. - Pode engadir algún co botón Máis na parte inferior. Ir ao día de hoxe @@ -20,6 +19,7 @@ Evento Editar evento Novo evento + Create a new event Duplicate event O título non pode estar baldeiro O evento non pode rematar antes de iniciarse diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 1927ba8b6..cb5c5b77e 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -9,7 +9,6 @@ वार्षिक दृश्य सरल इवेंट सूची Seems like you don\'t have any upcoming events. - You can add some with the Plus button at the bottom. Go to today @@ -20,6 +19,7 @@ इवेंट इवेंट एडिट करें नया इवेंट + Create a new event Duplicate event शीर्षक रिक्त नहीं हो सकता इवेंट शुरू होने से पहले खत्म नहीं हो सकता diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1e5aa2720..ad935cf7a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -9,7 +9,6 @@ Godišnji pregled Jednostavan popis događaja Izgleda da nemate nadolazećih događaja. - Možete dodati neke događaje pomoću ikone Plus na dnu. Idi na danas @@ -20,6 +19,7 @@ Događaj Uredi događaj Novi događaj + Create a new event Duplicate event Naslov ne može biti prazan Događaj ne može završiti prije nego što počne diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f6e842a71..31c13258d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -9,7 +9,6 @@ Éves nézet Egyszerű bejegyzéslista Seems like you don\'t have any upcoming events. - You can add some with the Plus button at the bottom. Go to today @@ -20,6 +19,7 @@ Bejegyzés Bejegyzés szerkesztése Új bejegyzés + Create a new event Duplicate event A cím nem lehet üres Az eseménynek nem lehet vége a kezdete előtt diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 527521acb..31a8ce12c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -9,7 +9,6 @@ Vista annuale Lista eventi semplice Sembra che tu non abbia nessun evento imminente. - Puoi aggiungerne qualcuno con il bottone \'+\' in basso. Vai a oggi @@ -20,6 +19,7 @@ Evento Modifica evento Nuovo evento + Create a new event Duplicate event Il titolo non può essere vuoto L\'evento non può terminare prima del suo inizio diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 017a1b6e9..3095540e1 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -9,7 +9,6 @@ תצפית שנתית רשימת אירועים פשוטה נראה שאין לך אירועים בזמן הקרוב. - ניתן להוסיף אירועים בעזרת כפתור הפלוס למטה. Go to today @@ -20,6 +19,7 @@ אירוע ערוך אירוע חדש + Create a new event Duplicate event הכותרת לא יכולה להיות ריקה האירוע לא יכול להיגמר מוקדם משהוא מתחיל diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6fa874638..8a3538572 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -9,7 +9,6 @@ 年ビュー シンプル イベント リスト Seems like you don\'t have any upcoming events. - You can add some with the Plus button at the bottom. Go to today @@ -20,6 +19,7 @@ イベント イベントを編集 新しいイベント + Create a new event Duplicate event タイトルは空にできません イベントの終了は開始よりも前にできません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0bfb93cdf..b275196dd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -9,7 +9,6 @@ 연간 보기 간단한 이벤트 목록 다가올 이벤트가 없는 것 같습니다. - 아래의 더하기 버튼을 눌러 추가할 수 있습니다. 오늘로 이동 @@ -20,6 +19,7 @@ 이벤트 이벤트 수정 새 이벤트 + Create a new event Duplicate event 제목을 입력해주세요 이벤트가 시작되기 전에 끝날 수 없습니다 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 328cdc675..44ea5256c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -9,7 +9,6 @@ Metų peržiūra Paprastas įvykių sąrašas Atrodo jog Jūs neturite jokių įvyksiančių įvykių. - Jūs galte pridėti įvykius su pliuso mygtuku apačioje. Eiti į šiandieną @@ -20,6 +19,7 @@ Įvykis Redaguoti įvykį Naujas įvykis + Create a new event Duplicate event Pavadinimas negali būti tuščias TĮvykis negali pasibaigti anksčiau nei jis prasideda diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b19986eaa..99fae9ff9 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -9,7 +9,6 @@ Årsvisning Enkel hendelsesliste Ser ut som du ikke har noen kommende hendelser. - Du kan legge til noen med Pluss-knappen nederst. Gå til idag @@ -20,6 +19,7 @@ Hendelse Rediger hendelse Ny hendelse + Create a new event Duplicate event Tittel kan ikke være tom Hendelsen kan ikke slutte tidligere enn den starter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c07b90c45..f0028a979 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -9,7 +9,6 @@ Jaar Lijst Niets gepland. - Gebruik de plus-knop om iets te plannen. Naar vandaag @@ -20,6 +19,7 @@ Afspraak Afspraak bewerken Nieuwe afspraak + Create a new event Afspraak namaken Titel kan niet leeg zijn De begintijd valt na de eindtijd diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 0cff6443f..b336b32f4 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -9,7 +9,6 @@ Årsvisning Enkel hendelsesliste Ser ut som du ikke har noen kommende hendelser. - Du kan legge til noen med Pluss-knappen nederst. Gå til idag @@ -20,6 +19,7 @@ Hendelse Rediger hendelse Ny hendelse + Create a new event Duplicate event Tittel kan ikke være tom Hendelsen kan ikke slutte tidligere enn den starter diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1ded137e4..8ed0bf155 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -9,7 +9,6 @@ Rok Prosta lista zdarzeń Wygląda na to, że nie masz żadnych nadchodzących wydarzeń. - Możesz je dodawać za pomocą przycisku \"+\" znajdującego na dole. Przejdź do dnia dzisiejszego @@ -20,6 +19,7 @@ Wydarzenie Edytuj wydarzenie Nowe wydarzenie + Create a new event Duplicate event Tytuł nie może być pusty Wydarzenie nie może zakończyć się wcześniej, niż się zaczyna diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2825b9b5a..abac70bfb 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -9,7 +9,6 @@ Vista anual Lista de eventos Parece que você não tem eventos próximos. - Pode-se adicionar um evento através do botão existente na base da tela. Ir para hoje @@ -20,6 +19,7 @@ Evento Editar evento Novo evento + Create a new event Duplicate event O título não pode ficar vazio O evento não pode terminar antes de iniciar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 094521392..58a2b1091 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -9,7 +9,6 @@ Vista anual Lista de eventos Parece que você não tem eventos para breve - Pode adicionar um evento através do botão existente na base do ecrã Ir para hoje @@ -20,6 +19,7 @@ Evento Editar evento Novo evento + Create a new event Duplicate event O título não pode estar vazio O evento não pode terminar antes de iniciar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 563d62d55..d2451754b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,7 +9,6 @@ На год Простой список событий Похоже, у вас нет предстоящих событий. - Вы можете их добавить, нажав на кнопку с плюсом внизу. Сегодня @@ -20,6 +19,7 @@ Событие Редактировать событие Новое событие + Create a new event Duplicate event Заголовок не может быть пустым Событие не может завершаться раньше, чем начинается diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2ff88b197..dbea87e62 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -9,7 +9,6 @@ Ročný Jednoduchý zoznam Nemáte žiadne naplánované udalosti. - Viete ich pridať pomocou tlačidla Plus v pravom dolnom rohu. Prejsť na dnešok @@ -20,6 +19,7 @@ Udalosť Upraviť udalosť Nová udalosť + Vytvoriť novú udalosť Duplikovať udalosť Prosím zadajte názov Udalosť nemôže skončiť skôr ako by začala diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a17ac8a08..5709adc29 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -9,7 +9,6 @@ Årsvy Händelselista Det verkar som att du inte har några kommande händelser. - Du kan lägga till händelser via plus-knappen som du ser längst ner. Gå till idag @@ -20,6 +19,7 @@ Händelse Redigera händelse Ny händelse + Create a new event Duplicate event Titeln får inte vara tom Händelsen kan inte sluta innan den har startat diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e34cab967..2b5089daa 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -9,7 +9,6 @@ Yıllık görünüm Basit durum listesi Gelecekteki etkinliğiniz yok gibi görünüyor. - Artı düğmesinin alt kısmında bazılarını ekleyebilirsiniz. Bugüne git @@ -20,6 +19,7 @@ Durum Etkinliği Düzenle Yeni Etkinlik + Create a new event Duplicate event Başlık başlığı boş olamaz Etkinlik, başlamasından önce sona eremez diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0cc8b3de4..3082f19ff 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -9,7 +9,6 @@ 年曆 簡易活動列表 你近期似乎沒有任何活動。 - 你可以用底部的[加號]按鈕添加一些活動。 前往今天 @@ -20,6 +19,7 @@ 活動 編輯活動 新活動 + Create a new event Duplicate event 標題不能是空白的 活動結束時間不能比開始早 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1eee1e2d2..2c8f67bc9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,6 @@ Yearly view Simple event list Seems like you don\'t have any upcoming events. - You can add some with the Plus button at the bottom. Go to today @@ -20,6 +19,7 @@ Event Edit Event New Event + Create a new event Duplicate event Title cannot be empty The event cannot end earlier than it starts