From f1c74afe1c52cfc6b8bc2964e8a2df964521e2c9 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Wed, 16 Jan 2019 23:54:13 -0500
Subject: Feature/marketplace (#1328)

* Add marketplace item

* Add marketplace entry to drawer

* Update changelog
---
 .../kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt    | 1 +
 app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt      | 2 +-
 app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt       | 1 +
 app/src/main/res/values/strings.xml                                | 1 +
 app/src/main/res/xml/frost_changelog.xml                           | 7 +++++++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/src/main')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index 0f3a1e52..b4215913 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -330,6 +330,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
             divider()
             primaryFrostItem(FbItem.NOTES)
             primaryFrostItem(FbItem.SAVED)
+            primaryFrostItem(FbItem.MARKETPLACE)
         }
     }
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index 67953144..8411b8d7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -79,7 +79,7 @@ suspend fun loadFbCookiesSuspend(): List<CookieModel> = withContext(Dispatchers.
 inline fun saveFbCookie(cookie: CookieModel, crossinline callback: (() -> Unit) = {}) {
     cookie.async save {
         L.d { "Fb cookie saved" }
-        L._d { cookie }
+        L._d { cookie.toSensitiveString() }
         callback()
     }
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
index 723ed450..6cf6f41b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
@@ -46,6 +46,7 @@ enum class FbItem(
     FEED_TOP_STORIES(R.string.top_stories, GoogleMaterial.Icon.gmd_star, "home.php?sk=h_nor"),
     FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_person_add, "friends/center/requests"),
     GROUPS(R.string.groups, GoogleMaterial.Icon.gmd_group, "groups"),
+    MARKETPLACE(R.string.marketplace, CommunityMaterial.Icon2.cmd_home_currency_usd, "marketplace"),
     MENU(R.string.menu, GoogleMaterial.Icon.gmd_menu, "settings", ::MenuFragment),
     MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages"),
     NOTES(R.string.notes, CommunityMaterial.Icon2.cmd_note, "notes"),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16b55b79..5fd35613 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="birthdays">Birthdays</string>
     <string name="chat">Chat</string>
     <string name="photos">Photos</string>
+    <string name="marketplace">Marketplace</string>
     <string name="menu" translatable="false">@string/kau_menu</string>
     <string name="settings" translatable="false">@string/kau_settings</string>
     <string name="notes">Notes</string>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index adc888c6..f90ecf37 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,6 +6,13 @@
     <item text="" />
     -->
 
+    <version title="v2.2.2" />
+    <item text="New marketplace shortcut" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+    <item text="" />
+
     <version title="v2.2.1" />
     <item text="Update theme" />
     <item text="Update translations" />
-- 
cgit v1.2.3