aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2020-02-23 16:03:12 -0800
committerGitHub <noreply@github.com>2020-02-23 16:03:12 -0800
commit61dddd883908a803e3ee55de537e0a30ee4ef90d (patch)
tree1c0793625b9d05c98b4d0abfccd35ffa90819094 /core/src
parent3fa13a3a84d34fd0d96f26d6c5dea0e0671dd6c4 (diff)
parent5038b93102949bb127b6cb9cb26809490739b3fa (diff)
downloadkau-61dddd883908a803e3ee55de537e0a30ee4ef90d.tar.gz
kau-61dddd883908a803e3ee55de537e0a30ee4ef90d.tar.bz2
kau-61dddd883908a803e3ee55de537e0a30ee4ef90d.zip
Merge pull request #249 from AllanWang/about-activity
About activity
Diffstat (limited to 'core/src')
-rw-r--r--core/src/androidTest/kotlin/ca/allanwang/kau/Utils.kt17
-rw-r--r--core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt2
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt2
-rw-r--r--core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt17
4 files changed, 34 insertions, 4 deletions
diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/Utils.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/Utils.kt
index 33252d6..c9d4e31 100644
--- a/core/src/androidTest/kotlin/ca/allanwang/kau/Utils.kt
+++ b/core/src/androidTest/kotlin/ca/allanwang/kau/Utils.kt
@@ -1,7 +1,22 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package ca.allanwang.kau
import android.content.Context
import androidx.test.platform.app.InstrumentationRegistry
val context: Context
- get() = InstrumentationRegistry.getInstrumentation().context \ No newline at end of file
+ get() = InstrumentationRegistry.getInstrumentation().context
diff --git a/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt b/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt
index 222f0f5..70558df 100644
--- a/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt
+++ b/core/src/androidTest/kotlin/ca/allanwang/kau/kpref/KPrefTest.kt
@@ -20,10 +20,10 @@ import android.content.SharedPreferences
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
import ca.allanwang.kau.context
+import kotlin.test.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-import kotlin.test.assertEquals
/**
* Created by Allan Wang on 2017-08-01.
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
index c17d3df..217bc6e 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefDelegate.kt
@@ -104,7 +104,7 @@ class KPrefDelegateInMemory<T> internal constructor(
private val lock = this
init {
- pref.add(this)
+ pref.add(this)
}
override fun invalidate() {
diff --git a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt
index 0c49b88..dd6da29 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/kpref/KPrefFactory.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020 Allan Wang
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package ca.allanwang.kau.kpref
import android.content.Context
@@ -19,4 +34,4 @@ class KPrefFactoryAndroid(context: Context) : KPrefFactory {
object KPrefFactoryInMemory : KPrefFactory {
override fun createBuilder(preferenceName: String): KPrefBuilder = KPrefBuilderInMemory
-} \ No newline at end of file
+}