From 50cb933fdd7ee35cbc27862d57299ca625ba44bd Mon Sep 17 00:00:00 2001
From: AhlaamK-tap <57221514+AhlaamK-tap@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:25:01 +0300
Subject: [PATCH] updated to be latest from uikit and target 34

---
 .idea/misc.xml                                |   1 -
 app/build.gradle                              |  12 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../java/company/tap/sample/MainActivity.kt   |   4 +-
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 thememanager/build.gradle                     |  12 +-
 .../company/tap/thememanager/ThemeManager.kt  | 136 +++++++++++++++---
 .../tap/thememanager/theme/ButtonTheme.kt     |   6 +-
 .../tap/thememanager/theme/TabSelectTheme.kt  |  13 ++
 .../tap/thememanager/theme/TextViewTheme.kt   |  11 +-
 11 files changed, 162 insertions(+), 41 deletions(-)
 create mode 100644 thememanager/src/main/java/company/tap/thememanager/theme/TabSelectTheme.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 999917d..60857ce 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/docs" />
diff --git a/app/build.gradle b/app/build.gradle
index 827a587..32fe67e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 34
+
     defaultConfig {
         applicationId "company.tap.sample"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,12 +25,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efb4980..f723b15 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="company.tap.sample.MainActivity">
+        <activity android:name="company.tap.sample.MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/company/tap/sample/MainActivity.kt b/app/src/main/java/company/tap/sample/MainActivity.kt
index d177744..6b0ce00 100644
--- a/app/src/main/java/company/tap/sample/MainActivity.kt
+++ b/app/src/main/java/company/tap/sample/MainActivity.kt
@@ -22,8 +22,8 @@ class MainActivity : AppCompatActivity() {
 
     private fun initAppTheme(theme: Int) {
         currentTheme = theme
-        ThemeManager.loadTapTheme(this, "https://kar-tempo.s3.ap-south-1.amazonaws.com/theme-tap.json")
-        ThemeManager.loadTapTheme(resources, theme)
+        ThemeManager.loadTapTheme(this, "https://kar-tempo.s3.ap-south-1.amazonaws.com/theme-tap.json","dark")
+        ThemeManager.loadTapTheme(resources, theme,"dark")
         val textViewTheme = TextViewTheme()
         textViewTheme.textSize = ThemeManager.getValue<Int>("textView.fontSize").toFloat()
         textViewTheme.textColor = Color.parseColor(ThemeManager.getValue("textView.fontColor"))
diff --git a/build.gradle b/build.gradle
index cb9ba6a..f7bda38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.7.0'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 64e04ce..32118f1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
diff --git a/thememanager/build.gradle b/thememanager/build.gradle
index b8b6360..c32e0af 100644
--- a/thememanager/build.gradle
+++ b/thememanager/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 34
+
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -22,12 +22,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/thememanager/src/main/java/company/tap/thememanager/ThemeManager.kt b/thememanager/src/main/java/company/tap/thememanager/ThemeManager.kt
index 215c201..9c7c52e 100644
--- a/thememanager/src/main/java/company/tap/thememanager/ThemeManager.kt
+++ b/thememanager/src/main/java/company/tap/thememanager/ThemeManager.kt
@@ -1,9 +1,14 @@
 package company.tap.thememanager
 
+
+
 import android.content.Context
 import android.content.res.Resources
+import android.util.Log
 import android.widget.Toast
+import androidx.core.text.isDigitsOnly
 import com.koushikdutta.ion.Ion
+import org.json.JSONException
 import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -12,16 +17,24 @@ import java.nio.charset.StandardCharsets
 
 /**
  *
- * Created by Mario Gamal on 4/26/20
+ * Created by Ola Monir on 25/8/20
  * Copyright © 2020 Tap Payments. All rights reserved.
  *
  */
+
+
 @Suppress("UNCHECKED_CAST")
 object ThemeManager {
 
     private lateinit var theme: JSONObject
+    private lateinit var themeString: String
+    var currentTheme: String = ""
+    var currentThemeName: String = ""
+
+    //// decide if we load json from path or assets
 
-    fun loadTapTheme(resources: Resources, resId: Int) {
+    fun loadTapTheme(resources: Resources, resId: Int, themeName: String) {
+        currentTheme = themeName
         val resourceReader = resources.openRawResource(resId)
         val writer = StringWriter()
         val reader = BufferedReader(InputStreamReader(resourceReader, StandardCharsets.UTF_8))
@@ -30,32 +43,123 @@ object ThemeManager {
             writer.write(line)
             line = reader.readLine()
         }
-        theme = JSONObject(writer.toString())
+        try {
+            themeString = writer.toString()
+            theme = JSONObject(writer.toString())
+        } catch (e: JSONException) {
+            Log.e("APP", "unexpected JSON exception", e);
+            // Do something to recover ... or kill the app.
+        }
     }
 
-    fun loadTapTheme(context: Context, url: String) {
+    fun loadTapTheme(context: Context, url: String, themeName: String) {
+
+        currentTheme = themeName
         Ion.with(context)
-                .load(url)
-                .asJsonObject()
-                .setCallback { e, result ->
-                    if (e != null) {
-                        Toast.makeText(context, e.message, Toast.LENGTH_SHORT).show()
-                    } else {
-                        theme = JSONObject(result.toString())
-                        Toast.makeText(context, result.toString(), Toast.LENGTH_SHORT).show()
+            .load(url)
+            .asJsonObject()
+            .setCallback { e, result ->
+                if (e != null) {
+                    Toast.makeText(context, e.message, Toast.LENGTH_SHORT).show()
+                } else {
+                    themeString = result.toString()
+                    theme = JSONObject(result.toString())
+                    currentTheme = url
+                    //  Toast.makeText(context, "Theme switched", Toast.LENGTH_SHORT).show()
+                }
+            }
+    }
+
+
+
+    fun  <T>  getValue(path: String): T  {
+        var result: T
+        try
+        {
+            result = valueFromJson(path)
+            if (isInteger(result.toString())){
+                return result
+            }else{
+                if(result.toString().contains("#")){ return result as T
+                }
+                else {
+                    //  Log.d("themeStringthemeString", themeString.toString())
+                    if(::themeString.isInitialized) {
+                        val jsonObject = JSONObject(themeString)
+                        val jsonObjectGlobal = jsonObject.getJSONObject("GlobalValues")
+                        val colorListObject = jsonObjectGlobal.getJSONObject("Colors")
+
+
+                        if (result.toString() in colorListObject.toString()) {
+                            return valueFromJson("GlobalValues.Colors.${result}") as T
+                        }
+                        return result
                     }
                 }
+            }
+        }catch ( e : JSONException) {
+            Log.e("APP", "unexpected JSON exception", e);
+            // Do something to recover ... or kill the app.
+        }
+        return valueFromJson(path)
     }
 
-    fun <T> getValue(path: String): T {
+
+    fun getFontName(path: String): String {
+        // get font value and split with comma and return string and float
+        var fontName: String
+        var fontValue = getValue(path) as String
+        fontName = fontValue.split(",")[0].toString()
+        return fontName
+    }
+
+    fun getFontSize(path: String): Double {
+        var fontSize: Double
+        var fontValue = (getValue(path) as Any).toString()
+        fontSize = fontValue.split(",")[1].toDouble()
+        return fontSize
+    }
+
+
+    private fun isInteger(str: String?): Boolean {
+        if (str == null) {
+            return false
+        }
+        val length = str.length
+        if (length == 0) {
+            return false
+        }
+        var i = 0
+        if (str[0] == '-') {
+            if (length == 1) {
+                return false
+            }
+            i = 1
+        }
+        while (i < length) {
+            val c = str[i]
+            if (c < '0' || c > '9') {
+                return false
+            }
+            i++
+        }
+        return true
+    }
+
+    private fun <T> valueFromJson(path: String): T {
+        var view: JSONObject? = null
         val pathComponent = path.split('.')
-        var view = theme.getJSONObject(pathComponent[0])
+        if (::theme.isInitialized) view = theme.getJSONObject(pathComponent[0])
         if (pathComponent.size > 2) {
             for (i in 1..pathComponent.size - 2) {
-                view = view.getJSONObject(pathComponent[i])
+                view = view?.getJSONObject(pathComponent[i])
             }
         }
         val valueKey = pathComponent[pathComponent.lastIndex]
-        return view.get(valueKey) as T
+        return view?.get(valueKey) as T
     }
+
+
+
+
 }
\ No newline at end of file
diff --git a/thememanager/src/main/java/company/tap/thememanager/theme/ButtonTheme.kt b/thememanager/src/main/java/company/tap/thememanager/theme/ButtonTheme.kt
index bd5b99c..86039d0 100644
--- a/thememanager/src/main/java/company/tap/thememanager/theme/ButtonTheme.kt
+++ b/thememanager/src/main/java/company/tap/thememanager/theme/ButtonTheme.kt
@@ -4,4 +4,8 @@ package company.tap.thememanager.theme
  * Created by Mario Gamal on 4/20/20
  * Copyright © 2020 Tap Payments. All rights reserved.
  */
-open class ButtonTheme : BaseTextTheme()
\ No newline at end of file
+open class ButtonTheme : BaseTextTheme(){
+    var borderWidth: Double? = null
+    var borderColor: Int? = null
+    var cornerRadius: Int? = null
+}
\ No newline at end of file
diff --git a/thememanager/src/main/java/company/tap/thememanager/theme/TabSelectTheme.kt b/thememanager/src/main/java/company/tap/thememanager/theme/TabSelectTheme.kt
new file mode 100644
index 0000000..567f7e1
--- /dev/null
+++ b/thememanager/src/main/java/company/tap/thememanager/theme/TabSelectTheme.kt
@@ -0,0 +1,13 @@
+package company.tap.thememanager.theme
+
+/**
+ * Created by AhlaamK on 8/25/20.
+
+Copyright (c) 2020    Tap Payments.
+All rights reserved.
+ **/
+open class TabSelectTheme : BaseTextTheme() {
+    var selectedBackgroundColor:Int?= null
+    var unselectedBackgroundColor:Int?= null
+}
+
diff --git a/thememanager/src/main/java/company/tap/thememanager/theme/TextViewTheme.kt b/thememanager/src/main/java/company/tap/thememanager/theme/TextViewTheme.kt
index 88ab659..97589d9 100644
--- a/thememanager/src/main/java/company/tap/thememanager/theme/TextViewTheme.kt
+++ b/thememanager/src/main/java/company/tap/thememanager/theme/TextViewTheme.kt
@@ -1,7 +1,8 @@
 package company.tap.thememanager.theme
 
-/**
- * Created by Mario Gamal on 4/20/20
- * Copyright © 2020 Tap Payments. All rights reserved.
- */
-open class TextViewTheme : BaseTextTheme()
\ No newline at end of file
+
+open class TextViewTheme : BaseTextTheme(){
+    var errorTextColor : String? = null
+    var font : String? = null
+    var placeHolderColor : String? = null
+}
\ No newline at end of file