diff options
| -rw-r--r-- | .idea/misc.xml | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt | 3 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt | 5 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 7 | ||||
| -rw-r--r-- | gradle.properties | 4 |
6 files changed, 17 insertions, 6 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index 7e0fe393..8449ce70 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -121,7 +121,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt index 2e87d141..d6583a50 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt @@ -239,6 +239,8 @@ class MainActivity : BaseActivity() { primaryItem(FbTab.GROUPS) primaryItem(FbTab.PAGES) primaryItem(FbTab.SAVED) + divider() + } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt index 1fcdf798..ef8345d0 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt @@ -24,12 +24,13 @@ class SettingsActivity : KPrefActivity() { items(Theme.values().map { this@SettingsActivity.string(it.textRes) }) itemsDisabledIndices(Theme.CUSTOM.ordinal) itemsCallbackSingleChoice(item.pref, { - _, _, which, _ -> + _, _, which, text -> if (item.pref != which) { item.pref = which reload() setFrostTheme(true) themeExterior() + frostAnswersCustom("Theme") { putCustomAttribute("Count", text.toString()) } } true }) diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt index 9c8bf2e6..03dd21a4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt @@ -18,6 +18,7 @@ import com.pitchedapps.frost.facebook.FACEBOOK_COM import com.pitchedapps.frost.facebook.FB_URL_BASE import com.pitchedapps.frost.facebook.FbTab import com.pitchedapps.frost.utils.L +import com.pitchedapps.frost.utils.frostAnswersCustom import com.pitchedapps.frost.utils.frostNotification import org.jetbrains.anko.doAsync import org.jsoup.Jsoup @@ -39,7 +40,7 @@ class NotificationService : JobService() { override fun onStartJob(params: JobParameters?): Boolean { future = doAsync { - debugNotification("Load notifs") + // debugNotification("Load notifs") loadFbCookiesSync().forEach { data -> L.i("Handle notifications for $data") @@ -59,6 +60,7 @@ class NotificationService : JobService() { } } if (notifCount > 0) saveNotificationTime(NotificationModel(data.id, latestEpoch)) + frostAnswersCustom("Notifications") { putCustomAttribute("Count", notifCount) } summaryNotification(data.id, notifCount) } L.d("Finished notifications") @@ -69,7 +71,6 @@ class NotificationService : JobService() { } companion object { - const val ARG_ID = "arg_id" val epochMatcher: Regex by lazy { Regex(":([0-9]*),") } val notifIdMatcher: Regex by lazy { Regex("notif_id\":([0-9]*),") } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt index 3e0e6924..b9de13af 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -16,6 +16,7 @@ import android.widget.TextView import ca.allanwang.kau.utils.* import com.afollestad.materialdialogs.MaterialDialog import com.crashlytics.android.answers.Answers +import com.crashlytics.android.answers.CustomEvent import com.pitchedapps.frost.* import com.pitchedapps.frost.dbflow.CookieModel import com.pitchedapps.frost.facebook.FB_URL_BASE @@ -141,4 +142,10 @@ fun frostAnswers(action: Answers.() -> Unit) { if (BuildConfig.DEBUG) return //TODO add opt out toggle Answers.getInstance().action() +} + +fun frostAnswersCustom(name: String, action: CustomEvent.() -> Unit = {}) { + frostAnswers { + logCustom(CustomEvent("Frost $name").apply { action() }) + } }
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7b523f58..f1064aa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -20,7 +20,7 @@ VERSION_CODE=2 VERSION_NAME=0.2 ANDROID_SUPPORT_LIBS=26.0.0-alpha1 -KAU=f41eb8b14f +KAU=eef0a98de4 MATERIAL_DRAWER=5.9.2 MATERIAL_DRAWER_KT=1.0.2 IICON_GOOGLE=3.0.1.0 |