diff --git a/build.gradle b/build.gradle index 59f4b53..647351d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.31" + ext.kotlin_version = "1.4.32" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-rc01' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "io.realm:realm-gradle-plugin:6.0.2" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/settings.gradle b/settings.gradle index c9e01a5..fe86bdb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = "Zom-Keanu3" -include ':app' +include ':zomapp',':libkeanu' +project(':libkeanu').projectDir = file('../keanuapp-android-uionly/app') \ No newline at end of file diff --git a/app/.gitignore b/zomapp/.gitignore similarity index 100% rename from app/.gitignore rename to zomapp/.gitignore diff --git a/app/build.gradle b/zomapp/build.gradle similarity index 89% rename from app/build.gradle rename to zomapp/build.gradle index 8c883f6..28d073b 100644 --- a/app/build.gradle +++ b/zomapp/build.gradle @@ -8,11 +8,11 @@ android { buildToolsVersion "30.0.3" defaultConfig { - applicationId "im.zom.keanu3" + applicationId "im.zom.messenger" minSdkVersion 21 targetSdkVersion 30 - versionCode 301001100 - versionName "3.0.1-BETA-1" + versionCode 301001300 + versionName "3.0.1-BETA-3" archivesBaseName = "Zom-$versionName" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -80,18 +80,18 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'com.gitlab.keanuapp:keanu-android-trinity-app:0.0.5.28' + implementation project (":libkeanu") + // implementation 'com.gitlab.keanuapp:keanu-android-trinity-app:0.0.5.29' } diff --git a/app/proguard-rules.pro b/zomapp/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to zomapp/proguard-rules.pro diff --git a/app/src/androidTest/java/im/zom/keanu3/ExampleInstrumentedTest.kt b/zomapp/src/androidTest/java/im/zom/keanu3/ExampleInstrumentedTest.kt similarity index 100% rename from app/src/androidTest/java/im/zom/keanu3/ExampleInstrumentedTest.kt rename to zomapp/src/androidTest/java/im/zom/keanu3/ExampleInstrumentedTest.kt diff --git a/app/src/main/AndroidManifest.xml b/zomapp/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to zomapp/src/main/AndroidManifest.xml diff --git a/app/src/main/assets/NotoSansTibetan-Regular.ttf b/zomapp/src/main/assets/NotoSansTibetan-Regular.ttf similarity index 100% rename from app/src/main/assets/NotoSansTibetan-Regular.ttf rename to zomapp/src/main/assets/NotoSansTibetan-Regular.ttf diff --git a/app/src/main/assets/servers.json b/zomapp/src/main/assets/servers.json similarity index 100% rename from app/src/main/assets/servers.json rename to zomapp/src/main/assets/servers.json diff --git a/app/src/main/assets/stickers/buddhist/butter_lamp.png b/zomapp/src/main/assets/stickers/buddhist/butter_lamp.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/butter_lamp.png rename to zomapp/src/main/assets/stickers/buddhist/butter_lamp.png diff --git a/app/src/main/assets/stickers/buddhist/mandala.png b/zomapp/src/main/assets/stickers/buddhist/mandala.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/mandala.png rename to zomapp/src/main/assets/stickers/buddhist/mandala.png diff --git a/app/src/main/assets/stickers/buddhist/meditation_cushion.png b/zomapp/src/main/assets/stickers/buddhist/meditation_cushion.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/meditation_cushion.png rename to zomapp/src/main/assets/stickers/buddhist/meditation_cushion.png diff --git a/app/src/main/assets/stickers/buddhist/prayer_flags.png b/zomapp/src/main/assets/stickers/buddhist/prayer_flags.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/prayer_flags.png rename to zomapp/src/main/assets/stickers/buddhist/prayer_flags.png diff --git a/app/src/main/assets/stickers/buddhist/prayer_wheel.png b/zomapp/src/main/assets/stickers/buddhist/prayer_wheel.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/prayer_wheel.png rename to zomapp/src/main/assets/stickers/buddhist/prayer_wheel.png diff --git a/app/src/main/assets/stickers/buddhist/singing_bowl.png b/zomapp/src/main/assets/stickers/buddhist/singing_bowl.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/singing_bowl.png rename to zomapp/src/main/assets/stickers/buddhist/singing_bowl.png diff --git a/app/src/main/assets/stickers/buddhist/stupa.png b/zomapp/src/main/assets/stickers/buddhist/stupa.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/stupa.png rename to zomapp/src/main/assets/stickers/buddhist/stupa.png diff --git a/app/src/main/assets/stickers/buddhist/thangka.png b/zomapp/src/main/assets/stickers/buddhist/thangka.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/thangka.png rename to zomapp/src/main/assets/stickers/buddhist/thangka.png diff --git a/app/src/main/assets/stickers/buddhist/the_three_jewels.png b/zomapp/src/main/assets/stickers/buddhist/the_three_jewels.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/the_three_jewels.png rename to zomapp/src/main/assets/stickers/buddhist/the_three_jewels.png diff --git a/app/src/main/assets/stickers/buddhist/trenga.png b/zomapp/src/main/assets/stickers/buddhist/trenga.png similarity index 100% rename from app/src/main/assets/stickers/buddhist/trenga.png rename to zomapp/src/main/assets/stickers/buddhist/trenga.png diff --git a/app/src/main/assets/stickers/expressions/goodnight.png b/zomapp/src/main/assets/stickers/expressions/goodnight.png similarity index 100% rename from app/src/main/assets/stickers/expressions/goodnight.png rename to zomapp/src/main/assets/stickers/expressions/goodnight.png diff --git a/app/src/main/assets/stickers/expressions/happy_birthday.png b/zomapp/src/main/assets/stickers/expressions/happy_birthday.png similarity index 100% rename from app/src/main/assets/stickers/expressions/happy_birthday.png rename to zomapp/src/main/assets/stickers/expressions/happy_birthday.png diff --git a/app/src/main/assets/stickers/expressions/i_miss_you.png b/zomapp/src/main/assets/stickers/expressions/i_miss_you.png similarity index 100% rename from app/src/main/assets/stickers/expressions/i_miss_you.png rename to zomapp/src/main/assets/stickers/expressions/i_miss_you.png diff --git a/app/src/main/assets/stickers/expressions/lared-boy-final.png b/zomapp/src/main/assets/stickers/expressions/lared-boy-final.png similarity index 100% rename from app/src/main/assets/stickers/expressions/lared-boy-final.png rename to zomapp/src/main/assets/stickers/expressions/lared-boy-final.png diff --git a/app/src/main/assets/stickers/expressions/lared-girl-final.png b/zomapp/src/main/assets/stickers/expressions/lared-girl-final.png similarity index 100% rename from app/src/main/assets/stickers/expressions/lared-girl-final.png rename to zomapp/src/main/assets/stickers/expressions/lared-girl-final.png diff --git a/app/src/main/assets/stickers/expressions/monk-ghare-final.png b/zomapp/src/main/assets/stickers/expressions/monk-ghare-final.png similarity index 100% rename from app/src/main/assets/stickers/expressions/monk-ghare-final.png rename to zomapp/src/main/assets/stickers/expressions/monk-ghare-final.png diff --git a/app/src/main/assets/stickers/expressions/tashi_delek.png b/zomapp/src/main/assets/stickers/expressions/tashi_delek.png similarity index 100% rename from app/src/main/assets/stickers/expressions/tashi_delek.png rename to zomapp/src/main/assets/stickers/expressions/tashi_delek.png diff --git a/app/src/main/assets/stickers/expressions/yak-boy-final.png b/zomapp/src/main/assets/stickers/expressions/yak-boy-final.png similarity index 100% rename from app/src/main/assets/stickers/expressions/yak-boy-final.png rename to zomapp/src/main/assets/stickers/expressions/yak-boy-final.png diff --git a/app/src/main/assets/stickers/expressions/yamtsen-dog-final.png b/zomapp/src/main/assets/stickers/expressions/yamtsen-dog-final.png similarity index 100% rename from app/src/main/assets/stickers/expressions/yamtsen-dog-final.png rename to zomapp/src/main/assets/stickers/expressions/yamtsen-dog-final.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_01.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_01.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_01.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_01.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_02.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_02.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_02.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_02.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_03.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_03.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_03.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_03.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_04.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_04.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_04.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_04.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_05.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_05.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_05.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_05.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_06.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_06.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_06.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_06.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_07.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_07.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_07.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_07.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_08.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_08.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_08.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_08.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_09.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_09.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_09.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_09.png diff --git a/app/src/main/assets/stickers/expressions/zom_ex1_10.png b/zomapp/src/main/assets/stickers/expressions/zom_ex1_10.png similarity index 100% rename from app/src/main/assets/stickers/expressions/zom_ex1_10.png rename to zomapp/src/main/assets/stickers/expressions/zom_ex1_10.png diff --git a/app/src/main/assets/stickers/losar/dreka-b.png b/zomapp/src/main/assets/stickers/losar/dreka-b.png similarity index 100% rename from app/src/main/assets/stickers/losar/dreka-b.png rename to zomapp/src/main/assets/stickers/losar/dreka-b.png diff --git a/app/src/main/assets/stickers/losar/dresil-losar-b.png b/zomapp/src/main/assets/stickers/losar/dresil-losar-b.png similarity index 100% rename from app/src/main/assets/stickers/losar/dresil-losar-b.png rename to zomapp/src/main/assets/stickers/losar/dresil-losar-b.png diff --git a/app/src/main/assets/stickers/losar/dresil-losar-recipe.png b/zomapp/src/main/assets/stickers/losar/dresil-losar-recipe.png similarity index 100% rename from app/src/main/assets/stickers/losar/dresil-losar-recipe.png rename to zomapp/src/main/assets/stickers/losar/dresil-losar-recipe.png diff --git a/app/src/main/assets/stickers/losar/guthuk-b.png b/zomapp/src/main/assets/stickers/losar/guthuk-b.png similarity index 100% rename from app/src/main/assets/stickers/losar/guthuk-b.png rename to zomapp/src/main/assets/stickers/losar/guthuk-b.png diff --git a/app/src/main/assets/stickers/losar/guthuk.png b/zomapp/src/main/assets/stickers/losar/guthuk.png similarity index 100% rename from app/src/main/assets/stickers/losar/guthuk.png rename to zomapp/src/main/assets/stickers/losar/guthuk.png diff --git a/app/src/main/assets/stickers/losar/home-offering.png b/zomapp/src/main/assets/stickers/losar/home-offering.png similarity index 100% rename from app/src/main/assets/stickers/losar/home-offering.png rename to zomapp/src/main/assets/stickers/losar/home-offering.png diff --git a/app/src/main/assets/stickers/losar/khabsay-dog.png b/zomapp/src/main/assets/stickers/losar/khabsay-dog.png similarity index 100% rename from app/src/main/assets/stickers/losar/khabsay-dog.png rename to zomapp/src/main/assets/stickers/losar/khabsay-dog.png diff --git a/app/src/main/assets/stickers/losar/khabsay.png b/zomapp/src/main/assets/stickers/losar/khabsay.png similarity index 100% rename from app/src/main/assets/stickers/losar/khabsay.png rename to zomapp/src/main/assets/stickers/losar/khabsay.png diff --git a/app/src/main/assets/stickers/losar/khabsey.png b/zomapp/src/main/assets/stickers/losar/khabsey.png similarity index 100% rename from app/src/main/assets/stickers/losar/khabsey.png rename to zomapp/src/main/assets/stickers/losar/khabsey.png diff --git a/app/src/main/assets/stickers/losar/lha_gyalo.png b/zomapp/src/main/assets/stickers/losar/lha_gyalo.png similarity index 100% rename from app/src/main/assets/stickers/losar/lha_gyalo.png rename to zomapp/src/main/assets/stickers/losar/lha_gyalo.png diff --git a/app/src/main/assets/stickers/losar/losar-greeting-yak.png b/zomapp/src/main/assets/stickers/losar/losar-greeting-yak.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-greeting-yak.png rename to zomapp/src/main/assets/stickers/losar/losar-greeting-yak.png diff --git a/app/src/main/assets/stickers/losar/losar-ox-couple.png b/zomapp/src/main/assets/stickers/losar/losar-ox-couple.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-ox-couple.png rename to zomapp/src/main/assets/stickers/losar/losar-ox-couple.png diff --git a/app/src/main/assets/stickers/losar/losar-ox-dance.png b/zomapp/src/main/assets/stickers/losar/losar-ox-dance.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-ox-dance.png rename to zomapp/src/main/assets/stickers/losar/losar-ox-dance.png diff --git a/app/src/main/assets/stickers/losar/losar-ox-female.png b/zomapp/src/main/assets/stickers/losar/losar-ox-female.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-ox-female.png rename to zomapp/src/main/assets/stickers/losar/losar-ox-female.png diff --git a/app/src/main/assets/stickers/losar/losar-ox-male.png b/zomapp/src/main/assets/stickers/losar/losar-ox-male.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-ox-male.png rename to zomapp/src/main/assets/stickers/losar/losar-ox-male.png diff --git a/app/src/main/assets/stickers/losar/losar-ox-year.png b/zomapp/src/main/assets/stickers/losar/losar-ox-year.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-ox-year.png rename to zomapp/src/main/assets/stickers/losar/losar-ox-year.png diff --git a/app/src/main/assets/stickers/losar/losar-wood-ox-float.png b/zomapp/src/main/assets/stickers/losar/losar-wood-ox-float.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-wood-ox-float.png rename to zomapp/src/main/assets/stickers/losar/losar-wood-ox-float.png diff --git a/app/src/main/assets/stickers/losar/losar-yak-greeting.png b/zomapp/src/main/assets/stickers/losar/losar-yak-greeting.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar-yak-greeting.png rename to zomapp/src/main/assets/stickers/losar/losar-yak-greeting.png diff --git a/app/src/main/assets/stickers/losar/losar_tashi_delek.png b/zomapp/src/main/assets/stickers/losar/losar_tashi_delek.png similarity index 100% rename from app/src/main/assets/stickers/losar/losar_tashi_delek.png rename to zomapp/src/main/assets/stickers/losar/losar_tashi_delek.png diff --git a/app/src/main/assets/stickers/losar/shaptak.png b/zomapp/src/main/assets/stickers/losar/shaptak.png similarity index 100% rename from app/src/main/assets/stickers/losar/shaptak.png rename to zomapp/src/main/assets/stickers/losar/shaptak.png diff --git a/app/src/main/assets/stickers/olo and shimi/10shhh.png b/zomapp/src/main/assets/stickers/olo and shimi/10shhh.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/10shhh.png rename to zomapp/src/main/assets/stickers/olo and shimi/10shhh.png diff --git a/app/src/main/assets/stickers/olo and shimi/11flowers.png b/zomapp/src/main/assets/stickers/olo and shimi/11flowers.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/11flowers.png rename to zomapp/src/main/assets/stickers/olo and shimi/11flowers.png diff --git a/app/src/main/assets/stickers/olo and shimi/12music.png b/zomapp/src/main/assets/stickers/olo and shimi/12music.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/12music.png rename to zomapp/src/main/assets/stickers/olo and shimi/12music.png diff --git a/app/src/main/assets/stickers/olo and shimi/13relax.png b/zomapp/src/main/assets/stickers/olo and shimi/13relax.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/13relax.png rename to zomapp/src/main/assets/stickers/olo and shimi/13relax.png diff --git a/app/src/main/assets/stickers/olo and shimi/14eating.png b/zomapp/src/main/assets/stickers/olo and shimi/14eating.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/14eating.png rename to zomapp/src/main/assets/stickers/olo and shimi/14eating.png diff --git a/app/src/main/assets/stickers/olo and shimi/15biscuit.png b/zomapp/src/main/assets/stickers/olo and shimi/15biscuit.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/15biscuit.png rename to zomapp/src/main/assets/stickers/olo and shimi/15biscuit.png diff --git a/app/src/main/assets/stickers/olo and shimi/1thinking.png b/zomapp/src/main/assets/stickers/olo and shimi/1thinking.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/1thinking.png rename to zomapp/src/main/assets/stickers/olo and shimi/1thinking.png diff --git a/app/src/main/assets/stickers/olo and shimi/2bored.png b/zomapp/src/main/assets/stickers/olo and shimi/2bored.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/2bored.png rename to zomapp/src/main/assets/stickers/olo and shimi/2bored.png diff --git a/app/src/main/assets/stickers/olo and shimi/3scared.png b/zomapp/src/main/assets/stickers/olo and shimi/3scared.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/3scared.png rename to zomapp/src/main/assets/stickers/olo and shimi/3scared.png diff --git a/app/src/main/assets/stickers/olo and shimi/4greeting.png b/zomapp/src/main/assets/stickers/olo and shimi/4greeting.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/4greeting.png rename to zomapp/src/main/assets/stickers/olo and shimi/4greeting.png diff --git a/app/src/main/assets/stickers/olo and shimi/5hearts.png b/zomapp/src/main/assets/stickers/olo and shimi/5hearts.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/5hearts.png rename to zomapp/src/main/assets/stickers/olo and shimi/5hearts.png diff --git a/app/src/main/assets/stickers/olo and shimi/6yay.png b/zomapp/src/main/assets/stickers/olo and shimi/6yay.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/6yay.png rename to zomapp/src/main/assets/stickers/olo and shimi/6yay.png diff --git a/app/src/main/assets/stickers/olo and shimi/7upset.png b/zomapp/src/main/assets/stickers/olo and shimi/7upset.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/7upset.png rename to zomapp/src/main/assets/stickers/olo and shimi/7upset.png diff --git a/app/src/main/assets/stickers/olo and shimi/8crying.png b/zomapp/src/main/assets/stickers/olo and shimi/8crying.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/8crying.png rename to zomapp/src/main/assets/stickers/olo and shimi/8crying.png diff --git a/app/src/main/assets/stickers/olo and shimi/9dancing.png b/zomapp/src/main/assets/stickers/olo and shimi/9dancing.png similarity index 100% rename from app/src/main/assets/stickers/olo and shimi/9dancing.png rename to zomapp/src/main/assets/stickers/olo and shimi/9dancing.png diff --git a/app/src/main/assets/stickers/pema/goodmorning.png b/zomapp/src/main/assets/stickers/pema/goodmorning.png similarity index 100% rename from app/src/main/assets/stickers/pema/goodmorning.png rename to zomapp/src/main/assets/stickers/pema/goodmorning.png diff --git a/app/src/main/assets/stickers/pema/om-mani.png b/zomapp/src/main/assets/stickers/pema/om-mani.png similarity index 100% rename from app/src/main/assets/stickers/pema/om-mani.png rename to zomapp/src/main/assets/stickers/pema/om-mani.png diff --git a/app/src/main/assets/stickers/pema/pema01.png b/zomapp/src/main/assets/stickers/pema/pema01.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema01.png rename to zomapp/src/main/assets/stickers/pema/pema01.png diff --git a/app/src/main/assets/stickers/pema/pema02.png b/zomapp/src/main/assets/stickers/pema/pema02.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema02.png rename to zomapp/src/main/assets/stickers/pema/pema02.png diff --git a/app/src/main/assets/stickers/pema/pema03.png b/zomapp/src/main/assets/stickers/pema/pema03.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema03.png rename to zomapp/src/main/assets/stickers/pema/pema03.png diff --git a/app/src/main/assets/stickers/pema/pema04.png b/zomapp/src/main/assets/stickers/pema/pema04.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema04.png rename to zomapp/src/main/assets/stickers/pema/pema04.png diff --git a/app/src/main/assets/stickers/pema/pema05.png b/zomapp/src/main/assets/stickers/pema/pema05.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema05.png rename to zomapp/src/main/assets/stickers/pema/pema05.png diff --git a/app/src/main/assets/stickers/pema/pema06.png b/zomapp/src/main/assets/stickers/pema/pema06.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema06.png rename to zomapp/src/main/assets/stickers/pema/pema06.png diff --git a/app/src/main/assets/stickers/pema/pema07.png b/zomapp/src/main/assets/stickers/pema/pema07.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema07.png rename to zomapp/src/main/assets/stickers/pema/pema07.png diff --git a/app/src/main/assets/stickers/pema/pema08.png b/zomapp/src/main/assets/stickers/pema/pema08.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema08.png rename to zomapp/src/main/assets/stickers/pema/pema08.png diff --git a/app/src/main/assets/stickers/pema/pema09.png b/zomapp/src/main/assets/stickers/pema/pema09.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema09.png rename to zomapp/src/main/assets/stickers/pema/pema09.png diff --git a/app/src/main/assets/stickers/pema/pema10.png b/zomapp/src/main/assets/stickers/pema/pema10.png similarity index 100% rename from app/src/main/assets/stickers/pema/pema10.png rename to zomapp/src/main/assets/stickers/pema/pema10.png diff --git a/app/src/main/assets/stickers/sindu/Hello.png b/zomapp/src/main/assets/stickers/sindu/Hello.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Hello.png rename to zomapp/src/main/assets/stickers/sindu/Hello.png diff --git a/app/src/main/assets/stickers/sindu/Howl.png b/zomapp/src/main/assets/stickers/sindu/Howl.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Howl.png rename to zomapp/src/main/assets/stickers/sindu/Howl.png diff --git a/app/src/main/assets/stickers/sindu/Lets Play.png b/zomapp/src/main/assets/stickers/sindu/Lets Play.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Lets Play.png rename to zomapp/src/main/assets/stickers/sindu/Lets Play.png diff --git a/app/src/main/assets/stickers/sindu/Puppy Love.png b/zomapp/src/main/assets/stickers/sindu/Puppy Love.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Puppy Love.png rename to zomapp/src/main/assets/stickers/sindu/Puppy Love.png diff --git a/app/src/main/assets/stickers/sindu/Sleeping.png b/zomapp/src/main/assets/stickers/sindu/Sleeping.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Sleeping.png rename to zomapp/src/main/assets/stickers/sindu/Sleeping.png diff --git a/app/src/main/assets/stickers/sindu/Woof.png b/zomapp/src/main/assets/stickers/sindu/Woof.png similarity index 100% rename from app/src/main/assets/stickers/sindu/Woof.png rename to zomapp/src/main/assets/stickers/sindu/Woof.png diff --git a/app/src/main/assets/stickers/sindu/play-mud.png b/zomapp/src/main/assets/stickers/sindu/play-mud.png similarity index 100% rename from app/src/main/assets/stickers/sindu/play-mud.png rename to zomapp/src/main/assets/stickers/sindu/play-mud.png diff --git a/app/src/main/assets/stickers/sindu/play.png b/zomapp/src/main/assets/stickers/sindu/play.png similarity index 100% rename from app/src/main/assets/stickers/sindu/play.png rename to zomapp/src/main/assets/stickers/sindu/play.png diff --git a/app/src/main/assets/stickers/sindu/scarf.png b/zomapp/src/main/assets/stickers/sindu/scarf.png similarity index 100% rename from app/src/main/assets/stickers/sindu/scarf.png rename to zomapp/src/main/assets/stickers/sindu/scarf.png diff --git a/app/src/main/assets/stickers/sindu/tashi-delek.png b/zomapp/src/main/assets/stickers/sindu/tashi-delek.png similarity index 100% rename from app/src/main/assets/stickers/sindu/tashi-delek.png rename to zomapp/src/main/assets/stickers/sindu/tashi-delek.png diff --git a/app/src/main/assets/stickers/tiboji/ButterTea.png b/zomapp/src/main/assets/stickers/tiboji/ButterTea.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/ButterTea.png rename to zomapp/src/main/assets/stickers/tiboji/ButterTea.png diff --git a/app/src/main/assets/stickers/tiboji/Om.png b/zomapp/src/main/assets/stickers/tiboji/Om.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/Om.png rename to zomapp/src/main/assets/stickers/tiboji/Om.png diff --git a/app/src/main/assets/stickers/tiboji/PrayerHands.png b/zomapp/src/main/assets/stickers/tiboji/PrayerHands.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/PrayerHands.png rename to zomapp/src/main/assets/stickers/tiboji/PrayerHands.png diff --git a/app/src/main/assets/stickers/tiboji/Prostration.png b/zomapp/src/main/assets/stickers/tiboji/Prostration.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/Prostration.png rename to zomapp/src/main/assets/stickers/tiboji/Prostration.png diff --git a/app/src/main/assets/stickers/tiboji/TibetanPrayerWheel.png b/zomapp/src/main/assets/stickers/tiboji/TibetanPrayerWheel.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/TibetanPrayerWheel.png rename to zomapp/src/main/assets/stickers/tiboji/TibetanPrayerWheel.png diff --git a/app/src/main/assets/stickers/tiboji/Yak.png b/zomapp/src/main/assets/stickers/tiboji/Yak.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/Yak.png rename to zomapp/src/main/assets/stickers/tiboji/Yak.png diff --git a/app/src/main/assets/stickers/tiboji/agu_denpa_avatar.png b/zomapp/src/main/assets/stickers/tiboji/agu_denpa_avatar.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/agu_denpa_avatar.png rename to zomapp/src/main/assets/stickers/tiboji/agu_denpa_avatar.png diff --git a/app/src/main/assets/stickers/tiboji/butter-lamp.png b/zomapp/src/main/assets/stickers/tiboji/butter-lamp.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/butter-lamp.png rename to zomapp/src/main/assets/stickers/tiboji/butter-lamp.png diff --git a/app/src/main/assets/stickers/tiboji/khata.png b/zomapp/src/main/assets/stickers/tiboji/khata.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/khata.png rename to zomapp/src/main/assets/stickers/tiboji/khata.png diff --git a/app/src/main/assets/stickers/tiboji/monkdebate.png b/zomapp/src/main/assets/stickers/tiboji/monkdebate.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/monkdebate.png rename to zomapp/src/main/assets/stickers/tiboji/monkdebate.png diff --git a/app/src/main/assets/stickers/tiboji/shabhaley.png b/zomapp/src/main/assets/stickers/tiboji/shabhaley.png similarity index 100% rename from app/src/main/assets/stickers/tiboji/shabhaley.png rename to zomapp/src/main/assets/stickers/tiboji/shabhaley.png diff --git a/app/src/main/assets/stickers/topgyal/Bemused.png b/zomapp/src/main/assets/stickers/topgyal/Bemused.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Bemused.png rename to zomapp/src/main/assets/stickers/topgyal/Bemused.png diff --git a/app/src/main/assets/stickers/topgyal/Bite.png b/zomapp/src/main/assets/stickers/topgyal/Bite.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Bite.png rename to zomapp/src/main/assets/stickers/topgyal/Bite.png diff --git a/app/src/main/assets/stickers/topgyal/Cold.png b/zomapp/src/main/assets/stickers/topgyal/Cold.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Cold.png rename to zomapp/src/main/assets/stickers/topgyal/Cold.png diff --git a/app/src/main/assets/stickers/topgyal/Flowers.png b/zomapp/src/main/assets/stickers/topgyal/Flowers.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Flowers.png rename to zomapp/src/main/assets/stickers/topgyal/Flowers.png diff --git a/app/src/main/assets/stickers/topgyal/Love.png b/zomapp/src/main/assets/stickers/topgyal/Love.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Love.png rename to zomapp/src/main/assets/stickers/topgyal/Love.png diff --git a/app/src/main/assets/stickers/topgyal/Mad.png b/zomapp/src/main/assets/stickers/topgyal/Mad.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Mad.png rename to zomapp/src/main/assets/stickers/topgyal/Mad.png diff --git a/app/src/main/assets/stickers/topgyal/Music.png b/zomapp/src/main/assets/stickers/topgyal/Music.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Music.png rename to zomapp/src/main/assets/stickers/topgyal/Music.png diff --git a/app/src/main/assets/stickers/topgyal/Sad.png b/zomapp/src/main/assets/stickers/topgyal/Sad.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Sad.png rename to zomapp/src/main/assets/stickers/topgyal/Sad.png diff --git a/app/src/main/assets/stickers/topgyal/Singing.png b/zomapp/src/main/assets/stickers/topgyal/Singing.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Singing.png rename to zomapp/src/main/assets/stickers/topgyal/Singing.png diff --git a/app/src/main/assets/stickers/topgyal/Thinking.png b/zomapp/src/main/assets/stickers/topgyal/Thinking.png similarity index 100% rename from app/src/main/assets/stickers/topgyal/Thinking.png rename to zomapp/src/main/assets/stickers/topgyal/Thinking.png diff --git a/app/src/main/assets/stickers/training/confused-2.png b/zomapp/src/main/assets/stickers/training/confused-2.png similarity index 100% rename from app/src/main/assets/stickers/training/confused-2.png rename to zomapp/src/main/assets/stickers/training/confused-2.png diff --git a/app/src/main/assets/stickers/training/confused.png b/zomapp/src/main/assets/stickers/training/confused.png similarity index 100% rename from app/src/main/assets/stickers/training/confused.png rename to zomapp/src/main/assets/stickers/training/confused.png diff --git a/app/src/main/assets/stickers/training/disagree.png b/zomapp/src/main/assets/stickers/training/disagree.png similarity index 100% rename from app/src/main/assets/stickers/training/disagree.png rename to zomapp/src/main/assets/stickers/training/disagree.png diff --git a/app/src/main/assets/stickers/training/i-agree.png b/zomapp/src/main/assets/stickers/training/i-agree.png similarity index 100% rename from app/src/main/assets/stickers/training/i-agree.png rename to zomapp/src/main/assets/stickers/training/i-agree.png diff --git a/app/src/main/assets/stickers/training/i-am-here.png b/zomapp/src/main/assets/stickers/training/i-am-here.png similarity index 100% rename from app/src/main/assets/stickers/training/i-am-here.png rename to zomapp/src/main/assets/stickers/training/i-am-here.png diff --git a/app/src/main/assets/stickers/training/i-cannot-hear.png b/zomapp/src/main/assets/stickers/training/i-cannot-hear.png similarity index 100% rename from app/src/main/assets/stickers/training/i-cannot-hear.png rename to zomapp/src/main/assets/stickers/training/i-cannot-hear.png diff --git a/app/src/main/assets/stickers/training/i-understand.png b/zomapp/src/main/assets/stickers/training/i-understand.png similarity index 100% rename from app/src/main/assets/stickers/training/i-understand.png rename to zomapp/src/main/assets/stickers/training/i-understand.png diff --git a/app/src/main/assets/stickers/training/intense-discussion.png b/zomapp/src/main/assets/stickers/training/intense-discussion.png similarity index 100% rename from app/src/main/assets/stickers/training/intense-discussion.png rename to zomapp/src/main/assets/stickers/training/intense-discussion.png diff --git a/app/src/main/assets/stickers/training/interesting.png b/zomapp/src/main/assets/stickers/training/interesting.png similarity index 100% rename from app/src/main/assets/stickers/training/interesting.png rename to zomapp/src/main/assets/stickers/training/interesting.png diff --git a/app/src/main/assets/stickers/training/raise-hand.png b/zomapp/src/main/assets/stickers/training/raise-hand.png similarity index 100% rename from app/src/main/assets/stickers/training/raise-hand.png rename to zomapp/src/main/assets/stickers/training/raise-hand.png diff --git a/app/src/main/assets/stickers/training/thank-you.png b/zomapp/src/main/assets/stickers/training/thank-you.png similarity index 100% rename from app/src/main/assets/stickers/training/thank-you.png rename to zomapp/src/main/assets/stickers/training/thank-you.png diff --git a/app/src/main/assets/stickers/training/well-done.png b/zomapp/src/main/assets/stickers/training/well-done.png similarity index 100% rename from app/src/main/assets/stickers/training/well-done.png rename to zomapp/src/main/assets/stickers/training/well-done.png diff --git a/app/src/main/assets/stickers/zomkyi/10_zomkyi_jumpinghappy.png b/zomapp/src/main/assets/stickers/zomkyi/10_zomkyi_jumpinghappy.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/10_zomkyi_jumpinghappy.png rename to zomapp/src/main/assets/stickers/zomkyi/10_zomkyi_jumpinghappy.png diff --git a/app/src/main/assets/stickers/zomkyi/11_zomkyi_goodjob.png b/zomapp/src/main/assets/stickers/zomkyi/11_zomkyi_goodjob.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/11_zomkyi_goodjob.png rename to zomapp/src/main/assets/stickers/zomkyi/11_zomkyi_goodjob.png diff --git a/app/src/main/assets/stickers/zomkyi/12_zomkyi_petsdog.png b/zomapp/src/main/assets/stickers/zomkyi/12_zomkyi_petsdog.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/12_zomkyi_petsdog.png rename to zomapp/src/main/assets/stickers/zomkyi/12_zomkyi_petsdog.png diff --git a/app/src/main/assets/stickers/zomkyi/14_zomkyi_sickandsad.png b/zomapp/src/main/assets/stickers/zomkyi/14_zomkyi_sickandsad.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/14_zomkyi_sickandsad.png rename to zomapp/src/main/assets/stickers/zomkyi/14_zomkyi_sickandsad.png diff --git a/app/src/main/assets/stickers/zomkyi/15_zomkyi_dog.png b/zomapp/src/main/assets/stickers/zomkyi/15_zomkyi_dog.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/15_zomkyi_dog.png rename to zomapp/src/main/assets/stickers/zomkyi/15_zomkyi_dog.png diff --git a/app/src/main/assets/stickers/zomkyi/16_zomkyi_sick.png b/zomapp/src/main/assets/stickers/zomkyi/16_zomkyi_sick.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/16_zomkyi_sick.png rename to zomapp/src/main/assets/stickers/zomkyi/16_zomkyi_sick.png diff --git a/app/src/main/assets/stickers/zomkyi/17_zomkyi_thinking.png b/zomapp/src/main/assets/stickers/zomkyi/17_zomkyi_thinking.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/17_zomkyi_thinking.png rename to zomapp/src/main/assets/stickers/zomkyi/17_zomkyi_thinking.png diff --git a/app/src/main/assets/stickers/zomkyi/18_zomkyi_cryingagain.png b/zomapp/src/main/assets/stickers/zomkyi/18_zomkyi_cryingagain.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/18_zomkyi_cryingagain.png rename to zomapp/src/main/assets/stickers/zomkyi/18_zomkyi_cryingagain.png diff --git a/app/src/main/assets/stickers/zomkyi/19_zomkyi_clapping.png b/zomapp/src/main/assets/stickers/zomkyi/19_zomkyi_clapping.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/19_zomkyi_clapping.png rename to zomapp/src/main/assets/stickers/zomkyi/19_zomkyi_clapping.png diff --git a/app/src/main/assets/stickers/zomkyi/1_zomkyi_dancing.png b/zomapp/src/main/assets/stickers/zomkyi/1_zomkyi_dancing.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/1_zomkyi_dancing.png rename to zomapp/src/main/assets/stickers/zomkyi/1_zomkyi_dancing.png diff --git a/app/src/main/assets/stickers/zomkyi/20_zomkyi_heat.png b/zomapp/src/main/assets/stickers/zomkyi/20_zomkyi_heat.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/20_zomkyi_heat.png rename to zomapp/src/main/assets/stickers/zomkyi/20_zomkyi_heat.png diff --git a/app/src/main/assets/stickers/zomkyi/2_zomkyi_hooray.png b/zomapp/src/main/assets/stickers/zomkyi/2_zomkyi_hooray.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/2_zomkyi_hooray.png rename to zomapp/src/main/assets/stickers/zomkyi/2_zomkyi_hooray.png diff --git a/app/src/main/assets/stickers/zomkyi/4_zomkyi_praying.png b/zomapp/src/main/assets/stickers/zomkyi/4_zomkyi_praying.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/4_zomkyi_praying.png rename to zomapp/src/main/assets/stickers/zomkyi/4_zomkyi_praying.png diff --git a/app/src/main/assets/stickers/zomkyi/5_zomkyi_heart.png b/zomapp/src/main/assets/stickers/zomkyi/5_zomkyi_heart.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/5_zomkyi_heart.png rename to zomapp/src/main/assets/stickers/zomkyi/5_zomkyi_heart.png diff --git a/app/src/main/assets/stickers/zomkyi/6_zomkyi_tongue.png b/zomapp/src/main/assets/stickers/zomkyi/6_zomkyi_tongue.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/6_zomkyi_tongue.png rename to zomapp/src/main/assets/stickers/zomkyi/6_zomkyi_tongue.png diff --git a/app/src/main/assets/stickers/zomkyi/7_zomkyi_yo.png b/zomapp/src/main/assets/stickers/zomkyi/7_zomkyi_yo.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/7_zomkyi_yo.png rename to zomapp/src/main/assets/stickers/zomkyi/7_zomkyi_yo.png diff --git a/app/src/main/assets/stickers/zomkyi/8_zomkyi_notondiet.png b/zomapp/src/main/assets/stickers/zomkyi/8_zomkyi_notondiet.png similarity index 100% rename from app/src/main/assets/stickers/zomkyi/8_zomkyi_notondiet.png rename to zomapp/src/main/assets/stickers/zomkyi/8_zomkyi_notondiet.png diff --git a/app/src/main/ic_launcher-playstore.png b/zomapp/src/main/ic_launcher-playstore.png similarity index 100% rename from app/src/main/ic_launcher-playstore.png rename to zomapp/src/main/ic_launcher-playstore.png diff --git a/app/src/main/res/drawable-hdpi/app_notify.png b/zomapp/src/main/res/drawable-hdpi/app_notify.png similarity index 100% rename from app/src/main/res/drawable-hdpi/app_notify.png rename to zomapp/src/main/res/drawable-hdpi/app_notify.png diff --git a/app/src/main/res/drawable-hdpi/notify_app.png b/zomapp/src/main/res/drawable-hdpi/notify_app.png similarity index 100% rename from app/src/main/res/drawable-hdpi/notify_app.png rename to zomapp/src/main/res/drawable-hdpi/notify_app.png diff --git a/app/src/main/res/drawable-mdpi/app_notify.png b/zomapp/src/main/res/drawable-mdpi/app_notify.png similarity index 100% rename from app/src/main/res/drawable-mdpi/app_notify.png rename to zomapp/src/main/res/drawable-mdpi/app_notify.png diff --git a/app/src/main/res/drawable-mdpi/notify_app.png b/zomapp/src/main/res/drawable-mdpi/notify_app.png similarity index 100% rename from app/src/main/res/drawable-mdpi/notify_app.png rename to zomapp/src/main/res/drawable-mdpi/notify_app.png diff --git a/app/src/main/res/drawable-v24/notify_app.png b/zomapp/src/main/res/drawable-v24/notify_app.png similarity index 100% rename from app/src/main/res/drawable-v24/notify_app.png rename to zomapp/src/main/res/drawable-v24/notify_app.png diff --git a/app/src/main/res/drawable-xhdpi/app_notify.png b/zomapp/src/main/res/drawable-xhdpi/app_notify.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/app_notify.png rename to zomapp/src/main/res/drawable-xhdpi/app_notify.png diff --git a/app/src/main/res/drawable-xhdpi/notify_app.png b/zomapp/src/main/res/drawable-xhdpi/notify_app.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/notify_app.png rename to zomapp/src/main/res/drawable-xhdpi/notify_app.png diff --git a/app/src/main/res/drawable-xxhdpi/app_notify.png b/zomapp/src/main/res/drawable-xxhdpi/app_notify.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/app_notify.png rename to zomapp/src/main/res/drawable-xxhdpi/app_notify.png diff --git a/app/src/main/res/drawable-xxhdpi/notify_app.png b/zomapp/src/main/res/drawable-xxhdpi/notify_app.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/notify_app.png rename to zomapp/src/main/res/drawable-xxhdpi/notify_app.png diff --git a/app/src/main/res/drawable-xxxhdpi/app_notify.png b/zomapp/src/main/res/drawable-xxxhdpi/app_notify.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/app_notify.png rename to zomapp/src/main/res/drawable-xxxhdpi/app_notify.png diff --git a/app/src/main/res/drawable/add_friends.png b/zomapp/src/main/res/drawable/add_friends.png similarity index 100% rename from app/src/main/res/drawable/add_friends.png rename to zomapp/src/main/res/drawable/add_friends.png diff --git a/app/src/main/res/drawable/bot_agu_denpa.png b/zomapp/src/main/res/drawable/bot_agu_denpa.png similarity index 100% rename from app/src/main/res/drawable/bot_agu_denpa.png rename to zomapp/src/main/res/drawable/bot_agu_denpa.png diff --git a/app/src/main/res/drawable/bot_agu_denpa_avatar.png b/zomapp/src/main/res/drawable/bot_agu_denpa_avatar.png similarity index 100% rename from app/src/main/res/drawable/bot_agu_denpa_avatar.png rename to zomapp/src/main/res/drawable/bot_agu_denpa_avatar.png diff --git a/app/src/main/res/drawable/bot_topgyal.png b/zomapp/src/main/res/drawable/bot_topgyal.png similarity index 100% rename from app/src/main/res/drawable/bot_topgyal.png rename to zomapp/src/main/res/drawable/bot_topgyal.png diff --git a/app/src/main/res/drawable/bot_zomkyi.png b/zomapp/src/main/res/drawable/bot_zomkyi.png similarity index 100% rename from app/src/main/res/drawable/bot_zomkyi.png rename to zomapp/src/main/res/drawable/bot_zomkyi.png diff --git a/app/src/main/res/drawable/bot_zomkyi_avatar.png b/zomapp/src/main/res/drawable/bot_zomkyi_avatar.png similarity index 100% rename from app/src/main/res/drawable/bot_zomkyi_avatar.png rename to zomapp/src/main/res/drawable/bot_zomkyi_avatar.png diff --git a/zomapp/src/main/res/drawable/content_new_attachment.png b/zomapp/src/main/res/drawable/content_new_attachment.png new file mode 100644 index 0000000..25d27e0 Binary files /dev/null and b/zomapp/src/main/res/drawable/content_new_attachment.png differ diff --git a/zomapp/src/main/res/drawable/content_new_attachment_dark.png b/zomapp/src/main/res/drawable/content_new_attachment_dark.png new file mode 100644 index 0000000..28507da Binary files /dev/null and b/zomapp/src/main/res/drawable/content_new_attachment_dark.png differ diff --git a/zomapp/src/main/res/drawable/dialog_im_switch_chats_strip.9.png b/zomapp/src/main/res/drawable/dialog_im_switch_chats_strip.9.png new file mode 100644 index 0000000..1fe2c11 Binary files /dev/null and b/zomapp/src/main/res/drawable/dialog_im_switch_chats_strip.9.png differ diff --git a/app/src/main/res/drawable/image_action.png b/zomapp/src/main/res/drawable/image_action.png similarity index 100% rename from app/src/main/res/drawable/image_action.png rename to zomapp/src/main/res/drawable/image_action.png diff --git a/app/src/main/res/drawable/image_friend.png b/zomapp/src/main/res/drawable/image_friend.png similarity index 100% rename from app/src/main/res/drawable/image_friend.png rename to zomapp/src/main/res/drawable/image_friend.png diff --git a/app/src/main/res/drawable/image_success.png b/zomapp/src/main/res/drawable/image_success.png similarity index 100% rename from app/src/main/res/drawable/image_success.png rename to zomapp/src/main/res/drawable/image_success.png diff --git a/app/src/main/res/drawable/image_waiting.png b/zomapp/src/main/res/drawable/image_waiting.png similarity index 100% rename from app/src/main/res/drawable/image_waiting.png rename to zomapp/src/main/res/drawable/image_waiting.png diff --git a/app/src/main/res/drawable/mainlogo.png b/zomapp/src/main/res/drawable/mainlogo.png similarity index 100% rename from app/src/main/res/drawable/mainlogo.png rename to zomapp/src/main/res/drawable/mainlogo.png diff --git a/zomapp/src/main/res/drawable/message_view_rounded_dark.xml b/zomapp/src/main/res/drawable/message_view_rounded_dark.xml new file mode 100644 index 0000000..9a221bf --- /dev/null +++ b/zomapp/src/main/res/drawable/message_view_rounded_dark.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/zomapp/src/main/res/drawable/message_view_rounded_light.xml b/zomapp/src/main/res/drawable/message_view_rounded_light.xml new file mode 100644 index 0000000..ee5dfcc --- /dev/null +++ b/zomapp/src/main/res/drawable/message_view_rounded_light.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/notify_app.png b/zomapp/src/main/res/drawable/notify_app.png similarity index 100% rename from app/src/main/res/drawable/notify_app.png rename to zomapp/src/main/res/drawable/notify_app.png diff --git a/app/src/main/res/drawable/onboarding_avatar.png b/zomapp/src/main/res/drawable/onboarding_avatar.png similarity index 100% rename from app/src/main/res/drawable/onboarding_avatar.png rename to zomapp/src/main/res/drawable/onboarding_avatar.png diff --git a/app/src/main/res/drawable/onboarding_congrats.png b/zomapp/src/main/res/drawable/onboarding_congrats.png similarity index 100% rename from app/src/main/res/drawable/onboarding_congrats.png rename to zomapp/src/main/res/drawable/onboarding_congrats.png diff --git a/app/src/main/res/drawable/onboarding_invite.png b/zomapp/src/main/res/drawable/onboarding_invite.png similarity index 100% rename from app/src/main/res/drawable/onboarding_invite.png rename to zomapp/src/main/res/drawable/onboarding_invite.png diff --git a/app/src/main/res/drawable/onboarding_main.png b/zomapp/src/main/res/drawable/onboarding_main.png similarity index 100% rename from app/src/main/res/drawable/onboarding_main.png rename to zomapp/src/main/res/drawable/onboarding_main.png diff --git a/app/src/main/res/drawable/tj12.png b/zomapp/src/main/res/drawable/tj12.png similarity index 100% rename from app/src/main/res/drawable/tj12.png rename to zomapp/src/main/res/drawable/tj12.png diff --git a/app/src/main/res/drawable/waiting_for_friend.png b/zomapp/src/main/res/drawable/waiting_for_friend.png similarity index 100% rename from app/src/main/res/drawable/waiting_for_friend.png rename to zomapp/src/main/res/drawable/waiting_for_friend.png diff --git a/app/src/main/res/drawable/whitelogo.png b/zomapp/src/main/res/drawable/whitelogo.png similarity index 100% rename from app/src/main/res/drawable/whitelogo.png rename to zomapp/src/main/res/drawable/whitelogo.png diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/zomapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to zomapp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/zomapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 74% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to zomapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..0b196ee 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/zomapp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/zomapp/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to zomapp/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/zomapp/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to zomapp/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/zomapp/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to zomapp/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/zomapp/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to zomapp/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/zomapp/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to zomapp/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/zomapp/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to zomapp/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/add_friends.png b/zomapp/src/main/res/mipmap-xhdpi/add_friends.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/add_friends.png rename to zomapp/src/main/res/mipmap-xhdpi/add_friends.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/zomapp/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to zomapp/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/zomapp/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to zomapp/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/zomapp/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to zomapp/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/zomapp/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to zomapp/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/zomapp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to zomapp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/zomapp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to zomapp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to zomapp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/raw/bell.mp3 b/zomapp/src/main/res/raw/bell.mp3 similarity index 100% rename from app/src/main/res/raw/bell.mp3 rename to zomapp/src/main/res/raw/bell.mp3 diff --git a/app/src/main/res/raw/chant.mp3 b/zomapp/src/main/res/raw/chant.mp3 similarity index 100% rename from app/src/main/res/raw/chant.mp3 rename to zomapp/src/main/res/raw/chant.mp3 diff --git a/app/src/main/res/raw/dranyen.mp3 b/zomapp/src/main/res/raw/dranyen.mp3 similarity index 100% rename from app/src/main/res/raw/dranyen.mp3 rename to zomapp/src/main/res/raw/dranyen.mp3 diff --git a/app/src/main/res/raw/yak.mp3 b/zomapp/src/main/res/raw/yak.mp3 similarity index 100% rename from app/src/main/res/raw/yak.mp3 rename to zomapp/src/main/res/raw/yak.mp3 diff --git a/app/src/main/res/values-night/themes.xml b/zomapp/src/main/res/values-night/themes.xml similarity index 100% rename from app/src/main/res/values-night/themes.xml rename to zomapp/src/main/res/values-night/themes.xml diff --git a/app/src/main/res/values/attrs.xml b/zomapp/src/main/res/values/attrs.xml similarity index 100% rename from app/src/main/res/values/attrs.xml rename to zomapp/src/main/res/values/attrs.xml diff --git a/app/src/main/res/values/bots.xml b/zomapp/src/main/res/values/bots.xml similarity index 100% rename from app/src/main/res/values/bots.xml rename to zomapp/src/main/res/values/bots.xml diff --git a/app/src/main/res/values/colors.xml b/zomapp/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to zomapp/src/main/res/values/colors.xml diff --git a/zomapp/src/main/res/values/dimens.xml b/zomapp/src/main/res/values/dimens.xml new file mode 100644 index 0000000..17bba67 --- /dev/null +++ b/zomapp/src/main/res/values/dimens.xml @@ -0,0 +1,28 @@ + + + 20dp + 120dip + 256dp + 16dp + 8dp + + 10dp + 320dp + + 65dp + 200dp + 4dp + \ No newline at end of file diff --git a/zomapp/src/main/res/values/ic_launcher_background.xml b/zomapp/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..3bdbd70 --- /dev/null +++ b/zomapp/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #814CFC + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/zomapp/src/main/res/values/strings.xml similarity index 65% rename from app/src/main/res/values/strings.xml rename to zomapp/src/main/res/values/strings.xml index 11d511c..b50bcbe 100644 --- a/app/src/main/res/values/strings.xml +++ b/zomapp/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - Zom3 + Zom nang.zom.im diff --git a/app/src/main/res/values/themes.xml b/zomapp/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to zomapp/src/main/res/values/themes.xml diff --git a/app/src/main/res/values/zomstrings.xml b/zomapp/src/main/res/values/zomstrings.xml similarity index 100% rename from app/src/main/res/values/zomstrings.xml rename to zomapp/src/main/res/values/zomstrings.xml diff --git a/app/src/test/java/im/zom/keanu3/ExampleUnitTest.kt b/zomapp/src/test/java/im/zom/keanu3/ExampleUnitTest.kt similarity index 100% rename from app/src/test/java/im/zom/keanu3/ExampleUnitTest.kt rename to zomapp/src/test/java/im/zom/keanu3/ExampleUnitTest.kt