Merge branch 'master' into patch-87

app/src/main/java/com/foobnix/android/utils/TxtUtils.java

@@ -80,6 +80,14 @@ public class TxtUtils {
     static List<String> trash = Arrays.asList("-", "—", "_", "  ");
     int a = 1;
 
+    public static String formatTitle(FileMeta fileMeta) {
+        if (AppState.get().isShowSeriesNumberInTitle && fileMeta.getSIndex() != null) {
+            return "[" + fileMeta.getSIndex() + "] " + fileMeta.getTitle();
+        } else {
+            return fileMeta.getTitle();
+        }
+    }
+
     public static String formatInt(Integer in) {
         if (in == null) return "0";
         return in.toString();
@@ -744,7 +752,7 @@ public static String fixAppState(String text) {
     }
 
     public static String fixFileName(String fileName) {
-        if(TxtUtils.isEmpty(fileName)){
+        if (TxtUtils.isEmpty(fileName)) {
             return "";
         }
         fileName = fileName.replaceAll("[\\/:*?\"'<>|]", "_");

app/src/main/java/com/foobnix/model/AppState.java

@@ -647,6 +647,7 @@ public class AppState {
     public int sortBookmarksOrder = BOOKMARK_SORT_PAGE_ASC;
     public boolean isEnableTextReplacement = false;
     public long textReplacementHash = 0;
+    public boolean isShowSeriesNumberInTitle = true;
 
 
     public static synchronized AppState get() {

app/src/main/java/com/foobnix/ui2/FileMetaCore.java

@@ -308,7 +308,7 @@ private EbookMeta getEbookMeta(String path, String unZipPath, String child) thro
         }
 
         if (ebookMeta.getsIndex() != null) {
-            ebookMeta.setTitle("[" + ebookMeta.getsIndex() + "] " + ebookMeta.getTitle());
+            //ebookMeta.setTitle("[" + ebookMeta.getsIndex() + "] " + ebookMeta.getTitle());
         }
 
         if (ExtUtils.isZip(path) && !unZipPath.endsWith("fb2")) {

app/src/main/java/com/foobnix/ui2/adapter/FileMetaAdapter.java

@@ -271,7 +271,7 @@ public void onResourceReady(Bitmap bitmap) {
 
         } else if (holderAll instanceof NameDividerViewHolder) {
             final NameDividerViewHolder holder = (NameDividerViewHolder) holderAll;
-            holder.title.setText(fileMeta.getTitle());
+            holder.title.setText(TxtUtils.formatTitle(fileMeta));
             // bindItemClickAndLongClickListeners(holder.parent, fileMeta);
 
         } else if (holderAll instanceof DirectoryViewHolder) {
@@ -584,7 +584,8 @@ private FileMeta bindFileMetaView(final FileMetaViewHolder holder, final int pos
             return new FileMeta();
         }
 
-        holder.title.setText(fileMeta.getTitle());
+        holder.title.setText(TxtUtils.formatTitle(fileMeta));
+
         holder.author.setText(fileMeta.getAuthor());
 
         if (AppState.get().isUiTextColor) {
@@ -945,9 +946,7 @@ public boolean onLongClick(View v) {
             if (holder.tags != null) {
                 holder.tags.setVisibility(View.GONE);
             }
-            if (fileMeta.getSIndex() != null) {
-                holder.title.setText("[" + fileMeta.getSIndex() + "] " + fileMeta.getTitle());
-            }
+            holder.title.setText(TxtUtils.formatTitle(fileMeta));
         }
 
         if (AppState.get().isShowOnlyOriginalFileNames) {

app/src/main/java/com/foobnix/ui2/fragment/PrefFragment2.java

@@ -1329,14 +1329,19 @@ public void run() {
             final CheckBox isHideReadBook = new CheckBox(v.getContext());
             isHideReadBook.setText(R.string.hide_read_books);
 
+            final CheckBox isShowSeriesNumberInTitle = new CheckBox(v.getContext());
+            isShowSeriesNumberInTitle.setText(R.string.show_series_number_in_title);
+
             final AlertDialog d = AlertDialogs.showViewDialog(getActivity(), null,
                     isFirstSurname,
                     isSkipFolderWithNOMEDIA,
                     isShowOnlyOriginalFileNames,
                     isAuthorTitleFromMetaPDF,
                     isUseCalibreOpf,
                     isDisplayAnnotation,
-                    isHideReadBook);
+                    isHideReadBook,
+                    isShowSeriesNumberInTitle
+                    );
 
             isFirstSurname.setChecked(AppState.get().isFirstSurname);
             isSkipFolderWithNOMEDIA.setChecked(AppState.get().isSkipFolderWithNOMEDIA);
@@ -1345,6 +1350,7 @@ public void run() {
             isUseCalibreOpf.setChecked(AppState.get().isUseCalibreOpf);
             isDisplayAnnotation.setChecked(AppState.get().isDisplayAnnotation);
             isHideReadBook.setChecked(AppState.get().isHideReadBook);
+            isShowSeriesNumberInTitle.setChecked(AppState.get().isShowSeriesNumberInTitle);
 
 
             final OnCheckedChangeListener listener = (buttonView, isChecked) -> {
@@ -1354,6 +1360,7 @@ public void run() {
                 AppState.get().isShowOnlyOriginalFileNames = isShowOnlyOriginalFileNames.isChecked();
                 AppState.get().isUseCalibreOpf = isUseCalibreOpf.isChecked();
                 AppState.get().isDisplayAnnotation = isDisplayAnnotation.isChecked();
+                AppState.get().isShowSeriesNumberInTitle = isShowSeriesNumberInTitle.isChecked();
 
 
                 handler.removeCallbacksAndMessages(null);
@@ -1381,6 +1388,14 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                     notifyFragment();
                 }
             });
+            isShowSeriesNumberInTitle.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    AppState.get().isShowSeriesNumberInTitle = isShowSeriesNumberInTitle.isChecked();
+                    TempHolder.listHash++;
+                    notifyFragment();
+                }
+            });
 
 
         });

app/src/main/res/values-ar/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">تنزيل المزيد من الخطوط</string>
    <string name="restore_search_query_when_the_application_starts">استعادة استعلام البحث عند بدء التشغيل</string>
    <string name="hide_read_books">إخفاء قراءة الكتب</string>
+   <string name="show_series_number_in_title">إظهار رقم السلسلة في العنوان</string>
    <string name="graphics_scale">مقياس الرسومات</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">إنشاء مجلد باسم الكتاب</string>
    <string name="memory">ذاكرة</string>

app/src/main/res/values-be/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Спампаваць больш шрыфтоў</string>
    <string name="restore_search_query_when_the_application_starts">Аднавіць пошукавы запыт пры запуску</string>
    <string name="hide_read_books">Схаваць прачытаныя кнігі</string>
+   <string name="show_series_number_in_title">Паказаць нумар серыі ў назве</string>
    <string name="graphics_scale">Графічны маштаб</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Стварыць тэчку з назвай кнігі</string>
    <string name="memory">Памяць</string>

app/src/main/res/values-bg/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Изтегляне на още шрифтове</string>
    <string name="restore_search_query_when_the_application_starts">Възстановяване на заявката за търсене при стартиране</string>
    <string name="hide_read_books">Скрий прочетени книги</string>
+   <string name="show_series_number_in_title">Покажете серийния номер в заглавието</string>
    <string name="graphics_scale">Графичен мащаб</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Създайте папка с името на книгата</string>
    <string name="memory">Памет</string>

app/src/main/res/values-cs/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Stáhnout více písem</string>
    <string name="restore_search_query_when_the_application_starts">Obnovit vyhledávací dotaz při spuštění</string>
    <string name="hide_read_books">Skrýt přečtené knihy</string>
+   <string name="show_series_number_in_title">Zobrazit číslo série v názvu</string>
    <string name="graphics_scale">Grafické měřítko</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Vytvořte složku s názvem knihy</string>
    <string name="memory">Paměť</string>

app/src/main/res/values-de/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Weitere Schriftarten herunterladen</string>
    <string name="restore_search_query_when_the_application_starts">Suchabfrage beim Start wiederherstellen</string>
    <string name="hide_read_books">Gelesene Bücher verstecken</string>
+   <string name="show_series_number_in_title">Seriennummer im Titel anzeigen</string>
    <string name="graphics_scale">Grafik skalieren</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Ordner mit dem Namen des Buches erstellen</string>
    <string name="memory">Erinnerung</string>

app/src/main/res/values-el/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Κατεβάστε περισσότερες γραμματοσειρές</string>
    <string name="restore_search_query_when_the_application_starts">Επαναφορά ερωτήματος αναζήτησης κατά την εκκίνηση</string>
    <string name="hide_read_books">Κρύψτε τα διαβασμένα βιβλία</string>
+   <string name="show_series_number_in_title">Εμφάνιση του αριθμού σειράς στον τίτλο</string>
    <string name="graphics_scale">Κλίμακα γραφικών</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Δημιουργήστε ένα φάκελο με το όνομα του βιβλίου</string>
    <string name="memory">Μνήμη</string>

app/src/main/res/values-es/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Descargar más fuentes</string>
    <string name="restore_search_query_when_the_application_starts">Restaurar la consulta de búsqueda al inicio</string>
    <string name="hide_read_books">Ocultar leer libros</string>
+   <string name="show_series_number_in_title">Mostrar el número de serie en el título</string>
    <string name="graphics_scale">Escala gráfica</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Crear una carpeta con el nombre del libro</string>
    <string name="memory">Memoria</string>

app/src/main/res/values-eu/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Deskargatu letra-tipo gehiago</string>
    <string name="restore_search_query_when_the_application_starts">Berrezarri bilaketa-kontsulta abiarazteko</string>
    <string name="hide_read_books">Ezkutatu irakurritako liburuak</string>
+   <string name="show_series_number_in_title">Serie zenbakia izenburuan erakutsi</string>
    <string name="graphics_scale">Eskala grafikoa</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Sortu liburuaren izena duen karpeta bat</string>
    <string name="memory">Memoria</string>

app/src/main/res/values-fa/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">فونت های بیشتر را دانلود کنید</string>
    <string name="restore_search_query_when_the_application_starts">بازیابی عبارت جستجو در هنگام راه اندازی</string>
    <string name="hide_read_books">کتاب های خوانده شده را پنهان کنید</string>
+   <string name="show_series_number_in_title">نمایش شماره سریال در عنوان</string>
    <string name="graphics_scale">مقیاس گرافیکی</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">یک پوشه با نام کتاب ایجاد کنید</string>
    <string name="memory">حافظه</string>

app/src/main/res/values-fi/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Lataa lisää kirjasimia</string>
    <string name="restore_search_query_when_the_application_starts">Palauta hakukysely käynnistyksen yhteydessä</string>
    <string name="hide_read_books">Piilottaa luetut kirjat</string>
+   <string name="show_series_number_in_title">Näytä sarjanumero otsikossa</string>
    <string name="graphics_scale">Graafinen mittakaava</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Luo kansio kirjan nimellä</string>
    <string name="memory">Muisti</string>

app/src/main/res/values-fr/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Télécharger plus de polices</string>
    <string name="restore_search_query_when_the_application_starts">Restaurer la requête de recherche au démarrage</string>
    <string name="hide_read_books">Masquer les livres lus</string>
+   <string name="show_series_number_in_title">Afficher le numéro de série dans le titre</string>
    <string name="graphics_scale">Échelle graphique</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Créer un dossier avec le nom du livre</string>
    <string name="memory">Mémoire</string>

app/src/main/res/values-ga/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Íosluchtaigh clónna níos mó</string>
    <string name="restore_search_query_when_the_application_starts">Ceist chuardaigh a chur ar ais ag am tosaithe</string>
    <string name="hide_read_books">Hide léamh leabhair</string>
+   <string name="show_series_number_in_title">Taispeáin uimhir na sraithe i dteideal</string>
    <string name="graphics_scale">Scála grafach</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Cruthaigh fillteán le hainm an leabhair</string>
    <string name="memory">Cuimhne</string>

app/src/main/res/values-he/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">להוריד גופנים נוספים</string>
    <string name="restore_search_query_when_the_application_starts">שחזר שאילתת חיפוש בעת ההפעלה</string>
    <string name="hide_read_books">להסתיר ספרים לקרוא</string>
+   <string name="show_series_number_in_title">הצג את מספר הסדרה בכותרת</string>
    <string name="graphics_scale">סולם גרפי</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">ליצור תיקיה עם שם הספר</string>
    <string name="memory">זיכרון</string>

app/src/main/res/values-hi/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">अधिक फोंट डाउनलोड करें</string>
    <string name="restore_search_query_when_the_application_starts">स्टार्टअप पर खोज क्वेरी को पुनर्स्थापित करें</string>
    <string name="hide_read_books">पढ़ी गई किताबें छुपाएं</string>
+   <string name="show_series_number_in_title">शीर्षक में श्रृंखला संख्या दिखाएँ</string>
    <string name="graphics_scale">ग्राफिक्स स्केल</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">किताब के नाम से एक फोल्डर बनाएं</string>
    <string name="memory">स्मृति</string>

app/src/main/res/values-hu/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Több betűtípus letöltése</string>
    <string name="restore_search_query_when_the_application_starts">A keresési lekérdezés visszaállítása indításkor</string>
    <string name="hide_read_books">Elrejteni olvasott könyveket</string>
+   <string name="show_series_number_in_title">Sorozatszámot mutasd a címben</string>
    <string name="graphics_scale">Grafikus skála</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Hozzon létre egy mappát a könyv nevével</string>
    <string name="memory">Memória</string>

app/src/main/res/values-id/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Unduh lebih banyak font</string>
    <string name="restore_search_query_when_the_application_starts">Pulihkan permintaan pencarian saat startup</string>
    <string name="hide_read_books">Sembunyikan buku yang sudah dibaca</string>
+   <string name="show_series_number_in_title">Tampilkan nomor seri di judul</string>
    <string name="graphics_scale">Skala grafis</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Buat folder dengan nama buku</string>
    <string name="memory">Penyimpanan</string>

app/src/main/res/values-it/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Scarica più caratteri</string>
    <string name="restore_search_query_when_the_application_starts">Ripristinare la query di ricerca all\'avvio</string>
    <string name="hide_read_books">Nascondere leggere libri</string>
+   <string name="show_series_number_in_title">Mostra il numero di serie nel titolo</string>
    <string name="graphics_scale">Scala grafica</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Creare una cartella con il nome del libro</string>
    <string name="memory">Memoria</string>

app/src/main/res/values-ja/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">より多くのフォントをダウンロードする</string>
    <string name="restore_search_query_when_the_application_starts">起動時に検索クエリを復元する</string>
    <string name="hide_read_books">読んだ本を隠す</string>
+   <string name="show_series_number_in_title">タイトルにシリーズ番号を表示</string>
    <string name="graphics_scale">画像の伸縮</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">本の名前でフォルダを作成する</string>
    <string name="memory">内部記憶</string>

app/src/main/res/values-kk/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Қосымша қаріптерді жүктеп алыңыз</string>
    <string name="restore_search_query_when_the_application_starts">Іске қосу кезінде іздеу сұрауын қалпына келтіріңіз</string>
    <string name="hide_read_books">Оқыған кітаптарды жасыру</string>
+   <string name="show_series_number_in_title">Тақырыпта серия нөмірін көрсетіңіз</string>
    <string name="graphics_scale">Графикалық масштаб</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Кітап атауы бар қалта жасаңыз</string>
    <string name="memory">Жады</string>

app/src/main/res/values-ko/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">글꼴 다운로드</string>
    <string name="restore_search_query_when_the_application_starts">시작 시 검색어 복원</string>
    <string name="hide_read_books">읽은 책 숨기기</string>
+   <string name="show_series_number_in_title">제목에 시리즈 번호 표시</string>
    <string name="graphics_scale">그래픽 스케일</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">책 이름으로 폴더 만들기</string>
    <string name="memory">메모리</string>

app/src/main/res/values-la/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Download more fonts</string>
    <string name="restore_search_query_when_the_application_starts">Quaero quaestionem restituere ad startup</string>
    <string name="hide_read_books">Celare legere libros</string>
+   <string name="show_series_number_in_title">Ostende seriem numerus in titulo</string>
    <string name="graphics_scale">Graphics scale</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Folder in nomine creare libri</string>
    <string name="memory">Memoria</string>

app/src/main/res/values-lt/strings.xml

@@ -642,6 +642,7 @@
    <string name="cd_download_more_fonts">Atsisiųskite daugiau šriftų</string>
    <string name="restore_search_query_when_the_application_starts">Atkurti paieškos užklausą paleidžiant</string>
    <string name="hide_read_books">Slėpti perskaitytas knygas</string>
+   <string name="show_series_number_in_title">Pavadinime rodyti serijos numerį</string>
    <string name="graphics_scale">Grafikos skalė</string>
    <string name="сreate_a_folder_with_the_name_of_the_book">Sukurti aplanką su knygos pavadinimu</string>
    <string name="memory">Atmintis</string>