Add Preferences table and repository

core/assets/main/migrations/023.sql

@@ -0,0 +1 @@
+create table Preferences(key text unique not null, value text not null)

core/src/commonMain/kotlin/org/isoron/uhabits/Config.kt

@@ -19,4 +19,4 @@
 
 package org.isoron.uhabits
 
-const val LOOP_DATABASE_VERSION = 22
+const val LOOP_DATABASE_VERSION = 23

core/src/commonMain/kotlin/org/isoron/uhabits/backend/Backend.kt

@@ -47,6 +47,8 @@ class Backend(databaseName: String,
 
     val strings = localeHelper.getStringsForCurrentLocale()
 
+    val preferences: Preferences
+
     var theme: Theme = LightTheme()
 
     init {
@@ -57,6 +59,7 @@ class Backend(databaseName: String,
         }
         database = databaseOpener.open(dbFile)
         database.migrateTo(LOOP_DATABASE_VERSION, fileOpener, log)
+        preferences = Preferences(PreferencesRepository(database))
         habitsRepository = HabitRepository(database)
         checkmarkRepository = CheckmarkRepository(database)
         taskRunner.runInBackground {

core/src/commonMain/kotlin/org/isoron/uhabits/models/Preferences.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2016-2019 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.models
+
+class Preferences(private val repository: PreferencesRepository) {
+    var showArchived = repository.getBoolean("show_archived", false)
+        set(value) {
+            repository.putBoolean("show_archived", value)
+            field = value
+        }
+
+    var showCompleted = repository.getBoolean("show_completed", true)
+        set(value) {
+            repository.putBoolean("show_completed", value)
+            field = value
+        }
+
+    var nightMode = repository.getBoolean("night_mode", false)
+        set(value) {
+            repository.putBoolean("night_mode", value)
+            field = value
+        }
+}

core/src/commonMain/kotlin/org/isoron/uhabits/models/PreferencesRepository.kt

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016-2019 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.models
+
+import org.isoron.platform.io.*
+
+class PreferencesRepository(private val db: Database) {
+
+    private val insertStatement = db.prepareStatement("insert into Preferences(key, value) values (?, ?)")
+    private val deleteStatement = db.prepareStatement("delete from Preferences where key=?")
+    private val selectStatement = db.prepareStatement("select value from Preferences where key=?")
+
+    fun putBoolean(key: String, value: Boolean) {
+        putString(key, value.toString())
+    }
+
+    fun getBoolean(key: String, default: Boolean): Boolean {
+        val value = getString(key, "NULL")
+        return if (value == "NULL") default else value.toBoolean()
+    }
+
+    fun putLong(key: String, value: Long) {
+        putString(key, value.toString())
+    }
+
+    fun getLong(key: String, default: Long): Long {
+        val value = getString(key, "NULL")
+        return if (value == "NULL") default else value.toLong()
+    }
+
+    fun putString(key: String, value: String) {
+        deleteStatement.bindText(0, key)
+        deleteStatement.step()
+        deleteStatement.reset()
+        insertStatement.bindText(0, key)
+        insertStatement.bindText(1, value)
+        insertStatement.step()
+        insertStatement.reset()
+    }
+
+    fun getString(key: String, default: String): String {
+        selectStatement.bindText(0, key)
+        if (selectStatement.step() == StepResult.DONE) {
+            selectStatement.reset()
+            return default
+        } else {
+            val value = selectStatement.getText(0)
+            selectStatement.reset()
+            return value
+        }
+    }
+}

core/src/jvmTest/kotlin/org/isoron/platform/io/JavaDatabaseTest.kt

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.platform
+package org.isoron.platform.io
 
 import org.isoron.platform.io.*
 import org.isoron.uhabits.BaseTest

core/src/jvmTest/kotlin/org/isoron/uhabits/backend/BackendTest.kt

@@ -32,21 +32,21 @@ class BackendTest : BaseTest() {
     val dbFilename = "uhabits${Random().nextInt()}.db"
     val dbFile = fileOpener.openUserFile(dbFilename)
 
-    @Before
+//    @Before
-    override fun setUp() {
+//    override fun setUp() {
-        super.setUp()
+//        super.setUp()
-        if (dbFile.exists()) dbFile.delete()
+//        if (dbFile.exists()) dbFile.delete()
-        backend = Backend(dbFilename,
+//        backend = Backend(dbFilename,
-                          databaseOpener,
+//                          databaseOpener,
-                          fileOpener,
+//                          fileOpener,
-                          log,
+//                          log,
-                          taskRunner)
+//                          taskRunner)
-    }
+//    }
-
+//
-    @After
+//    @After
-    fun tearDown() {
+//    fun tearDown() {
-        dbFile.delete()
+//        dbFile.delete()
-    }
+//    }
 
 //    @Test
 //    fun testMainScreenDataSource() {

core/src/jvmTest/kotlin/org/isoron/uhabits/models/PreferencesRepositoryTest.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016-2019 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.models
+
+import junit.framework.TestCase.*
+import org.isoron.uhabits.*
+import org.junit.*
+
+class PreferencesRepositoryTest : BaseTest() {
+    @Test
+    fun testUsage() {
+        val prefs = PreferencesRepository(db)
+
+        assertEquals("default", prefs.getString("non_existing_key", "default"))
+        prefs.putString("ringtone_path", "/tmp")
+        assertEquals("/tmp", prefs.getString("ringtone_path", "none"))
+
+        assertEquals(42, prefs.getLong("non_existing_key", 42))
+        prefs.putLong("times_launched", 130)
+        assertEquals(130, prefs.getLong("times_launched", 0))
+
+        assertEquals(true, prefs.getBoolean("non_existing_key", true))
+        assertEquals(false, prefs.getBoolean("non_existing_key", false))
+        prefs.putBoolean("show_archived", true)
+        assertEquals(true, prefs.getBoolean("show_archived", false))
+    }
+}

ios/Application/Info.plist

@@ -2,12 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>fonts/FontAwesome.ttf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Loop</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -24,6 +22,12 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>fonts/FontAwesome.ttf</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch.storyboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -34,8 +38,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>Launch.storyboard</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

ios/Application/Platform/IosDatabase.swift

@@ -100,7 +100,6 @@ class IosDatabase : NSObject, Database {
     if sql.isEmpty {
       fatalError("Provided SQL query is empty")
     }
-    log.debug(tag: "IosDatabase", msg: "Preparing: \(sql)")
     var statement : OpaquePointer?
     let result = sqlite3_prepare_v2(db, sql, -1, &statement, nil)
     if result == SQLITE_OK {

ios/uhabits.xcodeproj/project.pbxproj

@@ -253,7 +253,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
 				LastUpgradeCheck = 1010;
-				ORGANIZATIONNAME = "Loop Habit Tracker";
+				ORGANIZATIONNAME = Loop;
 				TargetAttributes = {
 					00A5B42322009F590024E00C = {
 						CreatedOnToolsVersion = 10.1;
@@ -492,6 +492,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = R5YTHGE3PS;
 				ENABLE_BITCODE = NO;
@@ -507,6 +508,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.isoron.uhabits;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = Application/BridgingHeader.h;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -517,6 +519,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = R5YTHGE3PS;
 				ENABLE_BITCODE = NO;
@@ -532,6 +535,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.isoron.uhabits;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = Application/BridgingHeader.h;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";