1 files changed, 8 insertions, 54 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
index bfd0b0fe..bed50527 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
@@ -1,15 +1,9 @@
 package com.pitchedapps.frost.dbflow
 
 import android.content.Context
-import android.support.annotation.StringRes
-import com.mikepenz.community_material_typeface_library.CommunityMaterial
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
-import com.mikepenz.iconics.typeface.IIcon
-import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic
-import com.pitchedapps.frost.R
+import com.pitchedapps.frost.facebook.FbTab
 import com.pitchedapps.frost.utils.L
 import com.raizlabs.android.dbflow.annotation.Database
-import com.raizlabs.android.dbflow.annotation.ForeignKey
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
 import com.raizlabs.android.dbflow.annotation.Table
 import com.raizlabs.android.dbflow.kotlinextensions.from
@@ -26,61 +20,21 @@ object FbTabsDb {
     const val VERSION = 1
 }
 
-data class FbTab(val title: String, val icon: IIcon, val url: String)
-
-@Table(database = FbTabsDb::class, allFields = true)
-data class FbTabModel(
-        var title: String = "",
-        @ForeignKey(saveForeignKeyModel = true, deleteForeignKeyModel = false) var icon: IIconModel = IIconModel(),
-        @PrimaryKey var url: String = "") : BaseModel() {
-    constructor(fbTab: FbTab) : this(fbTab.title, IIconModel(fbTab.icon), fbTab.url)
-
-    fun toFbTab() = FbTab(title, icon.toIIcon(), url)
-}
-
 @Table(database = FbTabsDb::class, allFields = true)
-data class IIconModel(var type: Int = -1, @PrimaryKey var name: String = "") {
-    constructor(icon: IIcon) : this(when (icon) {
-        is CommunityMaterial.Icon -> 0
-        is GoogleMaterial.Icon -> 1
-        is MaterialDesignIconic.Icon -> 2
-        else -> -1
-    }, icon.toString())
+data class FbTabModel(@PrimaryKey var position: Int = -1, var tab: FbTab = FbTab.FEED) : BaseModel()
 
-    fun toIIcon(): IIcon = when (type) {
-        0 -> CommunityMaterial.Icon.valueOf(name)
-        1 -> GoogleMaterial.Icon.valueOf(name)
-        2 -> MaterialDesignIconic.Icon.valueOf(name)
-        else -> CommunityMaterial.Icon.cmd_newspaper
-    }
-}
-
-const val FB_URL_BASE = "https://m.facebook.com/"
 //const val FB_URL_BASE = "https://touch.facebook.com/"
 
-enum class FbUrl(@StringRes val titleId: Int, val icon: IIcon, relativeUrl: String) {
-//    LOGIN(R.string.feed, CommunityMaterial.Icon.cmd_newspaper, "https://www.facebook.com/v2.9/dialog/oauth?client_id=${FB_KEY}&redirect_uri=https://touch.facebook.com/&response_type=token,granted_scopes"),
-    FEED(R.string.feed, CommunityMaterial.Icon.cmd_newspaper, ""),
-    PROFILE(R.string.profile, CommunityMaterial.Icon.cmd_account, "me"),
-    EVENTS(R.string.events, GoogleMaterial.Icon.gmd_event, "events/upcoming"),
-    FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_people, "friends/center/requests"),
-    MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages?disable_interstitial=1"),
-    NOTIFICATIONS(R.string.notifications, MaterialDesignIconic.Icon.gmi_globe, "notifications");
-
-    val url = "$FB_URL_BASE$relativeUrl"
-    fun tabInfo(c: Context) = FbTab(c.getString(titleId), icon, url)
-}
-
 //BOOKMARKS("https://touch.facebook.com/bookmarks"),
 //SEARCH("https://touch.facebook.com/search"),
 
-fun loadFbTabs(c: Context): List<FbTab> {
-    val tabs: List<FbTabModel>? = SQLite.select().from(FbTabModel::class).queryList()
-    if (tabs?.isNotEmpty() ?: false) return tabs!!.map { it.toFbTab() }
-    L.e("No tabs; loading default")
-    return listOf(FbUrl.FEED, FbUrl.MESSAGES, FbUrl.FRIENDS, FbUrl.NOTIFICATIONS).map { it.tabInfo(c) }
+fun loadFbTabs(): List<FbTab> {
+    val tabs: List<FbTabModel>? = SQLite.select().from(FbTabModel::class).orderBy(FbTabModel_Table.position, true).queryList()
+    if (tabs?.isNotEmpty() ?: false) return tabs!!.map { it.tab }
+    L.d("No tabs; loading default")
+    return listOf(FbTab.FEED, FbTab.MESSAGES, FbTab.FRIENDS, FbTab.NOTIFICATIONS)
 }
 
 fun List<FbTab>.saveAsync(c: Context) {
-    map { FbTabModel(it) }.replace(c, FbTabsDb.NAME)
+    mapIndexed { index, fbTab -> FbTabModel(index, fbTab) }.replace(c, FbTabsDb.NAME)
 }
\ No newline at end of file