Skip to content

Commit 5ab851e

Browse files
committed
Fixed settings preference code compiler
1 parent 005c567 commit 5ab851e

File tree

12 files changed

+134
-198
lines changed

12 files changed

+134
-198
lines changed

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadAll.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadAllPref.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package devmike.jade.com.annotations.preference
22

33
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
44
@Retention(AnnotationRetention.SOURCE)
5-
annotation class ReadAll {
5+
annotation class ReadAllPref {
66
}

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadLong.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadBoolean.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadPrefBoolean.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package devmike.jade.com.annotations.preference
22

33
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
44
@Retention(AnnotationRetention.SOURCE)
5-
annotation class ReadBoolean(val key: String, val defaultValue: Boolean =false) {
5+
annotation class ReadPrefBoolean(val key: String, val defaultValue: Boolean =false) {
66
}

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadFloat.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadPrefFloat.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package devmike.jade.com.annotations.preference
22

33
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
44
@Retention(AnnotationRetention.SOURCE)
5-
annotation class ReadFloat(val key: String, val defaultValue: Float =0f) {
5+
annotation class ReadPrefFloat(val key: String, val defaultValue: Float =0f) {
66
}

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadString.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadPrefInt.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ package devmike.jade.com.annotations.preference
22

33
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
44
@Retention(AnnotationRetention.SOURCE)
5-
annotation class ReadString(val key: String,
6-
val defaultValue: String =""){
5+
annotation class ReadPrefInt(val key: String,
6+
val defaultValue: Int =0) {
77
}

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadInt.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadPrefLong.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ package devmike.jade.com.annotations.preference
22

33
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
44
@Retention(AnnotationRetention.SOURCE)
5-
annotation class ReadInt(val key: String,
6-
val defaultValue: Int =0) {
5+
annotation class ReadPrefLong(val key: String,
6+
val defaultValue: Long =0) {
77
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package devmike.jade.com.annotations.preference
2+
3+
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
4+
@Retention(AnnotationRetention.SOURCE)
5+
annotation class ReadPrefString(val key: String,
6+
val defaultValue: String =""){
7+
}

annotations/src/main/java/devmike/jade/com/annotations/preference/ReadStringSet.kt renamed to annotations/src/main/java/devmike/jade/com/annotations/preference/ReadPrefStringSet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package devmike.jade.com.annotations.preference
22
@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
33
@Retention(AnnotationRetention.SOURCE)
4-
annotation class ReadStringSet (val key: String){
4+
annotation class ReadPrefStringSet (val key: String){
55
}

app/src/main/java/devmike/jade/com/jadesharedpreference/TestClass.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package devmike.jade.com.jadesharedpreference
33
import android.content.Context
44
import devmike.jade.com.annotations.SettingsPreference
55
import devmike.jade.com.annotations.SharedPref
6+
import devmike.jade.com.annotations.preference.ReadPrefString
67
import devmike.jade.com.annotations.sharedpreference.ReadString
78
import devmike.jade.com.binder.JadeSharedPreference
89

9-
class TestClass constructor(context: Context){
10+
class TestClass constructor(context: Context){
1011

1112
var jsp: JadeSharedPreference = JadeSharedPreference.plug(this, context)
1213

13-
// @ReadString("string")
14-
val TEST_KEY: String ="test_key"
14+
@ReadPrefString("string")
15+
var TEST_KEY: String ="test_key"
1516

1617
fun init(context: Context){
1718
}

compiler/src/main/java/devmike/jade/com/compiler/AnnotationProcessor.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package devmike.jade.com.compiler
22

3-
import com.squareup.kotlinpoet.*
43
import devmike.jade.com.annotations.SettingsPreference
54
import devmike.jade.com.compiler.sharedpreference.ProcessorHelper
65
import devmike.jade.com.annotations.SharedPref
6+
import devmike.jade.com.annotations.preference.*
77
import devmike.jade.com.annotations.sharedpreference.*
88
import devmike.jade.com.compiler.preferences.PreferenceProcessorHelper
99
import java.lang.IllegalArgumentException
1010
import javax.annotation.processing.*
1111
import javax.lang.model.element.TypeElement
12-
import javax.lang.model.util.Elements
1312

1413

1514
abstract class AnnotationProcessor : AbstractProcessor() {
@@ -38,10 +37,10 @@ abstract class AnnotationProcessor : AbstractProcessor() {
3837
//Generates codes for Preference
3938
return mutableSetOf(
4039
SettingsPreference::class.java.name,
41-
devmike.jade.com.annotations.preference.ReadFloat::class.java.name, ReadInt::class.java.name,
42-
devmike.jade.com.annotations.preference.ReadString::class.java.name,
43-
devmike.jade.com.annotations.preference.ReadLong::class.java.name,
44-
devmike.jade.com.annotations.preference.ReadStringSet::class.java.name)
40+
ReadPrefFloat::class.java.name, ReadInt::class.java.name,
41+
ReadPrefString::class.java.name,
42+
ReadPrefLong::class.java.name,
43+
ReadPrefStringSet::class.java.name)
4544
}else if(prefName() == NameStore.SUFFIX_SHAREDPREF_CLASSNAME){
4645
//Generate codes for SharedPreference
4746
return mutableSetOf(

0 commit comments

Comments
 (0)