karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More strings can be struck through, optimised strikethrough method, added "_TESTURLS" debug flag, version bump to name 2.1.3, code 20

Browse Source
This commit is contained in:
Deniz Düzgören
2019-08-09 09:52:05 +02:00
parent d2274f20b0
commit c2561b8354
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+10 -8
View File
@@ -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") {
app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
+6 -2
View File
@@ -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()
app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+5
View File
@@ -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()
}
}