From a6120cf750f4df92f21779e6f2df6ff325b7ed01 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 29 Sep 2015 13:07:00 +0200 Subject: [PATCH 01/13] Bump up Android version --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7b5bc93e1..407fc5414 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ Date: Sat, 7 Nov 2015 18:55:14 +0100 Subject: [PATCH 02/13] Windows FSJ-Lite ZIM file splitter is not available anymore, replace it in the help with 'JS-SplitD' --- res/raw-fr/help.html | 2 +- res/raw/help.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/raw-fr/help.html b/res/raw-fr/help.html index 3e47a0459..82c76bcba 100644 --- a/res/raw-fr/help.html +++ b/res/raw-fr/help.html @@ -66,7 +66,7 @@ utilisant l'un de ces logiciels:

  • Pour Microsoft Windows: FSJ-Lite + href="http://www.hjsplit.org/">HJ-Split
  • Pour Apple Mac OSX: Split&Concat diff --git a/res/raw/help.html b/res/raw/help.html index 604a736bd..1e23ba67e 100644 --- a/res/raw/help.html +++ b/res/raw/help.html @@ -51,7 +51,7 @@

    In this case, please split it using one of the following software:

    • On Microsoft Windows: FSJ-Lite + href="http://www.hjsplit.org/">HJ-Split
    • On Apple Mac OSX: Split&Concat From af25555b06560244355b836b2cb311371add0404 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 7 Nov 2015 18:57:22 +0100 Subject: [PATCH 03/13] Update UI translations --- res/values-el/strings.xml | 42 +++++++++++++++++++-------------------- res/values-nl/strings.xml | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 08fb011c1..06663072f 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -12,28 +12,28 @@ Τυχαίο άρθρο Πλήρης οθόνη Έξοδος από πλήρη οθόνη - Read aloud - Stop reading aloud + Διάβασε δυνατά + Σταμάτα να διαβάζεις δυνατά Rescan SD card - Save Media - An error occurred when trying to save the media! - Saved media as %s in your Pictures folder. - Scanning for ZIM files, please wait… + Αποθήκευση αρχείου πολυμέσου ως... + Προέκυψε σφάλμα κατά την προσπάθεια αποθήκευσης του αρχείου πολυμέσων! + Αποθήκευση αρχείων πολυμέσων ως το %1$s στο φάκελο Εικόνες + Σάρωση για αρχεία ZIM, παρακαλώ περιμένετε... Επιστροφή στην κορυφή Αναζήτηση - Type to lookup articles - Select a ZIM Content File (*.zim) + Πληκτρολόγηση για αναζήτηση λημμάτων + Επιλογή ZIM Content File (*.zim) Σημειώστε αυτή τη σελίδα Κατάργηση σήμανσης επιλεγμένο - Open link in new tab? - No ZIM files found on your device.\nTake a look at the Help Page to get directions on how to load content into Kiwix.\nIf you did put a ZIM file on your device/external storage, you might retry in a minute or restart your device. - Error: The selected ZIM file could not be found. - Error: The selected file is not a valid ZIM file. - Error: Loading article \"%1$s\" failed. - Error: Loading article (Url: %1$s) failed. + Άνοιγμα συνδέσμου σε νέα καρτέλα; + Δεν βρέθηκαν αρχεία ZIM στη συσκευή σας. Ρίξτε μια ματιά στη Σελίδα Βοήθειας για να λάβετε οδηγίες σχετικά με το πως να επιφορτώσετε περιεχόμενο στο Kiwix. \nΑν έβαλες ένα αρχείο ZIM στη συσκευή σου/μέσο εξωτερικής αποθήκευσης, μπορεί να ξαναδοκιμάσεις σε ένα λεπτό ή να επανεκκινήσεις τη συσκευή σου. + Σφάλμα: Το επιλεγμένο ZIM αρχείο δεν μπόρεσε να βρεθεί. + Σφάλμα: Το επιλεγμένο αρχείο δεν είναι έγκυρο αρχείο ZIM. + Σφάλμα: η επιφόρτωση λήμματος \"%1$s\" απέτυχε. + Σφάλμα: η επιφόρτωση λήμματος (Url: %1$s) απέτυχε. Εμφάνιση Zoom - Zoom level + Το επίπεδο ζουμ Αυτόματη Μικρό @@ -42,13 +42,13 @@ Πληροφορίες Έκδοση - Zoom controls - Night mode - Show articles with reverted colors - Back to Top - Display a button at the end of the page to scroll up to the top + Στοιχεία ελέγχου ζουμ + Νυχτερινή λειτουργία + Προβολή λημμάτων και αντεστραμμένα χρώματα + Επιστροφή στην κορυφή + Εμφάνιση κουμπιού στο τέλος της σελίδας για να μετακινηθείτε στην κορυφή Γλώσσα - Choose a language + Επιλογή γλώσσας The language of this page is not supported, or appropriate language data was not installed. The article may not be properly read. Could not find an installed application for this type of file Your application is corrupted.\nThis might happen when you remove files on the SD Card.\nYou need to uninstall then reinstall the App from the Play Store. diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index b987917b4..97fa6d179 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -15,7 +15,7 @@ Voorlezen Stoppen met voorlezen Rescan SD card - Sla media op als... + Media opslaan als... Er is een fout opgetreden bij het opslaan van de media! Het bestand is opgeslagen als %1$s in uw afbeeldingenmap Zoeken naar ZIM-bestanden. Even geduld... From c36cb32e519b08e2644180a31ed473545a35f276 Mon Sep 17 00:00:00 2001 From: Rashiq Date: Mon, 9 Nov 2015 00:27:25 +0100 Subject: [PATCH 04/13] Make the app movable to the sd card --- AndroidManifest.xml | 135 ++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 407fc5414..b24b8b41f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,114 +1,115 @@ + package="org.kiwix.kiwixmobile" + android:versionCode="27" + android:versionName="1.97"> + android:anyDensity="true" + android:largeScreens="true" + android:normalScreens="true" + android:resizeable="true" + android:smallScreens="true" /> - - - - + + + + + android:allowBackup="true" + android:hardwareAccelerated="true" + android:icon="@mipmap/kiwix_icon" + android:installLocation="auto" + android:label="@string/app_name" + android:theme="@style/AppTheme"> + android:name=".KiwixMobileActivity" + android:configChanges="orientation|keyboardHidden|screenSize|locale" + android:label="@string/app_name"> - - + + - - + + - - - - - + + + + + - + - - + + - - - - - - + + + + + + - + - - + + - - - - - - + + + + + + - + - - + + - - - - - - + + + + + + + android:name=".ZimFileSelectActivity" + android:label="@string/choose_file"> - + - - + + - + - + - + + android:name=".ZimContentProvider" + android:authorities="org.kiwix.zim.base" + android:exported="true" /> From a754ae3464ae231464be8700cd89ba8ac829f490 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Tue, 8 Dec 2015 10:05:40 +0100 Subject: [PATCH 05/13] Update meta data of custom Android apps --- customapp/wikimed/info.json | 7 ++++--- customapp/wikivoyage/info.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/customapp/wikimed/info.json b/customapp/wikimed/info.json index 9ef63260e..10d310439 100644 --- a/customapp/wikimed/info.json +++ b/customapp/wikimed/info.json @@ -1,9 +1,10 @@ { - "app_name": "WikiMed", + "app_name": "Medical Wikipedia", "package": "org.kiwix.kiwixcustomwikimed", - "version_name": "2015-07", - "version_code": "3", + "version_name": "2015-12", + "version_code": "4", "zim_file": "customapp/wikimed/content.zim", + "embed_zim": false, "ic_launcher": "customapp/wikimed/icon.png", "enforced_lang": "en" } diff --git a/customapp/wikivoyage/info.json b/customapp/wikivoyage/info.json index 462f561a6..5ae2c86ac 100644 --- a/customapp/wikivoyage/info.json +++ b/customapp/wikivoyage/info.json @@ -29,8 +29,8 @@ "defaultLanguage": "en-US" } }, - "version_code": "5", + "version_code": "6", "embed_zim": false, "enforced_lang": "en", - "version_name": "2015-07" + "version_name": "2015-10" } From be21f75e060aea198d19d4d9d104ed7bd39c73f0 Mon Sep 17 00:00:00 2001 From: Kelson Date: Fri, 1 Jan 2016 23:09:23 +0100 Subject: [PATCH 06/13] Update of the UI translations --- res/values-cy/strings.xml | 4 ++-- res/values-el/strings.xml | 4 ++-- res/values-ps/strings.xml | 8 ++++---- res/values-so/strings.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml index d6902f0c3..57b2e7a84 100644 --- a/res/values-cy/strings.xml +++ b/res/values-cy/strings.xml @@ -12,8 +12,8 @@ Erthygl ar hap Sgrin lawn Gadael modd sgrin-llawn - Read aloud - Stop reading aloud + Darllenwch yn uchel + Stopiwch ddarllen yn uchel Rescan SD card Cadw\'r cyfrwng fel... Gwall wrth geisio achub y cyfryngau! diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 06663072f..0633a60e1 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -29,8 +29,8 @@ Δεν βρέθηκαν αρχεία ZIM στη συσκευή σας. Ρίξτε μια ματιά στη Σελίδα Βοήθειας για να λάβετε οδηγίες σχετικά με το πως να επιφορτώσετε περιεχόμενο στο Kiwix. \nΑν έβαλες ένα αρχείο ZIM στη συσκευή σου/μέσο εξωτερικής αποθήκευσης, μπορεί να ξαναδοκιμάσεις σε ένα λεπτό ή να επανεκκινήσεις τη συσκευή σου. Σφάλμα: Το επιλεγμένο ZIM αρχείο δεν μπόρεσε να βρεθεί. Σφάλμα: Το επιλεγμένο αρχείο δεν είναι έγκυρο αρχείο ZIM. - Σφάλμα: η επιφόρτωση λήμματος \"%1$s\" απέτυχε. - Σφάλμα: η επιφόρτωση λήμματος (Url: %1$s) απέτυχε. + Σφάλμα: το ανέβασμα λήμματος \"%1$s\" απέτυχε. + Σφάλμα:το Ανέβασμα του λήμματος (Url: %1$s) απέτυχε. Εμφάνιση Zoom Το επίπεδο ζουμ diff --git a/res/values-ps/strings.xml b/res/values-ps/strings.xml index e03b1c76c..0d817bc39 100644 --- a/res/values-ps/strings.xml +++ b/res/values-ps/strings.xml @@ -18,18 +18,18 @@ رسنۍ ساتل لکه... د رسنۍ په ساتلو کې يوه تېروتنه رامنځ ته شوه! رسنۍ خپل د انځورونو په ټولگه کې د %1$s په نوم ساتل - د ZIM دوتنو لپاره ځيرڅارنه، لطفاً تم شۍ... + د ZIM دوتنو لپاره ځيرڅارنه، لطفاً تم شئ... بېرته سر ته پلټل - د ليکنو موندلو لپاره وټاپۍ + د ليکنو موندلو لپاره وټاپئ د ZIM مېنځپانگې يوه دوتنه ټاکل (*.zim) دا مخ په نخښه کول ټاکلي بې نخښې کول تړنه په نوې کړکۍ کې پرانيستل - ستاسې په وزلې هېڅ کومه ZIM دوتنه و نه موندل شوه.\nکيويکس کې د مېنځپانگې د برسېرولو لپاره د لارښود مخ ولولۍ.\nکه تاسې په خپلې وزلې کې يو ZIM دوتنه نه وي ايښې، نو تاسې کولی شی چې يوه دقيقه وروسته يې بيا وآزمويۍ او يا هم خپله وزله سر له نوي ولگوۍ او بيا هڅه وکړۍ. + ستاسې په وزلې هېڅ کومه ZIM دوتنه و نه موندل شوه.\nکيويکس کې د مېنځپانگې د برسېرولو لپاره د لارښود مخ ولولئ.\nکه تاسې په خپلې وزلې کې يو ZIM دوتنه نه وي ايښې، نو تاسې کولی شی چې يوه دقيقه وروسته يې بيا وآزمويئ او يا هم خپله وزله سر له نوي ولگوئ او بيا هڅه وکړئ. تېروتنه: ستاسې ټاکلې ZIM دوتنه و نه موندل شوه. تېروتنه: ستاسې ټاکلې دوتنه يوه کره ZIM دوتنه نه ده. - تېروتنه: ليکنه برسېرېدنه \"%1$s\" نابريالۍ شوه. + تېروتنه: ليکنه برسېرېدنه \"%1$s\" نابريالئ شوه. تېروتنه: ليکنه برسېرېدنه (يو آر ال: %1$s) نابريالئ شوه. ښکارېدنه Zoom diff --git a/res/values-so/strings.xml b/res/values-so/strings.xml index 97e49e3cb..ebae94542 100644 --- a/res/values-so/strings.xml +++ b/res/values-so/strings.xml @@ -44,7 +44,7 @@ Nuqul Weynayn hagista Habka habeenkii - Show articles with reverted colors + Itus maqaalada iyagoo leh midab madadaalo ah Ku laabo kor Itus batoonka dhammaadka bogga si kor loogu laabto Luqad From 8cf7599d0404363e13f586ff275f4ffbc0792b11 Mon Sep 17 00:00:00 2001 From: Kelson Date: Fri, 1 Jan 2016 23:58:18 +0100 Subject: [PATCH 07/13] Add 'sc' and 'lki' UI languages --- res/values-sc/strings.xml | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 res/values-sc/strings.xml diff --git a/res/values-sc/strings.xml b/res/values-sc/strings.xml new file mode 100644 index 000000000..d12f0756c --- /dev/null +++ b/res/values-sc/strings.xml @@ -0,0 +1,56 @@ + + + Aberi documentu... + Agiudu + Pàgina printzipale + In antis + In segus + Preferèntzias + Chirca + Agata in su testu + Preferidos + Artìculu a sa tzurpa + Ischermu intreu + Essi dae s\'ichermu intreu + Leghe a boghe arta + Firma sa leghidura a boghe arta + Rescan SD card + Sarba mèdia comente... + B\'est istadu un\'errore durante su tentativu de sarbamentu de su mèdia! + Mèdia sarbadu comente %1$s in sa cartella de sas immàgines tua + Iscansinde pro documentos ZIM, pro praghere iseta... + Torra a su cumintzu + Chirca + Iscrie pro chircare artìculos + Ischerta unu documentu de cuntenutu ZIM (*.zim) + Annanghe custa pàgina a sos preferidos + Boga custa pàgina dae sos preferidos + Aberire su ligòngiu in un\'ischeda noa? + Perunu documentu ZIM agatadu in su dispositivu tuo.\nLeghe sa pàgina de agiudu pro imparare a carrigare cuntenutu intre Kiwix.\nSi as postu unu documentu ZIM in su sa memòria de su dispositivu tuo o in un\'ischeda esterna, torra a proare a pustis de unu minutu o torra a allùere su dispositivu tuo. + Errore: su documentu ZIM ischertadu no est istadu agatadu. + Errore: su documentu ischertadu no est unu documentu ZIM vàlidu. + Errore: carrigamentu de s\'artìculu \"%1$s\" non resissidu. + Errore: carrigamentu de s\'artìculu (Url: %1$s) non resissidu. + Ischermu + Zoom + Livellu de zoom + + Automàticu + Minore + Mesanu + Mannu + + Informatziones + Versione + Gestione de su zoom + Modalidade pro sa note + Ammustra sos artìculos cun colores furriados + Torra a su cumintzu + Ammustra unu butone a sa fine de sa pàgina pro torrare a su cumintzu + Limba + Issèbera una limba + The language of this page is not supported, or appropriate language data was not installed. The article may not be properly read. + Could not find an installed application for this type of file + Your application is corrupted.\nThis might happen when you remove files on the SD Card.\nYou need to uninstall then reinstall the App from the Play Store. + Go to Play Store + \ No newline at end of file From 8605c0cdf2cc2586f0a5a2b6d2e8d6a2b912e80c Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Mon, 4 Jan 2016 02:54:46 +0100 Subject: [PATCH 08/13] Added persistent fullscreen The app will reopen in fullscreen if it is stopped while in this mode. --- .../kiwix/kiwixmobile/KiwixMobileActivity.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java index a0a8698f5..19a2c7abb 100644 --- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -108,6 +108,8 @@ public class KiwixMobileActivity extends AppCompatActivity private static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled"; + private static final String PREF_FULLSCREEN = "pref_fullscreen"; + private static final int REQUEST_FILE_SELECT = 1234; private static final int REQUEST_PREFERENCES = 1235; @@ -266,7 +268,6 @@ public class KiwixMobileActivity extends AppCompatActivity drawerToggle.syncState(); mCompatCallback = new CompatFindActionModeCallback(this); - mIsFullscreenOpened = false; mContentFrame = (FrameLayout) findViewById(R.id.content_frame); newTab(); @@ -461,6 +462,10 @@ public class KiwixMobileActivity extends AppCompatActivity int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN; getWindow().addFlags(fullScreenFlag); getWindow().clearFlags(classicScreenFlag); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = settings.edit(); + editor.putBoolean(PREF_FULLSCREEN, true); + editor.commit(); mIsFullscreenOpened = true; } @@ -474,6 +479,10 @@ public class KiwixMobileActivity extends AppCompatActivity int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN; getWindow().clearFlags(fullScreenFlag); getWindow().addFlags(classicScreenFlag); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = settings.edit(); + editor.putBoolean(PREF_FULLSCREEN, false); + editor.commit(); mIsFullscreenOpened = false; } @@ -913,6 +922,9 @@ public class KiwixMobileActivity extends AppCompatActivity if (requestInitAllMenuItems) { initAllMenuItems(); } + if (mIsFullscreenOpened) { + openFullScreen(); + } return true; } @@ -940,6 +952,7 @@ public class KiwixMobileActivity extends AppCompatActivity SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); boolean nightMode = sharedPreferences.getBoolean(PREF_NIGHTMODE, false); mIsBacktotopEnabled = sharedPreferences.getBoolean(PREF_BACKTOTOP, false); + mIsFullscreenOpened = sharedPreferences.getBoolean(PREF_FULLSCREEN, false); boolean isZoomEnabled = sharedPreferences.getBoolean(PREF_ZOOM_ENABLED, false); if (isZoomEnabled) { From 0505ceb1a104658fce42a7340cd437ef5daeb7a3 Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Mon, 4 Jan 2016 02:54:46 +0100 Subject: [PATCH 09/13] Added persistent fullscreen The app will reopen in fullscreen if it is stopped while in this mode. --- .../kiwixmobile/KiwixMobileActivity.java | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java index a0a8698f5..ca0f40865 100644 --- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -108,6 +108,8 @@ public class KiwixMobileActivity extends AppCompatActivity private static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled"; + private static final String PREF_FULLSCREEN = "pref_fullscreen"; + private static final int REQUEST_FILE_SELECT = 1234; private static final int REQUEST_PREFERENCES = 1235; @@ -266,7 +268,6 @@ public class KiwixMobileActivity extends AppCompatActivity drawerToggle.syncState(); mCompatCallback = new CompatFindActionModeCallback(this); - mIsFullscreenOpened = false; mContentFrame = (FrameLayout) findViewById(R.id.content_frame); newTab(); @@ -455,25 +456,37 @@ public class KiwixMobileActivity extends AppCompatActivity mToolbarContainer.setVisibility(View.GONE); exitFullscreenButton.setVisibility(View.VISIBLE); - menu.findItem(R.id.menu_fullscreen) - .setTitle(getResources().getString(R.string.menu_exitfullscreen)); + if(menu != null){ + menu.findItem(R.id.menu_fullscreen) + .setTitle(getResources().getString(R.string.menu_exitfullscreen)); + } int fullScreenFlag = WindowManager.LayoutParams.FLAG_FULLSCREEN; int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN; getWindow().addFlags(fullScreenFlag); getWindow().clearFlags(classicScreenFlag); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = settings.edit(); + editor.putBoolean(PREF_FULLSCREEN, true); + editor.commit(); mIsFullscreenOpened = true; } private void closeFullScreen() { mToolbarContainer.setVisibility(View.VISIBLE); - menu.findItem(R.id.menu_fullscreen) - .setTitle(getResources().getString(R.string.menu_fullscreen)); + if(menu != null){ + menu.findItem(R.id.menu_fullscreen) + .setTitle(getResources().getString(R.string.menu_fullscreen)); + } exitFullscreenButton.setVisibility(View.INVISIBLE); int fullScreenFlag = WindowManager.LayoutParams.FLAG_FULLSCREEN; int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN; getWindow().clearFlags(fullScreenFlag); getWindow().addFlags(classicScreenFlag); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = settings.edit(); + editor.putBoolean(PREF_FULLSCREEN, false); + editor.commit(); mIsFullscreenOpened = false; } @@ -610,6 +623,11 @@ public class KiwixMobileActivity extends AppCompatActivity menu.findItem(R.id.menu_randomarticle).setVisible(true); menu.findItem(R.id.menu_searchintext).setVisible(true); + if(mIsFullscreenOpened){ + menu.findItem(R.id.menu_fullscreen) + .setTitle(getResources().getString(R.string.menu_exitfullscreen)); + } + MenuItem searchItem = menu.findItem(R.id.menu_search); searchItem.setVisible(true); searchItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @@ -940,6 +958,7 @@ public class KiwixMobileActivity extends AppCompatActivity SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); boolean nightMode = sharedPreferences.getBoolean(PREF_NIGHTMODE, false); mIsBacktotopEnabled = sharedPreferences.getBoolean(PREF_BACKTOTOP, false); + mIsFullscreenOpened = sharedPreferences.getBoolean(PREF_FULLSCREEN, false); boolean isZoomEnabled = sharedPreferences.getBoolean(PREF_ZOOM_ENABLED, false); if (isZoomEnabled) { @@ -953,6 +972,10 @@ public class KiwixMobileActivity extends AppCompatActivity mBackToTopButton.setVisibility(View.INVISIBLE); } + if (mIsFullscreenOpened) { + openFullScreen(); + } + // Night mode status Log.d(TAG_KIWIX, "mNightMode value (" + nightMode + ")"); if (nightMode) { From 9d14b1e0dd81dec2e0c7395112fdd61ae8c685da Mon Sep 17 00:00:00 2001 From: mhutti1 Date: Tue, 5 Jan 2016 19:58:18 +0100 Subject: [PATCH 10/13] The actionbar title is now clickable Users can click the actionbar title to initiate a search as if they had clicked the search button. --- src/org/kiwix/kiwixmobile/KiwixMobileActivity.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java index ca0f40865..220b84733 100644 --- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -120,6 +120,8 @@ public class KiwixMobileActivity extends AppCompatActivity public Menu menu; + public Toolbar toolbar; + public boolean isFullscreenOpened; public ImageButton exitFullscreenButton; @@ -203,7 +205,7 @@ public class KiwixMobileActivity extends AppCompatActivity setContentView(R.layout.main); getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_VISIBILITY_ON); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); bookmarks = new ArrayList<>(); requestClearHistoryAfterLoad = false; @@ -640,6 +642,15 @@ public class KiwixMobileActivity extends AppCompatActivity } }); + toolbar.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(KiwixMobileActivity.this, SearchActivity.class); + startActivityForResult(i, REQUEST_FILE_SEARCH); + overridePendingTransition(0, 0); + } + }); + if (tts.isInitialized()) { menu.findItem(R.id.menu_read_aloud).setVisible(true); } From 066f413022917fe7b7c0fb0b12afa1de314ca7f5 Mon Sep 17 00:00:00 2001 From: Rashiq Date: Wed, 6 Jan 2016 13:33:11 +0100 Subject: [PATCH 11/13] Organize files in packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is just a first step towards _the-big-refactoring_™ --- gen-custom-android-build.py | 4 ++-- res/layout/toolbar.xml | 2 +- res/xml/preferences.xml | 2 +- ...ookmarkDialog.java => BookmarkDialogFragment.java} | 4 ++-- src/org/kiwix/kiwixmobile/KiwixMobileActivity.java | 11 ++++++++--- src/org/kiwix/kiwixmobile/SearchActivity.java | 2 +- src/org/kiwix/kiwixmobile/ZimContentProvider.java | 1 + src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java | 3 +++ .../kiwixmobile/settings/KiwixSettingsActivity.java | 3 ++- .../kiwixmobile/{ => utils}/KiwixTextToSpeech.java | 4 +++- .../kiwix/kiwixmobile/{ => utils}/LanguageUtils.java | 3 ++- .../kiwixmobile/{ => utils/files}/FileSearch.java | 3 ++- .../kiwixmobile/{ => utils/files}/FileUtils.java | 2 +- .../kiwixmobile/{ => utils/files}/FileWriter.java | 3 ++- .../kiwixmobile/{ => views}/AnimatedProgressBar.java | 3 ++- .../kiwixmobile/{ => views}/AutoCompleteAdapter.java | 4 ++-- .../{ => views}/CompatFindActionModeCallback.java | 3 ++- .../kiwix/kiwixmobile/{ => views}/KiwixWebView.java | 4 ++-- .../{settings => views}/SliderPreference.java | 2 +- 19 files changed, 40 insertions(+), 23 deletions(-) rename src/org/kiwix/kiwixmobile/{BookmarkDialog.java => BookmarkDialogFragment.java} (93%) rename src/org/kiwix/kiwixmobile/{ => utils}/KiwixTextToSpeech.java (98%) rename src/org/kiwix/kiwixmobile/{ => utils}/LanguageUtils.java (99%) rename src/org/kiwix/kiwixmobile/{ => utils/files}/FileSearch.java (98%) rename src/org/kiwix/kiwixmobile/{ => utils/files}/FileUtils.java (98%) rename src/org/kiwix/kiwixmobile/{ => utils/files}/FileWriter.java (98%) rename src/org/kiwix/kiwixmobile/{ => views}/AnimatedProgressBar.java (99%) rename src/org/kiwix/kiwixmobile/{ => views}/AutoCompleteAdapter.java (96%) rename src/org/kiwix/kiwixmobile/{ => views}/CompatFindActionModeCallback.java (99%) rename src/org/kiwix/kiwixmobile/{ => views}/KiwixWebView.java (99%) rename src/org/kiwix/kiwixmobile/{settings => views}/SliderPreference.java (99%) diff --git a/gen-custom-android-build.py b/gen-custom-android-build.py index 3dd2fde00..36a036ffe 100755 --- a/gen-custom-android-build.py +++ b/gen-custom-android-build.py @@ -321,7 +321,7 @@ def step_update_xml_nodes(jsdata, **options): 'preferences.xml') soup = soup = BeautifulSoup(open(preferences_xml, 'r'), 'xml', from_encoding='utf-8') - item = soup.find('org.kiwix.kiwixmobile.settings.SliderPreference') + item = soup.find('org.kiwix.kiwixmobile.views.SliderPreference') item.name = '{}.settings.SliderPreference'.format(jsdata.get('package')) flushxml(soup, 'PreferenceScreen', preferences_xml, head=False) @@ -329,7 +329,7 @@ def step_update_xml_nodes(jsdata, **options): toolbar_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'toolbar.xml') soup = soup = BeautifulSoup(open(toolbar_xml, 'r'), 'xml', from_encoding='utf-8') - item = soup.find('org.kiwix.kiwixmobile.AnimatedProgressBar') + item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') item.name = '{}.AnimatedProgressBar'.format(jsdata.get('package')) flushxml(soup, 'RelativeLayout', toolbar_xml, head=False) diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index 1ec78953c..5979da857 100644 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -13,7 +13,7 @@ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> - - , OnItemClickListener { diff --git a/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java b/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java index 043cbdf4d..d112970d8 100644 --- a/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java +++ b/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java @@ -32,10 +32,11 @@ import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.BaseAdapter; -import org.kiwix.kiwixmobile.LanguageUtils; +import org.kiwix.kiwixmobile.utils.LanguageUtils; import org.kiwix.kiwixmobile.R; import java.util.Locale; +import org.kiwix.kiwixmobile.views.SliderPreference; public class KiwixSettingsActivity extends AppCompatActivity { diff --git a/src/org/kiwix/kiwixmobile/KiwixTextToSpeech.java b/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java similarity index 98% rename from src/org/kiwix/kiwixmobile/KiwixTextToSpeech.java rename to src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java index 4b4de3434..032fddf83 100644 --- a/src/org/kiwix/kiwixmobile/KiwixTextToSpeech.java +++ b/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java @@ -1,4 +1,4 @@ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.utils; import android.annotation.TargetApi; import android.content.Context; @@ -12,6 +12,8 @@ import android.widget.Toast; import java.util.HashMap; import java.util.Locale; +import org.kiwix.kiwixmobile.R; +import org.kiwix.kiwixmobile.ZimContentProvider; public class KiwixTextToSpeech { diff --git a/src/org/kiwix/kiwixmobile/LanguageUtils.java b/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java similarity index 99% rename from src/org/kiwix/kiwixmobile/LanguageUtils.java rename to src/org/kiwix/kiwixmobile/utils/LanguageUtils.java index 7cfdce27a..2636f1bff 100644 --- a/src/org/kiwix/kiwixmobile/LanguageUtils.java +++ b/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.utils; import android.content.Context; import android.content.SharedPreferences; @@ -41,6 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.MissingResourceException; +import org.kiwix.kiwixmobile.utils.files.FileWriter; public class LanguageUtils { diff --git a/src/org/kiwix/kiwixmobile/FileSearch.java b/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java similarity index 98% rename from src/org/kiwix/kiwixmobile/FileSearch.java rename to src/org/kiwix/kiwixmobile/utils/files/FileSearch.java index 62fcd6b89..2e8dbd382 100644 --- a/src/org/kiwix/kiwixmobile/FileSearch.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.utils.files; import android.os.Environment; import android.util.Log; @@ -30,6 +30,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Vector; +import org.kiwix.kiwixmobile.DataModel; public class FileSearch { diff --git a/src/org/kiwix/kiwixmobile/FileUtils.java b/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java similarity index 98% rename from src/org/kiwix/kiwixmobile/FileUtils.java rename to src/org/kiwix/kiwixmobile/utils/files/FileUtils.java index 70afc2036..b321b8415 100644 --- a/src/org/kiwix/kiwixmobile/FileUtils.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java @@ -1,4 +1,4 @@ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.utils.files; import org.kiwix.kiwixmobile.settings.Constants; diff --git a/src/org/kiwix/kiwixmobile/FileWriter.java b/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java similarity index 98% rename from src/org/kiwix/kiwixmobile/FileWriter.java rename to src/org/kiwix/kiwixmobile/utils/files/FileWriter.java index b63adceac..934b2f5a4 100644 --- a/src/org/kiwix/kiwixmobile/FileWriter.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.utils.files; import android.content.Context; import android.content.SharedPreferences; @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; +import org.kiwix.kiwixmobile.DataModel; public class FileWriter { diff --git a/src/org/kiwix/kiwixmobile/AnimatedProgressBar.java b/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java similarity index 99% rename from src/org/kiwix/kiwixmobile/AnimatedProgressBar.java rename to src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java index f2357fe32..b12a630b4 100644 --- a/src/org/kiwix/kiwixmobile/AnimatedProgressBar.java +++ b/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java @@ -1,4 +1,4 @@ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.views; import android.animation.ObjectAnimator; import android.content.Context; @@ -14,6 +14,7 @@ import android.view.animation.Animation; import android.view.animation.DecelerateInterpolator; import android.view.animation.Transformation; import android.widget.LinearLayout; +import org.kiwix.kiwixmobile.R; public class AnimatedProgressBar extends LinearLayout { diff --git a/src/org/kiwix/kiwixmobile/AutoCompleteAdapter.java b/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java similarity index 96% rename from src/org/kiwix/kiwixmobile/AutoCompleteAdapter.java rename to src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java index ca110ac4b..9aeb06780 100644 --- a/src/org/kiwix/kiwixmobile/AutoCompleteAdapter.java +++ b/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java @@ -1,4 +1,4 @@ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.views; import android.content.Context; import android.widget.ArrayAdapter; @@ -7,7 +7,7 @@ import android.widget.Filterable; import java.util.ArrayList; import java.util.List; - +import org.kiwix.kiwixmobile.ZimContentProvider; public class AutoCompleteAdapter extends ArrayAdapter implements Filterable { diff --git a/src/org/kiwix/kiwixmobile/CompatFindActionModeCallback.java b/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java similarity index 99% rename from src/org/kiwix/kiwixmobile/CompatFindActionModeCallback.java rename to src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java index 686159c8d..1bc11e8df 100644 --- a/src/org/kiwix/kiwixmobile/CompatFindActionModeCallback.java +++ b/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.views; import android.content.Context; @@ -35,6 +35,7 @@ import android.webkit.WebView; import android.widget.EditText; import java.lang.reflect.Method; +import org.kiwix.kiwixmobile.R; public class CompatFindActionModeCallback implements ActionMode.Callback, TextWatcher, View.OnClickListener { diff --git a/src/org/kiwix/kiwixmobile/KiwixWebView.java b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java similarity index 99% rename from src/org/kiwix/kiwixmobile/KiwixWebView.java rename to src/org/kiwix/kiwixmobile/views/KiwixWebView.java index db7aa143e..b70f0462f 100644 --- a/src/org/kiwix/kiwixmobile/KiwixWebView.java +++ b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java @@ -17,7 +17,7 @@ * MA 02110-1301, USA. */ -package org.kiwix.kiwixmobile; +package org.kiwix.kiwixmobile.views; import android.content.Context; import android.content.SharedPreferences; @@ -42,7 +42,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - +import org.kiwix.kiwixmobile.R; public class KiwixWebView extends WebView { diff --git a/src/org/kiwix/kiwixmobile/settings/SliderPreference.java b/src/org/kiwix/kiwixmobile/views/SliderPreference.java similarity index 99% rename from src/org/kiwix/kiwixmobile/settings/SliderPreference.java rename to src/org/kiwix/kiwixmobile/views/SliderPreference.java index 30c78eab7..7b6e24aee 100644 --- a/src/org/kiwix/kiwixmobile/settings/SliderPreference.java +++ b/src/org/kiwix/kiwixmobile/views/SliderPreference.java @@ -1,4 +1,4 @@ -package org.kiwix.kiwixmobile.settings; +package org.kiwix.kiwixmobile.views; import org.kiwix.kiwixmobile.R; From c0eed12bca538b4cd5f4922bfc5eee28ec67e4aa Mon Sep 17 00:00:00 2001 From: Rashiq Date: Wed, 6 Jan 2016 14:18:20 +0100 Subject: [PATCH 12/13] Remove html-inverting js It's redundant now. --- assets/invertcode.js | 20 -------------- .../kiwix/kiwixmobile/views/KiwixWebView.java | 26 +++---------------- 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 assets/invertcode.js diff --git a/assets/invertcode.js b/assets/invertcode.js deleted file mode 100644 index 3fb9cd2b4..000000000 --- a/assets/invertcode.js +++ /dev/null @@ -1,20 +0,0 @@ -(function() { - var e = 'img {-webkit-filter: invert(100%);' + '-moz-filter: invert(100%);' + '-o-filter: invert(100%);' + '-ms-filter: invert(100%); }', - t = document.getElementsByTagName('head')[0], - n = document.createElement('style'); - if (!window.counter) { - window.counter = 1 - } else { - window.counter++; - if (window.counter % 2 == 0) { - var e = 'html {-webkit-filter: invert(0%); -moz-filter: invert(0%); -o-filter: invert(0%); -ms-filter: invert(0%); }' - } - } - n.type = 'text/css'; - if (n.styleSheet) { - n.styleSheet.cssText = e - } else { - n.appendChild(document.createTextNode(e)) - } - t.appendChild(n) -})(); \ No newline at end of file diff --git a/src/org/kiwix/kiwixmobile/views/KiwixWebView.java b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java index b70f0462f..3856664e6 100644 --- a/src/org/kiwix/kiwixmobile/views/KiwixWebView.java +++ b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java @@ -50,7 +50,8 @@ public class KiwixWebView extends WebView { private static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled"; - private static final float[] mNegativeColorArray = {-1.0f, 0, 0, 0, 255, // red + private static final float[] NIGHT_MODE_COLORS = { + -1.0f, 0, 0, 0, 255, // red 0, -1.0f, 0, 0, 255, // green 0, 0, -1.0f, 0, 255, // blue 0, 0, 0, 1.0f, 0 // alpha @@ -139,34 +140,15 @@ public class KiwixWebView extends WebView { } } - public void deactiviateNightMode() { + public void deactivateNightMode() { setLayerType(View.LAYER_TYPE_NONE, null); } public void toggleNightMode() { - Paint paint = new Paint(); - ColorMatrixColorFilter filterInvert = new ColorMatrixColorFilter(mNegativeColorArray); + ColorMatrixColorFilter filterInvert = new ColorMatrixColorFilter(NIGHT_MODE_COLORS); paint.setColorFilter(filterInvert); - setLayerType(View.LAYER_TYPE_HARDWARE, paint); - try { - InputStream stream = getContext().getAssets().open("invertcode.js"); - int size = stream.available(); - byte[] buffer = new byte[size]; - stream.read(buffer); - stream.close(); - String JSInvert = new String(buffer); - - if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) { - evaluateJavascript("javascript:" + JSInvert, null); - } else { - //loadUrl("javascript:" + JSInvert); - } - - } catch (IOException e) { - e.printStackTrace(); - } } @Override From f184248f470a3cd0a29732d0dd2a1d0658824728 Mon Sep 17 00:00:00 2001 From: Rashiq Date: Wed, 6 Jan 2016 14:19:21 +0100 Subject: [PATCH 13/13] Reformat project --- .../kiwixmobile/KiwixMobileActivity.java | 20 ++++++++--------- src/org/kiwix/kiwixmobile/SearchActivity.java | 1 + .../kiwix/kiwixmobile/ZimContentProvider.java | 7 +++--- .../kiwixmobile/ZimFileSelectActivity.java | 7 +++--- .../settings/KiwixSettingsActivity.java | 4 ++-- .../kiwixmobile/utils/KiwixTextToSpeech.java | 13 ++++++----- .../kiwixmobile/utils/LanguageUtils.java | 3 ++- .../kiwixmobile/utils/files/FileSearch.java | 5 +++-- .../kiwixmobile/utils/files/FileUtils.java | 6 ++--- .../kiwixmobile/utils/files/FileWriter.java | 3 ++- .../views/AnimatedProgressBar.java | 1 + .../views/AutoCompleteAdapter.java | 3 ++- .../views/CompatFindActionModeCallback.java | 3 ++- .../kiwix/kiwixmobile/views/KiwixWebView.java | 4 ++-- .../kiwixmobile/views/SliderPreference.java | 22 +++++++++---------- 15 files changed, 56 insertions(+), 46 deletions(-) diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java index 109eacaf0..38d9e0f62 100644 --- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -70,6 +70,12 @@ import android.widget.Toast; import org.kiwix.kiwixmobile.settings.Constants; import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity; +import org.kiwix.kiwixmobile.utils.KiwixTextToSpeech; +import org.kiwix.kiwixmobile.utils.LanguageUtils; +import org.kiwix.kiwixmobile.utils.files.FileUtils; +import org.kiwix.kiwixmobile.views.AnimatedProgressBar; +import org.kiwix.kiwixmobile.views.CompatFindActionModeCallback; +import org.kiwix.kiwixmobile.views.KiwixWebView; import java.io.BufferedReader; import java.io.File; @@ -82,12 +88,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Locale; -import org.kiwix.kiwixmobile.utils.KiwixTextToSpeech; -import org.kiwix.kiwixmobile.utils.LanguageUtils; -import org.kiwix.kiwixmobile.utils.files.FileUtils; -import org.kiwix.kiwixmobile.views.AnimatedProgressBar; -import org.kiwix.kiwixmobile.views.CompatFindActionModeCallback; -import org.kiwix.kiwixmobile.views.KiwixWebView; public class KiwixMobileActivity extends AppCompatActivity implements BookmarkDialogFragment.BookmarkDialogListener { @@ -463,7 +463,7 @@ public class KiwixMobileActivity extends AppCompatActivity mToolbarContainer.setVisibility(View.GONE); exitFullscreenButton.setVisibility(View.VISIBLE); - if(menu != null){ + if (menu != null) { menu.findItem(R.id.menu_fullscreen) .setTitle(getResources().getString(R.string.menu_exitfullscreen)); } @@ -481,7 +481,7 @@ public class KiwixMobileActivity extends AppCompatActivity private void closeFullScreen() { mToolbarContainer.setVisibility(View.VISIBLE); - if(menu != null){ + if (menu != null) { menu.findItem(R.id.menu_fullscreen) .setTitle(getResources().getString(R.string.menu_fullscreen)); } @@ -630,7 +630,7 @@ public class KiwixMobileActivity extends AppCompatActivity menu.findItem(R.id.menu_randomarticle).setVisible(true); menu.findItem(R.id.menu_searchintext).setVisible(true); - if(mIsFullscreenOpened){ + if (mIsFullscreenOpened) { menu.findItem(R.id.menu_fullscreen) .setTitle(getResources().getString(R.string.menu_exitfullscreen)); } @@ -1000,7 +1000,7 @@ public class KiwixMobileActivity extends AppCompatActivity if (nightMode) { getCurrentWebView().toggleNightMode(); } else { - getCurrentWebView().deactiviateNightMode(); + getCurrentWebView().deactivateNightMode(); } } diff --git a/src/org/kiwix/kiwixmobile/SearchActivity.java b/src/org/kiwix/kiwixmobile/SearchActivity.java index 1be7baa7e..2857df355 100644 --- a/src/org/kiwix/kiwixmobile/SearchActivity.java +++ b/src/org/kiwix/kiwixmobile/SearchActivity.java @@ -12,6 +12,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; + import org.kiwix.kiwixmobile.views.AutoCompleteAdapter; public class SearchActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { diff --git a/src/org/kiwix/kiwixmobile/ZimContentProvider.java b/src/org/kiwix/kiwixmobile/ZimContentProvider.java index c4508a53c..9b6fbaaa9 100644 --- a/src/org/kiwix/kiwixmobile/ZimContentProvider.java +++ b/src/org/kiwix/kiwixmobile/ZimContentProvider.java @@ -29,6 +29,8 @@ import android.os.ParcelFileDescriptor.AutoCloseOutputStream; import android.util.Log; import android.webkit.MimeTypeMap; +import org.kiwix.kiwixmobile.utils.files.FileUtils; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -37,7 +39,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.kiwix.kiwixmobile.utils.files.FileUtils; public class ZimContentProvider extends ContentProvider { @@ -288,7 +289,7 @@ public class ZimContentProvider extends ContentProvider { @Override public Cursor query(Uri url, String[] projection, String selection, - String[] selectionArgs, String sort) { + String[] selectionArgs, String sort) { throw new RuntimeException("Operation not supported"); } @@ -299,7 +300,7 @@ public class ZimContentProvider extends ContentProvider { @Override public int update(Uri uri, ContentValues values, String where, - String[] whereArgs) { + String[] whereArgs) { throw new RuntimeException("Operation not supported"); } diff --git a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java index 6ced65f87..0b6e80ba9 100644 --- a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java +++ b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java @@ -49,13 +49,14 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import java.io.File; -import java.util.ArrayList; -import java.util.List; import org.kiwix.kiwixmobile.utils.LanguageUtils; import org.kiwix.kiwixmobile.utils.files.FileSearch; import org.kiwix.kiwixmobile.utils.files.FileWriter; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + public class ZimFileSelectActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks, OnItemClickListener { diff --git a/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java b/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java index d112970d8..f62e8f5f5 100644 --- a/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java +++ b/src/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java @@ -32,11 +32,11 @@ import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.BaseAdapter; -import org.kiwix.kiwixmobile.utils.LanguageUtils; import org.kiwix.kiwixmobile.R; +import org.kiwix.kiwixmobile.utils.LanguageUtils; +import org.kiwix.kiwixmobile.views.SliderPreference; import java.util.Locale; -import org.kiwix.kiwixmobile.views.SliderPreference; public class KiwixSettingsActivity extends AppCompatActivity { diff --git a/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java b/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java index 032fddf83..068f98656 100644 --- a/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java +++ b/src/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java @@ -10,11 +10,12 @@ import android.webkit.JavascriptInterface; import android.webkit.WebView; import android.widget.Toast; -import java.util.HashMap; -import java.util.Locale; import org.kiwix.kiwixmobile.R; import org.kiwix.kiwixmobile.ZimContentProvider; +import java.util.HashMap; +import java.util.Locale; + public class KiwixTextToSpeech { public static final String TAG_KIWIX = "kiwix"; @@ -40,8 +41,8 @@ public class KiwixTextToSpeech { * ended */ public KiwixTextToSpeech(Context context, WebView webView, - final OnInitSucceedListener onInitSucceedListener, - final OnSpeakingListener onSpeakingListener) { + final OnInitSucceedListener onInitSucceedListener, + final OnSpeakingListener onSpeakingListener) { Log.d(TAG_KIWIX, "Initializing TextToSpeech"); this.context = context; @@ -90,7 +91,7 @@ public class KiwixTextToSpeech { * Reads the currently selected text in the WebView. */ public void readSelection() { - webView.loadUrl("javascript:tts.speakAloud(window.getSelection().toString());", null); + webView.loadUrl("javascript:tts.speakAloud(window.getSelection().toString());", null); } /** @@ -161,7 +162,7 @@ public class KiwixTextToSpeech { /** * The listener that is notified when speaking starts or stops (regardless of whether it was a * result of error, user, or because whole text was read). - * + *

      * Note that the methods of this interface may not be called from the UI thread. */ public interface OnSpeakingListener { diff --git a/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java b/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java index 2636f1bff..6f57a3fff 100644 --- a/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java +++ b/src/org/kiwix/kiwixmobile/utils/LanguageUtils.java @@ -33,6 +33,8 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import org.kiwix.kiwixmobile.utils.files.FileWriter; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -41,7 +43,6 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.MissingResourceException; -import org.kiwix.kiwixmobile.utils.files.FileWriter; public class LanguageUtils { diff --git a/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java b/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java index 2e8dbd382..ac27350fe 100644 --- a/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileSearch.java @@ -22,6 +22,8 @@ package org.kiwix.kiwixmobile.utils.files; import android.os.Environment; import android.util.Log; +import org.kiwix.kiwixmobile.DataModel; + import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; @@ -30,7 +32,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Vector; -import org.kiwix.kiwixmobile.DataModel; public class FileSearch { @@ -142,7 +143,7 @@ public class FileSearch { // Fill fileList with files found in the specific directory private void addFilesToFileList(String directory, FilenameFilter[] filter, - List fileList) { + List fileList) { Log.d(TAG_KIWIX, "Searching directory " + directory); File[] foundFiles = listFilesAsArray(new File(directory), filter, -1); for (File f : foundFiles) { diff --git a/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java b/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java index b321b8415..06a28237b 100644 --- a/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileUtils.java @@ -1,12 +1,12 @@ package org.kiwix.kiwixmobile.utils.files; +import android.content.Context; +import android.os.Environment; + import org.kiwix.kiwixmobile.settings.Constants; import java.io.File; -import android.content.Context; -import android.os.Environment; - public class FileUtils { public static File getFileCacheDir(Context context) { diff --git a/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java b/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java index 934b2f5a4..36ee235b3 100644 --- a/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java +++ b/src/org/kiwix/kiwixmobile/utils/files/FileWriter.java @@ -23,12 +23,13 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Log; +import org.kiwix.kiwixmobile.DataModel; + import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import org.kiwix.kiwixmobile.DataModel; public class FileWriter { diff --git a/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java b/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java index b12a630b4..a7c3744b5 100644 --- a/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java +++ b/src/org/kiwix/kiwixmobile/views/AnimatedProgressBar.java @@ -14,6 +14,7 @@ import android.view.animation.Animation; import android.view.animation.DecelerateInterpolator; import android.view.animation.Transformation; import android.widget.LinearLayout; + import org.kiwix.kiwixmobile.R; public class AnimatedProgressBar extends LinearLayout { diff --git a/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java b/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java index 9aeb06780..39fc58c7d 100644 --- a/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java +++ b/src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java @@ -5,9 +5,10 @@ import android.widget.ArrayAdapter; import android.widget.Filter; import android.widget.Filterable; +import org.kiwix.kiwixmobile.ZimContentProvider; + import java.util.ArrayList; import java.util.List; -import org.kiwix.kiwixmobile.ZimContentProvider; public class AutoCompleteAdapter extends ArrayAdapter implements Filterable { diff --git a/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java b/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java index 1bc11e8df..e62167f62 100644 --- a/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java +++ b/src/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java @@ -34,9 +34,10 @@ import android.view.inputmethod.InputMethodManager; import android.webkit.WebView; import android.widget.EditText; -import java.lang.reflect.Method; import org.kiwix.kiwixmobile.R; +import java.lang.reflect.Method; + public class CompatFindActionModeCallback implements ActionMode.Callback, TextWatcher, View.OnClickListener { diff --git a/src/org/kiwix/kiwixmobile/views/KiwixWebView.java b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java index 3856664e6..9744dd053 100644 --- a/src/org/kiwix/kiwixmobile/views/KiwixWebView.java +++ b/src/org/kiwix/kiwixmobile/views/KiwixWebView.java @@ -24,7 +24,6 @@ import android.content.SharedPreferences; import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; import android.net.Uri; -import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.Message; @@ -37,12 +36,13 @@ import android.view.View; import android.webkit.WebView; import android.widget.Toast; +import org.kiwix.kiwixmobile.R; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.kiwix.kiwixmobile.R; public class KiwixWebView extends WebView { diff --git a/src/org/kiwix/kiwixmobile/views/SliderPreference.java b/src/org/kiwix/kiwixmobile/views/SliderPreference.java index 7b6e24aee..495cdad54 100644 --- a/src/org/kiwix/kiwixmobile/views/SliderPreference.java +++ b/src/org/kiwix/kiwixmobile/views/SliderPreference.java @@ -1,7 +1,5 @@ package org.kiwix.kiwixmobile.views; -import org.kiwix.kiwixmobile.R; - import android.content.Context; import android.content.res.TypedArray; import android.preference.DialogPreference; @@ -10,6 +8,8 @@ import android.view.View; import android.widget.SeekBar; import android.widget.TextView; +import org.kiwix.kiwixmobile.R; + public class SliderPreference extends DialogPreference { protected final static int SEEKBAR_MAX = 500; @@ -78,15 +78,6 @@ public class SliderPreference extends DialogPreference { } } - public void setSummary(CharSequence[] summaries) { - mSummaries = summaries; - } - - @Override - public void setSummary(CharSequence summary) { - super.setSummary(summary); - } - @Override public void setSummary(int summaryResId) { try { @@ -97,6 +88,15 @@ public class SliderPreference extends DialogPreference { } } + public void setSummary(CharSequence[] summaries) { + mSummaries = summaries; + } + + @Override + public void setSummary(CharSequence summary) { + super.setSummary(summary); + } + public float getValue() { return mSeekBarValue; }