Restructured parser hierarchy

cioccarellia · Nov 30, 2020 · ff0d085 · ff0d085
1 parent 272bedd
commit ff0d085
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 16 deletions.
diff --git a/gradle/android_bintray_config.gradle b/gradle/android_bintray_config.gradle
@@ -40,16 +40,16 @@ if (module_name == null || module_name.isEmpty()) {
 }
 
 publish {
-    bintrayUser =       BINTRAY_USER
-    userOrg =           BINTRAY_ORG
-    bintrayKey =        BINTRAY_API_KEY
+    bintrayUser = BINTRAY_USER
+    userOrg = BINTRAY_ORG
+    bintrayKey = BINTRAY_API_KEY
 
-    groupId =           library.publish_group
-    artifactId =        library.artifact
+    groupId = library.publish_group
+    artifactId = library.artifact
 
-    publishVersion =    library.publish_version
+    publishVersion = library.publish_version
 
-    desc =              library.description
-    website =           library.website
-    dryRun =            false
+    desc = library.description
+    website = library.website
+    dryRun = false
 }
diff --git a/kite/src/main/kotlin/com/cioccarellia/kite/resparser/KiteCustomResParser.kt b/kite/src/main/kotlin/com/cioccarellia/kite/resparser/KiteCustomResParser.kt
@@ -0,0 +1,21 @@
+/**
+ * Designed and developed by Andrea Cioccarelli (@cioccarellia)
+ *
+ * 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 com.cioccarellia.kite.resparser
+
+/**
+ * [KiteParser] which has precisely 1 input and 1 output
+ * */
+abstract class KiteCustomResParser<in R, out O> : KiteParser()
diff --git a/kite/src/main/kotlin/com/cioccarellia/kite/resparser/KiteResParser.kt b/kite/src/main/kotlin/com/cioccarellia/kite/resparser/KiteResParser.kt
@@ -20,5 +20,4 @@ package com.cioccarellia.kite.resparser
  * */
 abstract class KiteResParser<in R, out O> : KiteParser() {
     abstract operator fun get(resource: R): O
-    fun fetch(resource: R): O = get(resource)
 }
diff --git a/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KiteFraction.kt b/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KiteFraction.kt
@@ -19,12 +19,12 @@ package com.cioccarellia.kite.resparser.resources
 
 import androidx.annotation.FractionRes
 import androidx.annotation.IntRange
-import com.cioccarellia.kite.resparser.KiteParser
+import com.cioccarellia.kite.resparser.KiteCustomResParser
 
 /**
  * KiteFraction Implementation
  * */
-class KiteFraction : KiteParser() {
+class KiteFraction : KiteCustomResParser<@FractionRes Int, Float>() {
     operator fun get(
         @FractionRes @IntRange(from = 1) fraction: Int,
         @IntRange(from = 2) base: Int,

diff --git a/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KiteIdentifier.kt b/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KiteIdentifier.kt
@@ -17,12 +17,12 @@
 
 package com.cioccarellia.kite.resparser.resources
 
-import com.cioccarellia.kite.resparser.KiteParser
+import com.cioccarellia.kite.resparser.KiteCustomResParser
 
 /**
  * KiteIdentifier Implementation
  * */
-class KiteIdentifier : KiteParser() {
+class KiteIdentifier : KiteCustomResParser<String, Int>() {
     operator fun get(
         name: String,
         defType: String,

diff --git a/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KitePlurals.kt b/kite/src/main/kotlin/com/cioccarellia/kite/resparser/resources/KitePlurals.kt
@@ -19,12 +19,12 @@ package com.cioccarellia.kite.resparser.resources
 
 import androidx.annotation.IntRange
 import androidx.annotation.PluralsRes
-import com.cioccarellia.kite.resparser.KiteParser
+import com.cioccarellia.kite.resparser.KiteCustomResParser
 
 /**
  * KitePlurals Implementation
  * */
-class KitePlurals : KiteParser() {
+class KitePlurals : KiteCustomResParser<@PluralsRes Int, String>() {
     operator fun get(
         @PluralsRes @IntRange(from = 1) plurals: Int,
         quantity: Int