fix code

Author: pokeum

README.md

@@ -2,7 +2,7 @@
 
 [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/pokeumcho)
 
-[![Generic badge](https://img.shields.io/badge/jitpack-v0.0.1-darkyellow?logo=jitpack&logoColor=white.svg)](https://jitpack.io/#pokeum/jsonviewer-xml/)
+[![Generic badge](https://img.shields.io/badge/jitpack-v0.0.2-darkyellow?logo=jitpack&logoColor=white.svg)](https://jitpack.io/#pokeum/jsonviewer-xml/)
 
 ---
 
@@ -185,12 +185,12 @@ implementation 'com.github.pokeum:jsonviewer-xml:0.0.1'
 
   ```kotlin
   recyclerView.adapter = JsonViewerAdapter(/* JsonElement */).apply {
-    setKeyColor(JVColor(/* Default Color[, Dark Mode Color] */))
-    setValueColor(JVColor(/* ... */))
-    setSplitterColor(JVColor(/* ... */))
-    setTypeColor(JVColor(/* ... */))
-    setArrowColor(JVColor(/* ... */))
-    setBracketColor(JVColor(/* ... */))
-    setDividerColor(JVColor(/* ... */))
+    setKeyColor(JsonViewerColor(/* color[, dark mode color] */))
+    setValueColor(JsonViewerColor(/* ... */))
+    setSplitterColor(JsonViewerColor(/* ... */))
+    setTypeColor(JsonViewerColor(/* ... */))
+    setArrowColor(JsonViewerColor(/* ... */))
+    setBracketColor(JsonViewerColor(/* ... */))
+    setDividerColor(JsonViewerColor(/* ... */))
   }
-  ```
+  ```

app/build.gradle

@@ -9,46 +9,45 @@ def majorNumber = 1
 def minorNumber = 1
 def patchNumber = 0
 
-def versionNameApp = "$majorNumber.$minorNumber.$patchNumber"
-def versionCodeBase = majorNumber * 100000 + minorNumber * 1000 + patchNumber * 10
-def versionCodeApp = versionCodeBase + 1
+def VERSION_NAME = "$majorNumber.$minorNumber.$patchNumber"
+def VERSION_CODE = majorNumber * 100000 + minorNumber * 1000 + patchNumber * 10
 
 android {
-    compileSdkVersion defaultCompileSdkVersion
-    buildToolsVersion defaultBuildToolsVersion
+    compileSdkVersion   COMPILE_SDK_VERSION
+    buildToolsVersion   BUILD_TOOL_VERSION
 
     defaultConfig {
-        applicationId "kr.pokeum.jsonviewer.app"
-        minSdkVersion defaultMinSdkVersion
-        targetSdkVersion defaultTargetSdkVersion
-        versionCode versionCodeApp
-        versionName versionNameApp
+        applicationId       "kr.pokeum.jsonviewer.app"
+        minSdkVersion       MIN_SDK_VERSION
+        targetSdkVersion    TARGET_SDK_VERSION
+        versionCode         VERSION_CODE
+        versionName         VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
         release {
-            keyAlias System.getenv("JSONVIEWER_KEYSTORE_ALIAS")
-            keyPassword System.getenv("JSONVIEWER_KEY_PASSWORD")
-            storeFile file(System.getenv("HOME") + "/keystore/jsonviewer_keystore.jks")
-            storePassword System.getenv("JSONVIEWER_STORE_PASSWORD")
+            keyAlias        System.getenv("JSONVIEWER_KEYSTORE_ALIAS")
+            keyPassword     System.getenv("JSONVIEWER_KEY_PASSWORD")
+            storeFile       file(System.getenv("HOME") + "/keystore/jsonviewer_keystore.jks")
+            storePassword   System.getenv("JSONVIEWER_STORE_PASSWORD")
         }
     }
     buildTypes {
         release {
-            debuggable false
-            minifyEnabled true
-            signingConfig signingConfigs.release
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            debuggable      false
+            minifyEnabled   true
+            signingConfig   signingConfigs.release
+            proguardFiles   getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility javaCompileVersion
-        targetCompatibility javaCompileVersion
+        sourceCompatibility JAVA_COMPILE_VERSION
+        targetCompatibility JAVA_COMPILE_VERSION
     }
     kotlinOptions {
-        jvmTarget = jvmTarget
+        jvmTarget = JVM_TARGET
     }
     buildFeatures {
         viewBinding true
@@ -59,7 +58,7 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
-    implementation 'com.github.pokeum:jsonviewer-xml:0.0.1'
+    implementation(project(":jsonviewer"))
 
     implementation stdlib.kotlin
     implementation androidx.core

app/src/main/java/kr/pokeum/app/util/ContextUtils.kt

@@ -2,6 +2,9 @@ package kr.pokeum.app.util
 
 import android.content.Context
 import android.net.Uri
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
@@ -79,4 +82,8 @@ fun Context.writeCacheFile(bytesToWrite: ByteArray, filename: String) {
     } catch (e: Exception) {
         e.printStackTrace()
     }
-}
+}
+
+@ColorInt
+fun Context.getColorInt(@ColorRes resourceId: Int): Int =
+    ContextCompat.getColor(this, resourceId)

build.gradle

@@ -1,13 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        javaCompileVersion          = JavaVersion.VERSION_1_8
-        jvmTarget                   = JavaVersion.VERSION_1_8.toString()
-        defaultBuildToolsVersion    = "30.0.3"
-        defaultCompileSdkVersion    = 33
-        defaultTargetSdkVersion     = 33
-        defaultMinSdkVersion        = 19
-        composeMinSdkVersion        = 21   // API level 21 or higher
+        JAVA_COMPILE_VERSION        = JavaVersion.VERSION_1_8
+        JVM_TARGET                  = JavaVersion.VERSION_1_8.toString()
+        BUILD_TOOL_VERSION          = "30.0.3"
+        COMPILE_SDK_VERSION         = 33
+        TARGET_SDK_VERSION          = 33
+        MIN_SDK_VERSION             = 19
 
         versions = [
                 androidGradlePlugin                     : "4.2.2",

jsonviewer/build.gradle

@@ -6,19 +6,20 @@ plugins {
 
 def majorNumber = 0
 def minorNumber = 0
-def patchNumber = 0
+def patchNumber = 2
 
-def versionNameSdk = "$majorNumber.$minorNumber.$patchNumber"
+def VERSION_NAME = "$majorNumber.$minorNumber.$patchNumber"
+def VERSION_CODE = majorNumber * 100000 + minorNumber * 1000 + patchNumber * 10
 
 android {
-    namespace 'kr.pokeum.jsonviewer_xml'
-    compileSdkVersion defaultCompileSdkVersion
+    namespace           "kr.pokeum.jsonviewer_xml"
+    compileSdkVersion   COMPILE_SDK_VERSION
 
     defaultConfig {
-        minSdkVersion defaultMinSdkVersion
-        targetSdkVersion defaultTargetSdkVersion
-        versionCode 1
-        versionName versionNameSdk
+        minSdkVersion       MIN_SDK_VERSION
+        targetSdkVersion    TARGET_SDK_VERSION
+        versionCode         VERSION_CODE
+        versionName         VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -39,11 +40,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility javaCompileVersion
-        targetCompatibility javaCompileVersion
+        sourceCompatibility JAVA_COMPILE_VERSION
+        targetCompatibility JAVA_COMPILE_VERSION
     }
     kotlinOptions {
-        jvmTarget = jvmTarget
+        jvmTarget = JVM_TARGET
     }
 }
 
@@ -61,9 +62,9 @@ dependencies {
 publishing {
     publications {
         release(MavenPublication) {
-            groupId = 'com.github.pokeum'
-            artifactId = 'jsonviewer-xml'
-            version = versionNameSdk
+            groupId     = "com.github.pokeum"
+            artifactId  = "jsonviewer-xml"
+            version     = VERSION_NAME
 
             afterEvaluate {
                 from components.release

jsonviewer/src/main/java/kr/pokeum/jsonviewer_xml/JsonRecyclerView.kt

@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kr.pokeum.jsonviewer_xml.adapter.JsonViewerAdapter
-import kr.pokeum.jsonviewer_xml.util.JVColor
+import kr.pokeum.jsonviewer_xml.util.JsonViewerColor
 
 @Suppress("DEPRECATION")
 class JsonRecyclerView
@@ -46,6 +46,7 @@ constructor(
         setText(text)
     }
 
+    @Suppress("MemberVisibilityCanBePrivate")
     fun setText(text: String) {
         this.text = text
 
@@ -55,13 +56,13 @@ constructor(
         } catch (_: Throwable) {
             jsonParser.parse(DEFAULT_TEXT)
         }).apply {
-            setKeyColor(JVColor(keyColor))
-            setValueColor(JVColor(valueColor))
-            setSplitterColor(JVColor(splitterColor))
-            setTypeColor(JVColor(typeColor))
-            setArrowColor(JVColor(arrowColor))
-            setBracketColor(JVColor(bracketColor))
-            setDividerColor(JVColor(dividerColor))
+            setKeyColor(JsonViewerColor(keyColor))
+            setValueColor(JsonViewerColor(valueColor))
+            setSplitterColor(JsonViewerColor(splitterColor))
+            setTypeColor(JsonViewerColor(typeColor))
+            setArrowColor(JsonViewerColor(arrowColor))
+            setBracketColor(JsonViewerColor(bracketColor))
+            setDividerColor(JsonViewerColor(dividerColor))
         }
     }
 

jsonviewer/src/main/java/kr/pokeum/jsonviewer_xml/adapter/BaseJsonViewerAdapter.kt

@@ -1,29 +1,29 @@
 package kr.pokeum.jsonviewer_xml.adapter
 
 import androidx.recyclerview.widget.RecyclerView
-import kr.pokeum.jsonviewer_xml.util.JVColor
+import kr.pokeum.jsonviewer_xml.util.JsonViewerColor
 
 abstract class BaseJsonViewerAdapter<VH : RecyclerView.ViewHolder> : RecyclerView.Adapter<VH>()
 {
 //    abstract fun expandAll()
 //    abstract fun collapseAll()
 
-    fun setKeyColor(color: JVColor) { KEY_COLOR = color }
-    fun setValueColor(color: JVColor) { VALUE_COLOR = color }
-    fun setSplitterColor(color: JVColor) { SPLITTER_COLOR = color }
-    fun setTypeColor(color: JVColor) { TYPE_COLOR = color }
-    fun setArrowColor(color: JVColor) { ARROW_COLOR = color }
-    fun setBracketColor(color: JVColor) { BRACKET_COLOR = color }
-    fun setDividerColor(color: JVColor) { DIVIDER_COLOR = color }
+    fun setKeyColor(color: JsonViewerColor) { KEY_COLOR = color }
+    fun setValueColor(color: JsonViewerColor) { VALUE_COLOR = color }
+    fun setSplitterColor(color: JsonViewerColor) { SPLITTER_COLOR = color }
+    fun setTypeColor(color: JsonViewerColor) { TYPE_COLOR = color }
+    fun setArrowColor(color: JsonViewerColor) { ARROW_COLOR = color }
+    fun setBracketColor(color: JsonViewerColor) { BRACKET_COLOR = color }
+    fun setDividerColor(color: JsonViewerColor) { DIVIDER_COLOR = color }
 
     companion object {
-        internal var KEY_COLOR          = JVColor(0xFF000000.toInt(), 0xFFFFFFFF.toInt())
-        internal var VALUE_COLOR        = JVColor(0xFF888888.toInt())
-        internal var SPLITTER_COLOR     = JVColor(0xFF000000.toInt(), 0xFFFFFFFF.toInt())
-        internal var TYPE_COLOR         = JVColor(0xFF2196F3.toInt())
-        internal var ARROW_COLOR        = JVColor(0xFFF44336.toInt())
-        internal var BRACKET_COLOR      = JVColor(0xFF4CAF50.toInt())
-        internal var DIVIDER_COLOR      = JVColor(0x1E000000.toInt(), 0x1EFFFFFF.toInt())
+        internal var KEY_COLOR          = JsonViewerColor(0xFF000000.toInt(), 0xFFFFFFFF.toInt())
+        internal var VALUE_COLOR        = JsonViewerColor(0xFF888888.toInt())
+        internal var SPLITTER_COLOR     = JsonViewerColor(0xFF000000.toInt(), 0xFFFFFFFF.toInt())
+        internal var TYPE_COLOR         = JsonViewerColor(0xFF2196F3.toInt())
+        internal var ARROW_COLOR        = JsonViewerColor(0xFFF44336.toInt())
+        internal var BRACKET_COLOR      = JsonViewerColor(0xFF4CAF50.toInt())
+        internal var DIVIDER_COLOR      = JsonViewerColor(0x1E000000.toInt(), 0x1EFFFFFF.toInt())
     }
 }
 

jsonviewer/src/main/java/kr/pokeum/jsonviewer_xml/util/StyleUtils.kt

@@ -4,14 +4,16 @@ import android.content.res.Configuration
 import android.view.View
 import androidx.annotation.ColorInt
 
-class JVColor(
-    @ColorInt private val default: Int,
-    @ColorInt private val night: Int
+data class JsonViewerColor(
+    @ColorInt private val color: Int,
+    @ColorInt private val darkModeColor: Int? = null
 ) {
-    constructor(@ColorInt default: Int) : this(default, default)
+    internal fun getColor(view: View) =
+        if (isDarkMode(view)) { darkModeColor ?: color } else { color }
 
-    internal fun getColor(view: View) = when (view.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
-        Configuration.UI_MODE_NIGHT_YES -> night
-        else -> default
-    }
+    private fun isDarkMode(view: View): Boolean =
+        when (view.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            else -> false
+        }
 }