From c2561b83545fbaa3d5bbac680a12d1eb450dccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Fri, 9 Aug 2019 09:52:05 +0200
Subject: [PATCH] More strings can be struck through, optimised strikethrough
 method, added "_TESTURLS" debug flag, version bump to name 2.1.3, code 20

---
 app/build.gradle                               |  4 ++--
 .../com/denizd/substitutionplan/CardAdapter.kt | 18 ++++++++++--------
 .../com/denizd/substitutionplan/DataFetcher.kt |  8 ++++++--
 .../substitutionplan/SettingsFragment.kt       |  5 +++++
 app/src/main/res/layout/bg_colour_picker.xml   |  4 ----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a6aede4..7dfa69a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.denizd.substitutionplan"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 19
-        versionName "2.1.2"
+        versionCode 20
+        versionName "2.1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
index 2f79c8d..1a1bcab 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
@@ -53,18 +53,20 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
         val currentItem = mSubst[position]
         val prefs = PreferenceManager.getDefaultSharedPreferences(holder.mImageView.context)
         var psa = false
-        val room = SpannableString(currentItem.room)
-        for (i in 0 until room.length) {
-            if (room[i].toString() == "?") {
-                room.setSpan(StrikethroughSpan(), 0, i, 0)
+        val strings = arrayOf(SpannableString(currentItem.group), SpannableString(currentItem.time),
+                SpannableString(currentItem.course), SpannableString(currentItem.room))
+        for (item in strings) {
+            val qmark = item.indexOf("?")
+            if (qmark != -1) {
+                item.setSpan(StrikethroughSpan(), 0, qmark, 0)
             }
         }
 
         holder.mImageView.setImageResource(currentItem.icon)
-        holder.mGroup.text = currentItem.group
-        holder.mTime.text = currentItem.time
-        holder.mCourse.text = currentItem.course
-        holder.mRoom.setText(room, TextView.BufferType.SPANNABLE)
+        holder.mGroup.setText(strings[0], TextView.BufferType.SPANNABLE)
+        holder.mTime.setText(strings[1], TextView.BufferType.SPANNABLE)
+        holder.mCourse.setText(strings[2], TextView.BufferType.SPANNABLE)
+        holder.mRoom.setText(strings[3], TextView.BufferType.SPANNABLE)
         holder.mAdditional.text = currentItem.additional
 
         if (currentItem.date.isNotEmpty() && currentItem.date.substring(0, 3) == "psa") {
diff --git a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
index 1f90712..d681657 100644
--- a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
@@ -41,11 +41,15 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
     private val edit = prefs.edit()
     private var currentTime = ""
     private var currentFoodTime = ""
-    private val substUrl = "https://djd4rkn355.github.io/subst.html"
-    private val foodUrl = "https://djd4rkn355.github.io/food.html"
+    private var substUrl = "https://djd4rkn355.github.io/subst.html"
+    private var foodUrl = "https://djd4rkn355.github.io/food.html"
 
     override fun doInBackground(vararg params: Void?): Void? {
         try {
+            if (prefs.getBoolean("testUrls", false)) {
+                substUrl = "https://djd4rkn355.github.io/subst_test.html"
+                foodUrl = "https://djd4rkn355.github.io/food_test.html"
+            }
             if (menu) {
                 val docFood = Jsoup.connect(foodUrl).get()
                 currentFoodTime = docFood.select("h1")[0].text()
diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
index c22c9f8..f123751 100644
--- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
@@ -390,6 +390,11 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                     edit.putBoolean("firstTime", true).apply()
                     Toast.makeText(mContext, "First time flag cleared", Toast.LENGTH_LONG).show()
                 }
+                "_TESTURLS" -> {
+                    val currentTest = !prefs.getBoolean("testUrls", false)
+                    edit.putBoolean("testUrls", currentTest).apply()
+                    Toast.makeText(mContext, "Test URLs set to $currentTest", Toast.LENGTH_LONG).show()
+                }
                 else -> Toast.makeText(mContext, getString(R.string.invalidCode), Toast.LENGTH_LONG).show()
             }
         }
diff --git a/app/src/main/res/layout/bg_colour_picker.xml b/app/src/main/res/layout/bg_colour_picker.xml
index 978079b..c541b2d 100644
--- a/app/src/main/res/layout/bg_colour_picker.xml
+++ b/app/src/main/res/layout/bg_colour_picker.xml
@@ -236,8 +236,4 @@
 
     </TableRow>
 
-<!--    R.color.bgPureWhite, R.color.bgSalmon, R.color.bgTangerine, R.color.bgBanana, R.color.bgFlora, R.color.bgSpindrift,-->
-<!--    R.color.bgSky, R.color.bgOrchid, R.color.bgLavender, R.color.bgCarnation, R.color.bgLavender, R.color.bgCarnation,-->
-<!--    R.color.bgBrown2, R.color.bgPureBlack)-->
-
 </TableLayout>