Fixes the CardView customization mentioned in #1582

app/src/main/java/de/tum/in/tumcampusapp/component/other/settings/SettingsFragment.kt

@@ -29,6 +29,7 @@ import de.tum.`in`.tumcampusapp.component.ui.cafeteria.repository.CafeteriaLocal
 import de.tum.`in`.tumcampusapp.component.ui.eduroam.SetupEduroamActivity
 import de.tum.`in`.tumcampusapp.component.ui.news.NewsController
 import de.tum.`in`.tumcampusapp.component.ui.onboarding.StartupActivity
+import de.tum.`in`.tumcampusapp.component.ui.overview.CardManager
 import de.tum.`in`.tumcampusapp.database.TcaDb
 import de.tum.`in`.tumcampusapp.di.injector
 import de.tum.`in`.tumcampusapp.service.SilenceWorker
@@ -46,7 +47,7 @@ import java.util.concurrent.ExecutionException
 import javax.inject.Inject
 
 class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener,
-        SharedPreferences.OnSharedPreferenceChangeListener {
+    SharedPreferences.OnSharedPreferenceChangeListener {
 
     private val compositeDisposable = CompositeDisposable()
 
@@ -91,18 +92,21 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
                 setSummary("silent_mode_set_to")
                 setSummary("background_mode_set_to")
             }
+
             "card_cafeteria" -> {
                 setSummary("card_cafeteria_default_G")
                 setSummary("card_cafeteria_default_K")
                 setSummary("card_cafeteria_default_W")
                 setSummary("card_role")
                 initCafeteriaCardSelections()
             }
+
             "card_mvv" -> {
                 setSummary("card_stations_default_G")
                 setSummary("card_stations_default_C")
                 setSummary("card_stations_default_K")
             }
+
             "card_eduroam" -> {
                 findPreference(SETUP_EDUROAM).onPreferenceClickListener = this
             }
@@ -139,11 +143,11 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
         url: String
     ) {
         compositeDisposable += Single
-                .fromCallable { Picasso.get().load(url).get() }
-                .subscribeOn(Schedulers.io())
-                .map { BitmapDrawable(resources, it) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(preference::setIcon, Utils::log)
+            .fromCallable { Picasso.get().load(url).get() }
+            .subscribeOn(Schedulers.io())
+            .map { BitmapDrawable(resources, it) }
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(preference::setIcon, Utils::log)
     }
 
     /**
@@ -219,13 +223,19 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
         if (key == "language_preference" && activity != null) {
             (activity as SettingsActivity).restartApp()
         }
+        // restart app after visibility of card changed
+        val cardTypesPrefNames = CardManager.CardTypes.values().map { context?.getString(it.showCardPreferenceStringRes) }
+        // restart when visibility changed
+        if (key in cardTypesPrefNames) {
+            (activity as SettingsActivity).restartApp()
+        }
     }
 
     private fun initCafeteriaCardSelections() {
         val cafeterias = cafeteriaLocalRepository
-                .getAllCafeterias()
-                .blockingFirst()
-                .sortedBy { it.name }
+            .getAllCafeterias()
+            .blockingFirst()
+            .sortedBy { it.name }
 
         val cafeteriaByLocationName = getString(R.string.settings_cafeteria_depending_on_location)
         val cafeteriaNames = listOf(cafeteriaByLocationName) + cafeterias.map { it.name }
@@ -260,11 +270,11 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic
             preference.setSummary(R.string.settings_no_location_selected)
         } else {
             preference.summary = values
-                    .map { preference.findIndexOfValue(it) }
-                    .map { preference.entries[it] }
-                    .map { it.toString() }
-                    .sorted()
-                    .joinToString(", ")
+                .map { preference.findIndexOfValue(it) }
+                .map { preference.entries[it] }
+                .map { it.toString() }
+                .sorted()
+                .joinToString(", ")
         }
     }
 

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/NextLectureCard.kt

@@ -14,7 +14,7 @@ import de.tum.`in`.tumcampusapp.component.ui.overview.card.CardViewHolder
 import org.joda.time.DateTime
 import java.util.*
 
-class NextLectureCard(context: Context) : Card(CardManager.CARD_NEXT_LECTURE, context, "card_next_lecture") {
+class NextLectureCard(context: Context) : Card(CardManager.CardTypes.NEXT_LECTURE, context) {
 
     private val calendarController: CalendarController = CalendarController(context)
 

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesCard.kt

@@ -24,7 +24,7 @@ import org.joda.time.format.DateTimeFormat
 class TuitionFeesCard(
     context: Context,
     private val tuition: Tuition
-) : Card(CardManager.CARD_TUITION_FEE, context, "card_tuition_fee") {
+) : Card(CardManager.CardTypes.TUITION_FEE, context) {
 
     override val optionsMenuResId: Int
         get() = R.menu.card_popup_menu

app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuCard.kt

@@ -22,7 +22,8 @@ import java.util.*
 /**
  * Card that shows the cafeteria menu
  */
-class CafeteriaMenuCard(context: Context, private val cafeteria: CafeteriaWithMenus) : Card(CardManager.CARD_CAFETERIA, context, "card_cafeteria") {
+class CafeteriaMenuCard(context: Context, private val cafeteria: CafeteriaWithMenus) :
+    Card(CardManager.CardTypes.CAFETERIA, context) {
 
     override val optionsMenuResId: Int
         get() = R.menu.card_popup_menu

app/src/main/java/de/tum/in/tumcampusapp/component/ui/eduroam/EduroamCard.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.net.wifi.WifiManager
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat.checkSelfPermission
@@ -24,7 +23,7 @@ import org.jetbrains.anko.wifiManager
 /**
  * Card that can start [SetupEduroamActivity]
  */
-class EduroamCard(context: Context) : Card(CardManager.CARD_EDUROAM, context, "card_eduroam") {
+class EduroamCard(context: Context) : Card(CardManager.CardTypes.EDUROAM, context) {
 
     override val optionsMenuResId: Int
         get() = R.menu.card_popup_menu
@@ -39,7 +38,10 @@ class EduroamCard(context: Context) : Card(CardManager.CARD_EDUROAM, context, "c
     override fun shouldShow(prefs: SharedPreferences): Boolean {
         // Check if WiFi is turned on at all, as we cannot say if it was configured if it is off
         val wifiManager = context.wifiManager
-        return (wifiManager.isWifiEnabled && EduroamController.getEduroamConfig(context) == null && eduroamAvailable(wifiManager))
+        return (wifiManager.isWifiEnabled &&
+            EduroamController.getEduroamConfig(context) == null &&
+            eduroamAvailable(wifiManager) &&
+            prefs.getBoolean("card_eduroam_start", true))
     }
 
     private fun eduroamAvailable(wifi: WifiManager): Boolean {
@@ -54,9 +56,7 @@ class EduroamCard(context: Context) : Card(CardManager.CARD_EDUROAM, context, "c
     }
 
     override fun discard(editor: SharedPreferences.Editor) {
-        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        prefs.edit().putBoolean("card_eduroam_start", false)
-                .apply()
+        editor.putBoolean("card_eduroam_start", false)
     }
 
     override fun getId(): Int {

app/src/main/java/de/tum/in/tumcampusapp/component/ui/eduroam/EduroamFixCard.kt

@@ -19,14 +19,13 @@ import de.tum.`in`.tumcampusapp.component.ui.overview.card.Card
 import de.tum.`in`.tumcampusapp.component.ui.overview.card.CardViewHolder
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import org.jetbrains.anko.defaultSharedPreferences
 import org.jetbrains.anko.wifiManager
 import java.util.*
 import java.util.regex.Pattern
 
 class EduroamFixCard(
     context: Context
-) : Card(CardManager.CARD_EDUROAM_FIX, context, "card_eduroam_fix_start") {
+) : Card(CardManager.CardTypes.EDUROAM_FIX, context) {
 
     private val errors: MutableList<String> = ArrayList()
     private lateinit var eduroam: WifiConfiguration
@@ -72,11 +71,11 @@ class EduroamFixCard(
         // Check if wifi is turned on at all, as we cannot say if it was configured if its off
         return if (!context.wifiManager.isWifiEnabled) {
             false
-        } else !isConfigValid()
+        } else !isConfigValid() && prefs.getBoolean("card_eduroam_fix_start", true)
     }
 
     override fun discard(editor: SharedPreferences.Editor) {
-        context.defaultSharedPreferences.edit().putBoolean("card_eduroam_fix_start", false).apply()
+        editor.putBoolean("card_eduroam_fix_start", false)
     }
 
     override fun getId(): Int {

app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsCard.kt

@@ -20,8 +20,8 @@ import org.joda.time.DateTime
 open class NewsCard @JvmOverloads constructor(
     context: Context,
     val news: News,
-    type: Int = CardManager.CARD_NEWS
-) : Card(type, context, "card_news") {
+    type: CardManager.CardTypes = CardManager.CardTypes.NEWS
+) : Card(type, context) {
 
     override val optionsMenuResId: Int
         get() = R.menu.card_popup_menu

app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/TopNewsCard.kt

@@ -24,7 +24,7 @@ import org.jetbrains.anko.defaultSharedPreferences
 /**
  * Shows important news
  */
-class TopNewsCard(context: Context) : Card(CardManager.CARD_TOP_NEWS, context, "top_news") {
+class TopNewsCard(context: Context) : Card(CardManager.CardTypes.TOP_NEWS, context) {
     private lateinit var imageView: ImageView
     private lateinit var progress: ProgressBar
     private val topNewsStore: TopNewsStore

app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/TopNewsStore.kt

@@ -62,6 +62,9 @@ class RealTopNewsStore @Inject constructor(
         }
 
         val displayUntil = sharedPrefs.getString(Const.NEWS_ALERT_SHOW_UNTIL, "")!!
+        if (displayUntil.isEmpty()) {
+            return null
+        }
         val until: DateTime? = DateTimeUtils.parseIsoDateWithMillis(displayUntil)
         if (until == null || until.isBeforeNow) {
             return null

app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/LoginPromptCard.kt

@@ -11,22 +11,23 @@ import de.tum.`in`.tumcampusapp.component.ui.overview.CardManager
 import de.tum.`in`.tumcampusapp.component.ui.overview.card.Card
 import de.tum.`in`.tumcampusapp.component.ui.overview.card.CardViewHolder
 import de.tum.`in`.tumcampusapp.utils.Const
-import de.tum.`in`.tumcampusapp.utils.Utils
 
 /**
  * Card that prompts the user to login to TUMonline since we don't show the wizard after the first launch anymore.
  * It will be shown until it is swiped away for the first time.
  */
-class LoginPromptCard(context: Context) : Card(CardManager.CARD_LOGIN, context, "card_login") {
+class LoginPromptCard(context: Context) : Card(CardManager.CardTypes.LOGIN, context) {
+
+    private val SHOW_LOGIN = "show_login"
 
     public override fun discard(editor: SharedPreferences.Editor) {
-        Utils.setSetting(context, CardManager.SHOW_LOGIN, false)
+        editor.putBoolean(SHOW_LOGIN, false)
     }
 
     override fun shouldShow(prefs: SharedPreferences): Boolean {
         // show on top as long as user hasn't swiped it away and isn't connected to TUMonline
-        return Utils.getSettingBool(context, CardManager.SHOW_LOGIN, true) &&
-            Utils.getSetting(context, Const.LRZ_ID, "").isEmpty()
+        return prefs.getBoolean(SHOW_LOGIN, true) &&
+            prefs.getString(Const.LRZ_ID, "").isNullOrEmpty()
     }
 
     override fun getId(): Int {

app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/CardAdapter.kt

@@ -27,20 +27,20 @@ class CardAdapter(private val interactionListener: CardInteractionListener) : Re
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): CardViewHolder {
         when (viewType) {
-            CardManager.CARD_CAFETERIA -> return CafeteriaMenuCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_TUITION_FEE -> return TuitionFeesCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_NEXT_LECTURE -> return NextLectureCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_RESTORE -> return RestoreCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_NO_INTERNET -> return NoInternetCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_MVV -> return MVVCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_NEWS, CardManager.CARD_NEWS_FILM -> return NewsCard.inflateViewHolder(viewGroup, viewType, interactionListener)
-            CardManager.CARD_EDUROAM -> return EduroamCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_EDUROAM_FIX -> return EduroamFixCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_SUPPORT -> return SupportCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_LOGIN -> return LoginPromptCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_TOP_NEWS -> return TopNewsCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_EVENT -> return EventCard.inflateViewHolder(viewGroup, interactionListener)
-            CardManager.CARD_UPDATE_NOTE -> return UpdateNoteCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.CAFETERIA.id -> return CafeteriaMenuCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.TUITION_FEE.id -> return TuitionFeesCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.NEXT_LECTURE.id -> return NextLectureCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.RESTORE.id -> return RestoreCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.NO_INTERNET.id -> return NoInternetCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.MVV.id -> return MVVCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.NEWS.id, CardManager.CardTypes.NEWS_FILM.id -> return NewsCard.inflateViewHolder(viewGroup, viewType, interactionListener)
+            CardManager.CardTypes.EDUROAM.id -> return EduroamCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.EDUROAM_FIX.id -> return EduroamFixCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.SUPPORT.id -> return SupportCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.LOGIN.id -> return LoginPromptCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.TOP_NEWS.id -> return TopNewsCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.EVENT.id -> return EventCard.inflateViewHolder(viewGroup, interactionListener)
+            CardManager.CardTypes.UPDATE_NOTE.id -> return UpdateNoteCard.inflateViewHolder(viewGroup, interactionListener)
             else -> throw UnsupportedOperationException()
         }
     }
@@ -51,11 +51,11 @@ class CardAdapter(private val interactionListener: CardInteractionListener) : Re
         card.updateViewHolder(viewHolder)
     }
 
-    override fun getItemViewType(position: Int) = mItems[position].cardType
+    override fun getItemViewType(position: Int) = mItems[position].cardType.id
 
     override fun getItemId(position: Int): Long {
         val card = mItems[position]
-        return (card.cardType + (card.getId() shl 4)).toLong()
+        return (card.cardType.id + (card.getId() shl 4)).toLong()
     }
 
     override fun getItemCount() = mItems.size

app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/CardManager.kt

@@ -1,61 +1,62 @@
 package de.tum.`in`.tumcampusapp.component.ui.overview
 
 import android.content.Context
-import android.preference.PreferenceManager
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.database.TcaDb
 import de.tum.`in`.tumcampusapp.utils.Const.CARD_POSITION_PREFERENCE_SUFFIX
-import de.tum.`in`.tumcampusapp.utils.Const.DISCARD_SETTINGS_START
 import de.tum.`in`.tumcampusapp.utils.Utils
+import org.jetbrains.anko.defaultSharedPreferences
 
 /**
  * Card manager, manages inserting, dismissing, updating and displaying of cards
  */
 object CardManager {
 
-    const val SHOW_SUPPORT = "show_support"
-    const val SHOW_LOGIN = "show_login"
     const val SHOW_TOP_NEWS = "show_top_news"
 
     /**
      * Card typ constants
      */
-    const val CARD_CAFETERIA = R.layout.card_cafeteria_menu
-    const val CARD_TUITION_FEE = R.layout.card_tuition_fees
-    const val CARD_NEXT_LECTURE = R.layout.card_next_lecture_item
-    const val CARD_RESTORE = R.layout.card_restore
-    const val CARD_NO_INTERNET = R.layout.card_no_internet
-    const val CARD_MVV = R.layout.card_mvv
-    const val CARD_NEWS = R.layout.card_news_item
-    const val CARD_NEWS_FILM = R.layout.card_news_film_item
-    const val CARD_EDUROAM = R.layout.card_eduroam
-    const val CARD_CHAT = R.layout.card_chat_messages
-    const val CARD_SUPPORT = R.layout.card_support
-    const val CARD_LOGIN = R.layout.card_login_prompt
-    const val CARD_EDUROAM_FIX = R.layout.card_eduroam_fix
-    const val CARD_TOP_NEWS = R.layout.card_top_news
-    const val CARD_EVENT = R.layout.card_events_item
-    const val CARD_UPDATE_NOTE = R.layout.card_update_note
+    enum class CardTypes(val id: Int, val showCardPreferenceStringRes: Int) {
+        CAFETERIA(R.layout.card_cafeteria_menu, R.string.cafeteria_default_sharedpref_shown),
+        TUITION_FEE(R.layout.card_tuition_fees, R.string.tuition_fee_default_sharedpref_shown),
+        NEXT_LECTURE(R.layout.card_next_lecture_item, R.string.next_lecture_default_sharedpref_shown),
+        RESTORE(R.layout.card_restore, R.string.restore_default_sharedpref_shown),
+        NO_INTERNET(R.layout.card_no_internet, R.string.no_internet_default_sharedpref_shown),
+        MVV(R.layout.card_mvv, R.string.mvv_default_sharedpref_shown),
+        NEWS(R.layout.card_news_item, R.string.news_default_sharedpref_shown),
+        NEWS_FILM(R.layout.card_news_film_item, R.string.news_film_default_sharedpref_shown),
+        EDUROAM(R.layout.card_eduroam, R.string.eduroam_default_sharedpref_shown),
+        CHAT(R.layout.card_chat_messages, R.string.chat_default_sharedpref_shown),
+        SUPPORT(R.layout.card_support, R.string.support_default_sharedpref_shown),
+        LOGIN(R.layout.card_login_prompt, R.string.login_default_sharedpref_shown),
+        EDUROAM_FIX(R.layout.card_eduroam_fix, R.string.eduroam_fix_default_sharedpref_shown),
+        TOP_NEWS(R.layout.card_top_news, R.string.top_news_default_sharedpref_shown),
+        EVENT(R.layout.card_events_item, R.string.event_default_sharedpref_shown),
+        UPDATE_NOTE(R.layout.card_update_note, R.string.update_note_default_sharedpref_shown)
+    }
 
     /**
      * Resets dismiss settings for all cards
      */
     fun restoreCards(context: Context) {
-        context.getSharedPreferences(DISCARD_SETTINGS_START, 0)
+        CardTypes.values().forEach {
+            context.getSharedPreferences("CardPref$it", Context.MODE_PRIVATE)
                 .edit()
                 .clear()
                 .apply()
+        }
 
         TcaDb.getInstance(context)
-                .newsDao()
-                .restoreAllNews()
+            .newsDao()
+            .restoreAllNews()
 
         Utils.setSetting(context, SHOW_TOP_NEWS, true)
         restoreCardPositions(context)
     }
 
     private fun restoreCardPositions(context: Context) {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val preferences = context.defaultSharedPreferences
         val editor = preferences.edit()
 
         for (s in preferences.all.keys) {