Merge pull request #65 from amirisback/develop/create-theme-for-keyboard

FEATURE :: Theme Keyboard

README.md

@@ -916,6 +916,25 @@ https://user-images.githubusercontent.com/24654871/231431022-4410933f-7199-4967-
 
 </table>
 
+### Multi Theme Suppported
+<table>
+
+<tr>
+    <th>Setup Theme (Light)</th>
+    <th>Theme Applied (Light)</th>
+    <th>Setup Theme (Dark)</th>
+    <th>Theme Applied (Dark)</th>
+</tr>
+
+<tr>
+    <td><img width="200px" height="420px" src="https://amirisback.github.io/keyboard/docs/image/ss/theme/light/ss-1.jpg"></td>
+    <td><img width="200px" height="420px" src="https://amirisback.github.io/keyboard/docs/image/ss/theme/light/ss-2.jpg"></td>
+    <td><img width="200px" height="420px" src="https://amirisback.github.io/keyboard/docs/image/ss/theme/dark/ss-1.jpg"></td>
+    <td><img width="200px" height="420px" src="https://amirisback.github.io/keyboard/docs/image/ss/theme/dark/ss-2.jpg"></td>
+</tr>
+
+</table>
+
 ## Documentation
 - https://github.com/SimpleMobileTools/Simple-Keyboard
   - Clone From This

app/src/main/AndroidManifest.xml

@@ -37,6 +37,10 @@
             android:name=".ui.toggle.ToggleActivity"
             android:exported="false" />
 
+        <activity
+            android:name=".ui.theme.ThemeActivity"
+            android:exported="false" />
+
         <activity android:name=".ui.language.KeyboardLanguageActivity"
             android:exported="false" />
 

app/src/main/java/com/frogobox/appkeyboard/MainApp.kt

@@ -4,13 +4,8 @@ import android.content.Context
 import android.os.Build
 import androidx.emoji2.bundled.BundledEmojiCompatConfig
 import androidx.emoji2.text.EmojiCompat
-import com.frogobox.appkeyboard.di.koin.databaseModule
-import com.frogobox.appkeyboard.di.koin.delegateModule
-import com.frogobox.appkeyboard.di.koin.repositoryModule
-import com.frogobox.appkeyboard.di.koin.viewModelModule
 import com.frogobox.sdk.FrogoKoinApplication
 import dagger.hilt.android.HiltAndroidApp
-import org.koin.core.KoinApplication
 import java.util.Locale
 
 /**
@@ -43,17 +38,6 @@ class MainApp : FrogoKoinApplication() {
 
     }
 
-    override fun setupKoinModule(koinApplication: KoinApplication) {
-        koinApplication.modules(
-            listOf(
-                delegateModule,
-                repositoryModule,
-                databaseModule,
-                viewModelModule,
-            )
-        )
-    }
-
     override fun onCreate() {
         super.onCreate()
         instance = this

app/src/main/java/com/frogobox/appkeyboard/common/ext/ContextExt.kt

@@ -1,11 +1,5 @@
 package com.frogobox.appkeyboard.common.ext
 
-import android.content.Context
-import com.frogobox.appkeyboard.util.Constant.PREF_KEYBOARD_TYPE
-import com.frogobox.appkeyboard.util.Constant.PREF_ROOT_NAME
-import com.frogobox.libkeyboard.R
-import com.frogobox.sdk.delegate.preference.PreferenceDelegatesImpl
-
 /**
  * Created by Faisal Amir on 24/10/22
  * -----------------------------------------
@@ -14,9 +8,4 @@ import com.frogobox.sdk.delegate.preference.PreferenceDelegatesImpl
  * -----------------------------------------
  * Copyright (C) Frogobox ID / amirisback
  * All rights reserved
- */
-
-fun Context.getKeyboardType(): Int {
-    val pref = PreferenceDelegatesImpl(this, PREF_ROOT_NAME)
-    return pref.loadPrefInt(PREF_KEYBOARD_TYPE, R.xml.keys_letters_qwerty)
-}
+ */

app/src/main/java/com/frogobox/appkeyboard/common/ext/ImageViewExt.kt

@@ -0,0 +1,12 @@
+package com.frogobox.appkeyboard.common.ext
+
+/**
+ * Created by faisalamircs on 16/03/2024
+ * -----------------------------------------
+ * Name     : Muhammad Faisal Amir
+ * E-mail   : [email protected]
+ * Github   : github.com/amirisback
+ * -----------------------------------------
+ */
+
+

app/src/main/java/com/frogobox/appkeyboard/data/local/autotext/AutoTextDao.kt

@@ -5,9 +5,13 @@ package com.frogobox.appkeyboard.data.local.autotext
  * https://github.com/amirisback
  */
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Update
 import com.frogobox.appkeyboard.model.AutoTextEntity
-import com.frogobox.appkeyboard.model.AutoTextLabel
+import com.frogobox.appkeyboard.model.AutoTextLabelType
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
 
@@ -42,7 +46,7 @@ interface AutoTextDao {
     fun getByTitle(search: String): Single<List<AutoTextEntity>>
 
     @Query("SELECT * FROM auto_text WHERE label = :search ORDER BY id ASC")
-    fun getByLabel(search: AutoTextLabel) : Single<List<AutoTextEntity>>
+    fun getByLabel(search: AutoTextLabelType) : Single<List<AutoTextEntity>>
 
     @Query("SELECT * FROM auto_text WHERE body LIKE '%' || :search || '%' ORDER BY id ASC")
     fun getByBody(search: String) : Single<List<AutoTextEntity>>

app/src/main/java/com/frogobox/appkeyboard/di/hilt/DatabaseModule.kt → app/src/main/java/com/frogobox/appkeyboard/di/DatabaseModule.kt

@@ -1,4 +1,4 @@
-package com.frogobox.appkeyboard.di.hilt
+package com.frogobox.appkeyboard.di
 
 import android.content.Context
 import com.frogobox.appkeyboard.data.local.autotext.AutoTextDao

app/src/main/java/com/frogobox/appkeyboard/di/hilt/NetworkModule.kt → app/src/main/java/com/frogobox/appkeyboard/di/NetworkModule.kt

@@ -1,4 +1,4 @@
-package com.frogobox.appkeyboard.di.hilt
+package com.frogobox.appkeyboard.di
 
 import dagger.Module
 import dagger.hilt.InstallIn

app/src/main/java/com/frogobox/appkeyboard/di/hilt/RepositoryModule.kt → app/src/main/java/com/frogobox/appkeyboard/di/RepositoryModule.kt

@@ -1,4 +1,4 @@
-package com.frogobox.appkeyboard.di.hilt
+package com.frogobox.appkeyboard.di
 
 import com.frogobox.appkeyboard.di.*
 import com.frogobox.appkeyboard.repository.autotext.AutoTextRepository

app/src/main/java/com/frogobox/appkeyboard/di/hilt/ServiceModule.kt → app/src/main/java/com/frogobox/appkeyboard/di/ServiceModule.kt

@@ -1,4 +1,4 @@
-package com.frogobox.appkeyboard.di.hilt
+package com.frogobox.appkeyboard.di
 
 import dagger.Module
 import dagger.hilt.InstallIn

app/src/main/java/com/frogobox/appkeyboard/di/hilt/UtilModule.kt → app/src/main/java/com/frogobox/appkeyboard/di/UtilModule.kt

@@ -1,4 +1,4 @@
-package com.frogobox.appkeyboard.di.hilt
+package com.frogobox.appkeyboard.di
 
 import android.content.Context
 import com.frogobox.appkeyboard.util.Constant.PREF_ROOT_NAME

app/src/main/java/com/frogobox/appkeyboard/model/AutoTextEntity.kt

@@ -28,7 +28,7 @@ data class AutoTextEntity(
     var title: String = "",
 
     @ColumnInfo(name = "label")
-    var label: AutoTextLabel = AutoTextLabel.USER,
+    var label: AutoTextLabelType = AutoTextLabelType.USER,
 
     @ColumnInfo(name = "date")
     var date: String = "",

app/src/main/java/com/frogobox/appkeyboard/model/AutoTextLabel.kt → app/src/main/java/com/frogobox/appkeyboard/model/AutoTextLabelType.kt

@@ -9,7 +9,7 @@ import androidx.annotation.Keep
 
 
 @Keep
-enum class AutoTextLabel {
+enum class AutoTextLabelType {
     DEFAULT,
     USER
 }

app/src/main/java/com/frogobox/appkeyboard/model/KeyboardFeature.kt → app/src/main/java/com/frogobox/appkeyboard/model/KeyboardFeatureModel.kt

@@ -8,9 +8,8 @@ import androidx.annotation.Keep
  */
 
 @Keep
-data class KeyboardFeature(
+data class KeyboardFeatureModel(
     var id: String,
-    var type: KeyboardFeatureType,
+    var text: String,
     var icon: Int,
-    var state: Boolean = false
 )

app/src/main/java/com/frogobox/appkeyboard/model/KeyboardFeatureType.kt

@@ -1,24 +1,39 @@
 package com.frogobox.appkeyboard.model
 
 import androidx.annotation.Keep
+import com.frogobox.appkeyboard.R
 
 /**
  * Created by Faisal Amir on 10/03/23
  * https://github.com/amirisback
  */
 
 @Keep
-enum class KeyboardFeatureType(val id: String, val title: String) {
-    NEWS("menu_news","News API"),
-    MOVIE("menu_movie","Movie API"),
-    WEB("menu_web","Search Website"),
-    FORM("menu_form","Form"),
-    AUTO_TEXT("menu_auto_text","Auto Text"),
-    TEMPLATE_TEXT_APP("menu_play_store_app","App Review"),
-    TEMPLATE_TEXT_GAME("menu_play_store_game","Game Review"),
-    TEMPLATE_TEXT_SALE("menu_template_text_sale","Sale Admin"),
-    TEMPLATE_TEXT_LOVE("menu_template_text_love","Love Emoji"),
-    TEMPLATE_TEXT_GREETING("menu_template_text_greeting", "Greeting"),
-    CHANGE_KEYBOARD("menu_change_keyboard","Change Keyboard"),
-    SETTING("menu_setting","Setting")
+enum class KeyboardFeatureType(val id: String, val text: String, val icon: Int) {
+    NEWS("menu_news", "News API", R.drawable.ic_menu_news),
+    MOVIE("menu_movie", "Movie API", R.drawable.ic_menu_movie),
+    WEB("menu_web", "Search Website", R.drawable.ic_menu_website),
+    FORM("menu_form", "Form", R.drawable.ic_menu_form),
+    AUTO_TEXT("menu_auto_text", "Auto Text", R.drawable.ic_menu_auto_text),
+    TEMPLATE_TEXT_APP("menu_play_store_app", "App Review", R.drawable.ic_menu_ps_app),
+    TEMPLATE_TEXT_GAME("menu_play_store_game", "Game Review", R.drawable.ic_menu_ps_game),
+    TEMPLATE_TEXT_SALE("menu_template_text_sale", "Sale Admin", R.drawable.ic_menu_ps_sale),
+    TEMPLATE_TEXT_LOVE("menu_template_text_love", "Love Emoji", R.drawable.ic_menu_ps_love),
+    TEMPLATE_TEXT_GREETING("menu_template_text_greeting", "Greeting", R.drawable.ic_menu_ps_greeting),
+    CHANGE_KEYBOARD("menu_change_keyboard", "Change Keyboard", R.drawable.ic_menu_keyboard),
+    SETTING("menu_setting", "Setting", R.drawable.ic_menu_setting);
+
+    fun mapToModel(): KeyboardFeatureModel {
+        return KeyboardFeatureModel(
+            this.id,
+            this.text,
+            this.icon
+        )
+    }
+
+    companion object {
+        infix fun from(value: String): KeyboardFeatureType =
+            entries.firstOrNull { it.id == value } ?: AUTO_TEXT
+    }
+
 }

app/src/main/java/com/frogobox/appkeyboard/model/KeyboardThemeModel.kt

@@ -0,0 +1,18 @@
+package com.frogobox.appkeyboard.model
+
+/**
+ * Created by faisalamircs on 16/03/2024
+ * -----------------------------------------
+ * Name     : Muhammad Faisal Amir
+ * E-mail   : [email protected]
+ * Github   : github.com/amirisback
+ * -----------------------------------------
+ */
+
+
+data class KeyboardThemeModel(
+    val name: String,
+    val description: String,
+    val themType: ThemeType,
+    val background: Int,
+)