Merge pull request #64 from Doomsdayrs/development

v1.1.0

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId 'com.github.doomsdayrs.apps.shosetsu'
         minSdkVersion 22
         targetSdkVersion 29
-        versionCode 22
-        versionName "v1.0.0"
+        versionCode 23
+        versionName "v1.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/DownloadManager.kt

@@ -48,7 +48,6 @@ object DownloadManager {
     /**
      * Initializes download manager
      */
-    @JvmStatic
     fun initDownloadManager(activity: Activity) {
         if (downloadTask.isCanceled) downloadTask = DownloadTask(activity)
         if (Database.DatabaseDownloads.getDownloadCount() >= 1)
@@ -61,7 +60,6 @@ object DownloadManager {
      *
      * @param downloadItem download item to add
      */
-    @JvmStatic
     fun addToDownload(activity: Activity?, downloadItem: DownloadItem) {
         if (!Database.DatabaseDownloads.inDownloads(downloadItem)) {
             Database.DatabaseDownloads.addToDownloads(downloadItem)
@@ -79,7 +77,6 @@ object DownloadManager {
      * @param downloadItem download item to remove
      * @return if downloaded
      */
-    @JvmStatic
     fun delete(context: Context?, downloadItem: DownloadItem): Boolean {
         Log.d("DeletingChapter", downloadItem.toString())
         val file = File(Utilities.shoDir + "/download/" + downloadItem.formatter.formatterID + "/" + downloadItem.novelName + "/" + downloadItem.chapterName + ".txt")

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/UpdateManager.kt

@@ -31,7 +31,6 @@ import java.util.*
  */
 object UpdateManager {
     private var chapterUpdater: ChapterUpdater? = null
-    @JvmStatic
     fun init(novelCards: ArrayList<Int>, context: Context) {
         if (chapterUpdater == null) {
             chapterUpdater = ChapterUpdater(novelCards, context)

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/Utilities.kt

@@ -12,6 +12,8 @@ import android.util.Log
 import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.github.doomsdayrs.api.shosetsu.services.core.objects.Novel
 import com.github.doomsdayrs.api.shosetsu.services.core.objects.NovelChapter
 import com.github.doomsdayrs.api.shosetsu.services.core.objects.NovelStatus
 import com.github.doomsdayrs.apps.shosetsu.R
@@ -29,6 +31,7 @@ import com.github.doomsdayrs.apps.shosetsu.variables.enums.Status
 import java.io.*
 import java.util.*
 import java.util.concurrent.TimeUnit
+import kotlin.collections.ArrayList
 
 /*
  * This file is part of Shosetsu.
@@ -64,6 +67,14 @@ object Utilities {
     lateinit var trackingPreferences: SharedPreferences
     lateinit var backupPreferences: SharedPreferences
 
+    fun convertNovelArrayToString2DArray(array: List<Novel>): ArrayList<Array<String>> {
+        val a: ArrayList<Array<String>> = ArrayList()
+        for (novel in array) {
+            a.add(arrayOf(novel.title, novel.link, novel.imageURL))
+        }
+        return a
+    }
+
     fun regret(context: Context) {
         Toast.makeText(context, context.getString(R.string.regret), Toast.LENGTH_LONG).show()
     }
@@ -91,7 +102,6 @@ object Utilities {
      * @param input String to clean
      * @return string without specials
      */
-    @JvmStatic
     fun cleanString(input: String): String {
         return input.replace("[^A-Za-z0-9]".toRegex(), "_")
     }
@@ -140,14 +150,14 @@ object Utilities {
         return null
     }
 
-    /**
-     * Checks string before deserialization
-     * If null or empty, returns "". Else deserializes the string and returns
-     *
-     * @param string String to be checked
-     * @return Completed String
-     */
     @JvmStatic
+            /**
+             * Checks string before deserialization
+             * If null or empty, returns "". Else deserializes the string and returns
+             *
+             * @param string String to be checked
+             * @return Completed String
+             */
     fun checkStringDeserialize(string: String): String {
         if (string.isEmpty()) {
             return ""
@@ -164,14 +174,14 @@ object Utilities {
         return ""
     }
 
-    /**
-     * Checks string before serialization
-     * If null or empty, returns "". Else serializes the string and returns
-     *
-     * @param string String to be checked
-     * @return Completed String
-     */
     @JvmStatic
+            /**
+             * Checks string before serialization
+             * If null or empty, returns "". Else serializes the string and returns
+             *
+             * @param string String to be checked
+             * @return Completed String
+             */
     fun checkStringSerialize(string: String?): String {
         if (string == null || string.isEmpty()) {
             return ""
@@ -185,13 +195,13 @@ object Utilities {
         return ""
     }
 
-    /**
-     * Converts String Stati back into Stati
-     *
-     * @param s String title
-     * @return Stati
-     */
     @JvmStatic
+            /**
+             * Converts String Stati back into Stati
+             *
+             * @param s String title
+             * @return Stati
+             */
     fun convertStringToStati(s: String): NovelStatus {
         return when (s) {
             "Publishing" -> NovelStatus.PUBLISHING
@@ -202,13 +212,13 @@ object Utilities {
         }
     }
 
-    /**
-     * Converts Array of Strings into a String
-     *
-     * @param a array of strings
-     * @return String Array
-     */
     @JvmStatic
+            /**
+             * Converts Array of Strings into a String
+             *
+             * @param a array of strings
+             * @return String Array
+             */
     fun convertArrayToString(a: Array<String?>?): String {
         if (a != null && a.isNotEmpty()) {
             for (x in a.indices) {
@@ -219,13 +229,13 @@ object Utilities {
         return "[]"
     }
 
-    /**
-     * Converts a String Array back into an Array of Strings
-     *
-     * @param s String array
-     * @return Array of Strings
-     */
     @JvmStatic
+            /**
+             * Converts a String Array back into an Array of Strings
+             *
+             * @param s String array
+             * @return Array of Strings
+             */
     fun convertStringToArray(s: String): Array<String> {
         val a = s.substring(1, s.length - 1).split(", ".toRegex()).toTypedArray()
         for (x in a.indices) {
@@ -323,23 +333,19 @@ object Utilities {
             return if (activeNetwork != null) activeNetwork.type == ConnectivityManager.TYPE_WIFI || activeNetwork.type == ConnectivityManager.TYPE_MOBILE else false
         }//TODO: Check this also, this doesn't seem to be a nice way to do things.
 
-    /**
-     * Is reader in night mode
-     *
-     * @return true if so, otherwise false
-     */
-    val isReaderNightMode: Boolean
-        get() =//TODO: Check this also, this doesn't seem to be a nice way to do things.
-            Settings.ReaderTextColor == Color.WHITE
 
     fun setNightNode() {
         setReaderColor(Color.WHITE, Color.BLACK)
     }
 
-    fun unsetNightMode() {
+    fun setLightMode() {
         setReaderColor(Color.BLACK, Color.WHITE)
     }
 
+    fun setSepiaMode(context: Context) {
+        setReaderColor(Color.BLACK, ContextCompat.getColor(context, R.color.wheat))
+    }
+
     /**
      * Sets the reader color
      *
@@ -355,14 +361,20 @@ object Utilities {
                 .apply()
     }
 
-    /**
-     * Swaps the reader colors
-     */
-    fun swapReaderColor() {
-        if (isReaderNightMode) {
-            setReaderColor(Color.BLACK, Color.WHITE)
-        } else {
-            setReaderColor(Color.WHITE, Color.BLACK)
+    fun getReaderColor(context: Context): Int {
+        return when (Settings.ReaderTextBackgroundColor) {
+            Color.WHITE -> {
+                1
+            }
+            Color.BLACK -> {
+                0
+            }
+            ContextCompat.getColor(context, R.color.wheat) -> {
+                2
+            }
+            else -> {
+                1
+            }
         }
     }
 

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/Database.java

@@ -397,7 +397,7 @@ public static ArrayList<DownloadItem> getDownloadList() {
                 String nName = cursor.getString(cursor.getColumnIndex(Columns.NOVEL_NAME.toString()));
                 String cName = cursor.getString(cursor.getColumnIndex(Columns.CHAPTER_NAME.toString()));
                 int formatter = DatabaseIdentification.getFormatterIDFromChapterID(id);
-                downloadItems.add(new DownloadItem(Objects.requireNonNull(DefaultScrapers.getByID(formatter)), nName, cName, id));
+                downloadItems.add(new DownloadItem(Objects.requireNonNull(DefaultScrapers.Companion.getByID(formatter)), nName, cName, id));
             }
             cursor.close();
 
@@ -422,7 +422,7 @@ public static DownloadItem getFirstDownload() {
                 String cName = cursor.getString(cursor.getColumnIndex(Columns.CHAPTER_NAME.toString()));
                 int formatter = getFormatterIDFromChapterID(id);
                 cursor.close();
-                return new DownloadItem(Objects.requireNonNull(DefaultScrapers.getByID(formatter)), nName, cName, id);
+                return new DownloadItem(Objects.requireNonNull(DefaultScrapers.Companion.getByID(formatter)), nName, cName, id);
             }
         }
 
@@ -432,7 +432,7 @@ public static DownloadItem getFirstDownload() {
          * @param downloadItem download item to remove
          */
         public static void removeDownload(@NonNull DownloadItem downloadItem) {
-            sqLiteDatabase.delete(Tables.DOWNLOADS.toString(), Columns.PARENT_ID + "=" + DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.chapterURL) + "", null);
+            sqLiteDatabase.delete(Tables.DOWNLOADS.toString(), Columns.PARENT_ID + "=" + DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.getChapterURL()) + "", null);
         }
 
         /**
@@ -447,9 +447,9 @@ public static void addToDownloads(@NonNull DownloadItem downloadItem) {
                     Columns.CHAPTER_NAME + "," +
                     Columns.PAUSED + ") " +
                     "values (" +
-                    DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.chapterURL) + ",'" +
-                    DownloadItem.cleanse(downloadItem.novelName) + "','" +
-                    DownloadItem.cleanse(downloadItem.chapterName) + "'," + 0 + ")");
+                    DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.getChapterURL()) + ",'" +
+                    DownloadItem.Companion.cleanse(downloadItem.getNovelName()) + "','" +
+                    DownloadItem.Companion.cleanse(downloadItem.getChapterName()) + "'," + 0 + ")");
         }
 
         /**
@@ -459,7 +459,7 @@ public static void addToDownloads(@NonNull DownloadItem downloadItem) {
          * @return if is in list
          */
         public static boolean inDownloads(@NonNull DownloadItem downloadItem) {
-            Cursor cursor = sqLiteDatabase.rawQuery("SELECT " + Columns.PARENT_ID + " from " + Tables.DOWNLOADS + " where " + Columns.PARENT_ID + " = " + DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.chapterURL) + "", null);
+            Cursor cursor = sqLiteDatabase.rawQuery("SELECT " + Columns.PARENT_ID + " from " + Tables.DOWNLOADS + " where " + Columns.PARENT_ID + " = " + DatabaseIdentification.getChapterIDFromChapterURL(downloadItem.getChapterURL()) + "", null);
             int a = cursor.getCount();
             cursor.close();
             return !(a <= 0);

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/scraper/WebViewScrapper.kt

@@ -67,7 +67,6 @@ object WebViewScrapper {
      * @param url URL to retrieve;
      * @return Document of the URL
      */
-    @JvmStatic
     fun docFromURL(url: String?, cloudflare: Boolean): Document? {
         if (url != null) {
             Log.i("URL load", url)

app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/catalogue/listeners/CatalogueSearchQuery.kt

@@ -51,10 +51,10 @@ class CatalogueSearchQuery(private val catalogueFragment: CatalogueFragment) : S
         catalogueFragment.isQuery = true
         val recycleCards = ArrayList(catalogueFragment.catalogueNovelCards)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            recycleCards.removeIf { recycleCard: CatalogueNovelCard? -> !recycleCard!!.title.toLowerCase().contains(newText.toLowerCase()) }
+            recycleCards.removeIf { recycleCard: CatalogueNovelCard? -> !recycleCard!!.title.toLowerCase(Locale.ROOT).contains(newText.toLowerCase(Locale.ROOT)) }
         } else {
             for (x in recycleCards.indices.reversed()) {
-                if (!recycleCards[x]!!.title.toLowerCase().contains(newText.toLowerCase())) {
+                if (!recycleCards[x]!!.title.toLowerCase(Locale.ROOT).contains(newText.toLowerCase(Locale.ROOT))) {
                     recycleCards.removeAt(x)
                 }
             }