diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a4b302a..2d17f4f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,8 +18,8 @@ android { applicationId = "com.sketch.ar.artdrawing" minSdk = 24 targetSdk = 36 - versionCode = 3 - versionName = "1.2" + versionCode = 4 + versionName = "1.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" setProperty( "archivesBaseName", @@ -87,7 +87,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") kapt("com.github.bumptech.glide:compiler:4.16.0") - implementation("com.caverock:androidsvg:1.4") + val camerax_version = "1.5.0" //noinspection GradleDependency @@ -103,6 +103,10 @@ dependencies { //noinspection GradleDependency implementation("androidx.camera:camera-extensions:${camerax_version}") +// implementation("io.coil-kt:coil:2.7.0") +//// Coil核心库 +// implementation("io.coil-kt:coil-svg:2.7.0") + implementation(files("libs/TopOnLibrary_11_06_18_02-release.aar")) implementation(files("libs/UpLoadLibrary_07_03_11_54-release.aar")) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c53d8b3..4757b3e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,7 +50,7 @@ + android:exported="false" /> \ No newline at end of file diff --git a/app/src/main/assets/kt_Aesthetic/2.png b/app/src/main/assets/kt_Aesthetic/2.png new file mode 100644 index 0000000..9a531c9 Binary files /dev/null and b/app/src/main/assets/kt_Aesthetic/2.png differ diff --git a/app/src/main/assets/kt_Aesthetic/2.svg b/app/src/main/assets/kt_Aesthetic/2.svg deleted file mode 100644 index 4de87b1..0000000 --- a/app/src/main/assets/kt_Aesthetic/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Aesthetic/3.png b/app/src/main/assets/kt_Aesthetic/3.png new file mode 100644 index 0000000..8ab385e Binary files /dev/null and b/app/src/main/assets/kt_Aesthetic/3.png differ diff --git a/app/src/main/assets/kt_Aesthetic/3.svg b/app/src/main/assets/kt_Aesthetic/3.svg deleted file mode 100644 index f6ff239..0000000 --- a/app/src/main/assets/kt_Aesthetic/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Aesthetic/4.png b/app/src/main/assets/kt_Aesthetic/4.png new file mode 100644 index 0000000..4bc08af Binary files /dev/null and b/app/src/main/assets/kt_Aesthetic/4.png differ diff --git a/app/src/main/assets/kt_Aesthetic/4.svg b/app/src/main/assets/kt_Aesthetic/4.svg deleted file mode 100644 index 175e805..0000000 --- a/app/src/main/assets/kt_Aesthetic/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Aesthetic/5.png b/app/src/main/assets/kt_Aesthetic/5.png new file mode 100644 index 0000000..99059cb Binary files /dev/null and b/app/src/main/assets/kt_Aesthetic/5.png differ diff --git a/app/src/main/assets/kt_Aesthetic/5.svg b/app/src/main/assets/kt_Aesthetic/5.svg deleted file mode 100644 index 28328bf..0000000 --- a/app/src/main/assets/kt_Aesthetic/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Aesthetic/6.svg b/app/src/main/assets/kt_Aesthetic/6.svg deleted file mode 100644 index e13eaf5..0000000 --- a/app/src/main/assets/kt_Aesthetic/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/1.png b/app/src/main/assets/kt_Animals/1.png new file mode 100644 index 0000000..6d9fd4e Binary files /dev/null and b/app/src/main/assets/kt_Animals/1.png differ diff --git a/app/src/main/assets/kt_Animals/1.svg b/app/src/main/assets/kt_Animals/1.svg deleted file mode 100644 index 1f4d83e..0000000 --- a/app/src/main/assets/kt_Animals/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/2.png b/app/src/main/assets/kt_Animals/2.png new file mode 100644 index 0000000..52918ab Binary files /dev/null and b/app/src/main/assets/kt_Animals/2.png differ diff --git a/app/src/main/assets/kt_Animals/2.svg b/app/src/main/assets/kt_Animals/2.svg deleted file mode 100644 index 458df24..0000000 --- a/app/src/main/assets/kt_Animals/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/3.png b/app/src/main/assets/kt_Animals/3.png new file mode 100644 index 0000000..f678360 Binary files /dev/null and b/app/src/main/assets/kt_Animals/3.png differ diff --git a/app/src/main/assets/kt_Animals/3.svg b/app/src/main/assets/kt_Animals/3.svg deleted file mode 100644 index eb900fb..0000000 --- a/app/src/main/assets/kt_Animals/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/4.png b/app/src/main/assets/kt_Animals/4.png new file mode 100644 index 0000000..c61fffd Binary files /dev/null and b/app/src/main/assets/kt_Animals/4.png differ diff --git a/app/src/main/assets/kt_Animals/4.svg b/app/src/main/assets/kt_Animals/4.svg deleted file mode 100644 index 393b125..0000000 --- a/app/src/main/assets/kt_Animals/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/5.png b/app/src/main/assets/kt_Animals/5.png new file mode 100644 index 0000000..2c5c933 Binary files /dev/null and b/app/src/main/assets/kt_Animals/5.png differ diff --git a/app/src/main/assets/kt_Animals/5.svg b/app/src/main/assets/kt_Animals/5.svg deleted file mode 100644 index a96450e..0000000 --- a/app/src/main/assets/kt_Animals/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/6.png b/app/src/main/assets/kt_Animals/6.png new file mode 100644 index 0000000..f6278d0 Binary files /dev/null and b/app/src/main/assets/kt_Animals/6.png differ diff --git a/app/src/main/assets/kt_Animals/6.svg b/app/src/main/assets/kt_Animals/6.svg deleted file mode 100644 index 5f7c304..0000000 --- a/app/src/main/assets/kt_Animals/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Animals/7.png b/app/src/main/assets/kt_Animals/7.png new file mode 100644 index 0000000..86ea773 Binary files /dev/null and b/app/src/main/assets/kt_Animals/7.png differ diff --git a/app/src/main/assets/kt_Animals/7.svg b/app/src/main/assets/kt_Animals/7.svg deleted file mode 100644 index 73bf445..0000000 --- a/app/src/main/assets/kt_Animals/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/1.png b/app/src/main/assets/kt_Architectures/1.png new file mode 100644 index 0000000..177ddd6 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/1.png differ diff --git a/app/src/main/assets/kt_Architectures/1.svg b/app/src/main/assets/kt_Architectures/1.svg deleted file mode 100644 index 6c6684d..0000000 --- a/app/src/main/assets/kt_Architectures/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/2.png b/app/src/main/assets/kt_Architectures/2.png new file mode 100644 index 0000000..de77842 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/2.png differ diff --git a/app/src/main/assets/kt_Architectures/2.svg b/app/src/main/assets/kt_Architectures/2.svg deleted file mode 100644 index 157f11c..0000000 --- a/app/src/main/assets/kt_Architectures/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/3.png b/app/src/main/assets/kt_Architectures/3.png new file mode 100644 index 0000000..1e78a22 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/3.png differ diff --git a/app/src/main/assets/kt_Architectures/3.svg b/app/src/main/assets/kt_Architectures/3.svg deleted file mode 100644 index 97372b2..0000000 --- a/app/src/main/assets/kt_Architectures/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/4.png b/app/src/main/assets/kt_Architectures/4.png new file mode 100644 index 0000000..27a1247 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/4.png differ diff --git a/app/src/main/assets/kt_Architectures/4.svg b/app/src/main/assets/kt_Architectures/4.svg deleted file mode 100644 index 87dc6bf..0000000 --- a/app/src/main/assets/kt_Architectures/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/5.png b/app/src/main/assets/kt_Architectures/5.png new file mode 100644 index 0000000..a0587c3 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/5.png differ diff --git a/app/src/main/assets/kt_Architectures/5.svg b/app/src/main/assets/kt_Architectures/5.svg deleted file mode 100644 index ba13de0..0000000 --- a/app/src/main/assets/kt_Architectures/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Architectures/6.png b/app/src/main/assets/kt_Architectures/6.png new file mode 100644 index 0000000..d3ac765 Binary files /dev/null and b/app/src/main/assets/kt_Architectures/6.png differ diff --git a/app/src/main/assets/kt_Architectures/6.svg b/app/src/main/assets/kt_Architectures/6.svg deleted file mode 100644 index 72e8195..0000000 --- a/app/src/main/assets/kt_Architectures/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/1.png b/app/src/main/assets/kt_Car/1.png new file mode 100644 index 0000000..3fc00ef Binary files /dev/null and b/app/src/main/assets/kt_Car/1.png differ diff --git a/app/src/main/assets/kt_Car/1.svg b/app/src/main/assets/kt_Car/1.svg deleted file mode 100644 index 1b2faba..0000000 --- a/app/src/main/assets/kt_Car/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/2.png b/app/src/main/assets/kt_Car/2.png new file mode 100644 index 0000000..123eb2c Binary files /dev/null and b/app/src/main/assets/kt_Car/2.png differ diff --git a/app/src/main/assets/kt_Car/2.svg b/app/src/main/assets/kt_Car/2.svg deleted file mode 100644 index 951f018..0000000 --- a/app/src/main/assets/kt_Car/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/3.png b/app/src/main/assets/kt_Car/3.png new file mode 100644 index 0000000..01b2da0 Binary files /dev/null and b/app/src/main/assets/kt_Car/3.png differ diff --git a/app/src/main/assets/kt_Car/3.svg b/app/src/main/assets/kt_Car/3.svg deleted file mode 100644 index a8c1079..0000000 --- a/app/src/main/assets/kt_Car/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/4.png b/app/src/main/assets/kt_Car/4.png new file mode 100644 index 0000000..9e5da31 Binary files /dev/null and b/app/src/main/assets/kt_Car/4.png differ diff --git a/app/src/main/assets/kt_Car/4.svg b/app/src/main/assets/kt_Car/4.svg deleted file mode 100644 index 826753c..0000000 --- a/app/src/main/assets/kt_Car/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/5.png b/app/src/main/assets/kt_Car/5.png new file mode 100644 index 0000000..3a69a5c Binary files /dev/null and b/app/src/main/assets/kt_Car/5.png differ diff --git a/app/src/main/assets/kt_Car/5.svg b/app/src/main/assets/kt_Car/5.svg deleted file mode 100644 index 1116db9..0000000 --- a/app/src/main/assets/kt_Car/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/6.png b/app/src/main/assets/kt_Car/6.png new file mode 100644 index 0000000..348453e Binary files /dev/null and b/app/src/main/assets/kt_Car/6.png differ diff --git a/app/src/main/assets/kt_Car/6.svg b/app/src/main/assets/kt_Car/6.svg deleted file mode 100644 index 8e973c9..0000000 --- a/app/src/main/assets/kt_Car/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Car/7.png b/app/src/main/assets/kt_Car/7.png new file mode 100644 index 0000000..a8afb3d Binary files /dev/null and b/app/src/main/assets/kt_Car/7.png differ diff --git a/app/src/main/assets/kt_Car/7.svg b/app/src/main/assets/kt_Car/7.svg deleted file mode 100644 index 3178a0e..0000000 --- a/app/src/main/assets/kt_Car/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/1.png b/app/src/main/assets/kt_Cartoons/1.png new file mode 100644 index 0000000..e857f37 Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/1.png differ diff --git a/app/src/main/assets/kt_Cartoons/1.svg b/app/src/main/assets/kt_Cartoons/1.svg deleted file mode 100644 index 43ef9b7..0000000 --- a/app/src/main/assets/kt_Cartoons/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/10.svg b/app/src/main/assets/kt_Cartoons/10.svg deleted file mode 100644 index 1c51093..0000000 --- a/app/src/main/assets/kt_Cartoons/10.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/11.svg b/app/src/main/assets/kt_Cartoons/11.svg deleted file mode 100644 index ab02ad1..0000000 --- a/app/src/main/assets/kt_Cartoons/11.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/12.svg b/app/src/main/assets/kt_Cartoons/12.svg deleted file mode 100644 index 5594ba5..0000000 --- a/app/src/main/assets/kt_Cartoons/12.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/13.svg b/app/src/main/assets/kt_Cartoons/13.svg deleted file mode 100644 index 5980a0e..0000000 --- a/app/src/main/assets/kt_Cartoons/13.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/14.svg b/app/src/main/assets/kt_Cartoons/14.svg deleted file mode 100644 index d626cbe..0000000 --- a/app/src/main/assets/kt_Cartoons/14.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/kt_Cartoons/15.svg b/app/src/main/assets/kt_Cartoons/15.svg deleted file mode 100644 index bc5a8a7..0000000 --- a/app/src/main/assets/kt_Cartoons/15.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/2.png b/app/src/main/assets/kt_Cartoons/2.png new file mode 100644 index 0000000..e76af0e Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/2.png differ diff --git a/app/src/main/assets/kt_Cartoons/2.svg b/app/src/main/assets/kt_Cartoons/2.svg deleted file mode 100644 index d07f46c..0000000 --- a/app/src/main/assets/kt_Cartoons/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/3.png b/app/src/main/assets/kt_Cartoons/3.png new file mode 100644 index 0000000..66b608e Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/3.png differ diff --git a/app/src/main/assets/kt_Cartoons/3.svg b/app/src/main/assets/kt_Cartoons/3.svg deleted file mode 100644 index 6904e0b..0000000 --- a/app/src/main/assets/kt_Cartoons/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/4.png b/app/src/main/assets/kt_Cartoons/4.png new file mode 100644 index 0000000..1db907c Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/4.png differ diff --git a/app/src/main/assets/kt_Cartoons/4.svg b/app/src/main/assets/kt_Cartoons/4.svg deleted file mode 100644 index 3b2121d..0000000 --- a/app/src/main/assets/kt_Cartoons/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/5.png b/app/src/main/assets/kt_Cartoons/5.png new file mode 100644 index 0000000..80892dc Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/5.png differ diff --git a/app/src/main/assets/kt_Cartoons/5.svg b/app/src/main/assets/kt_Cartoons/5.svg deleted file mode 100644 index bfc105e..0000000 --- a/app/src/main/assets/kt_Cartoons/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/6.png b/app/src/main/assets/kt_Cartoons/6.png new file mode 100644 index 0000000..d896272 Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/6.png differ diff --git a/app/src/main/assets/kt_Cartoons/6.svg b/app/src/main/assets/kt_Cartoons/6.svg deleted file mode 100644 index aa2b33d..0000000 --- a/app/src/main/assets/kt_Cartoons/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/7.png b/app/src/main/assets/kt_Cartoons/7.png new file mode 100644 index 0000000..9bd072a Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/7.png differ diff --git a/app/src/main/assets/kt_Cartoons/7.svg b/app/src/main/assets/kt_Cartoons/7.svg deleted file mode 100644 index 5a82c05..0000000 --- a/app/src/main/assets/kt_Cartoons/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Cartoons/8.png b/app/src/main/assets/kt_Cartoons/8.png new file mode 100644 index 0000000..8cfe9cd Binary files /dev/null and b/app/src/main/assets/kt_Cartoons/8.png differ diff --git a/app/src/main/assets/kt_Cartoons/8.svg b/app/src/main/assets/kt_Cartoons/8.svg deleted file mode 100644 index ddb2131..0000000 --- a/app/src/main/assets/kt_Cartoons/8.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Festivals/15.jpg b/app/src/main/assets/kt_Festivals/15.jpg deleted file mode 100644 index e74f47e..0000000 Binary files a/app/src/main/assets/kt_Festivals/15.jpg and /dev/null differ diff --git a/app/src/main/assets/kt_Festivals/9.jpg b/app/src/main/assets/kt_Festivals/9.jpg deleted file mode 100644 index 39d8467..0000000 Binary files a/app/src/main/assets/kt_Festivals/9.jpg and /dev/null differ diff --git a/app/src/main/assets/kt_Flowers/1.png b/app/src/main/assets/kt_Flowers/1.png new file mode 100644 index 0000000..ff63f55 Binary files /dev/null and b/app/src/main/assets/kt_Flowers/1.png differ diff --git a/app/src/main/assets/kt_Flowers/1.svg b/app/src/main/assets/kt_Flowers/1.svg deleted file mode 100644 index d8d4e2c..0000000 --- a/app/src/main/assets/kt_Flowers/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/2.png b/app/src/main/assets/kt_Flowers/2.png new file mode 100644 index 0000000..76224e6 Binary files /dev/null and b/app/src/main/assets/kt_Flowers/2.png differ diff --git a/app/src/main/assets/kt_Flowers/2.svg b/app/src/main/assets/kt_Flowers/2.svg deleted file mode 100644 index 23b8266..0000000 --- a/app/src/main/assets/kt_Flowers/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/3.png b/app/src/main/assets/kt_Flowers/3.png new file mode 100644 index 0000000..a6eb337 Binary files /dev/null and b/app/src/main/assets/kt_Flowers/3.png differ diff --git a/app/src/main/assets/kt_Flowers/3.svg b/app/src/main/assets/kt_Flowers/3.svg deleted file mode 100644 index 6808e64..0000000 --- a/app/src/main/assets/kt_Flowers/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/4.png b/app/src/main/assets/kt_Flowers/4.png new file mode 100644 index 0000000..84c91ce Binary files /dev/null and b/app/src/main/assets/kt_Flowers/4.png differ diff --git a/app/src/main/assets/kt_Flowers/4.svg b/app/src/main/assets/kt_Flowers/4.svg deleted file mode 100644 index 191d15a..0000000 --- a/app/src/main/assets/kt_Flowers/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/5.png b/app/src/main/assets/kt_Flowers/5.png new file mode 100644 index 0000000..39aca22 Binary files /dev/null and b/app/src/main/assets/kt_Flowers/5.png differ diff --git a/app/src/main/assets/kt_Flowers/5.svg b/app/src/main/assets/kt_Flowers/5.svg deleted file mode 100644 index 8e5167a..0000000 --- a/app/src/main/assets/kt_Flowers/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/6.png b/app/src/main/assets/kt_Flowers/6.png new file mode 100644 index 0000000..5fb2e2d Binary files /dev/null and b/app/src/main/assets/kt_Flowers/6.png differ diff --git a/app/src/main/assets/kt_Flowers/6.svg b/app/src/main/assets/kt_Flowers/6.svg deleted file mode 100644 index 4be81c1..0000000 --- a/app/src/main/assets/kt_Flowers/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Flowers/7.svg b/app/src/main/assets/kt_Flowers/7.svg deleted file mode 100644 index 813388e..0000000 --- a/app/src/main/assets/kt_Flowers/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/1.png b/app/src/main/assets/kt_Food/1.png new file mode 100644 index 0000000..21e4a10 Binary files /dev/null and b/app/src/main/assets/kt_Food/1.png differ diff --git a/app/src/main/assets/kt_Food/1.svg b/app/src/main/assets/kt_Food/1.svg deleted file mode 100644 index f4028b7..0000000 --- a/app/src/main/assets/kt_Food/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/2.png b/app/src/main/assets/kt_Food/2.png new file mode 100644 index 0000000..08da5a4 Binary files /dev/null and b/app/src/main/assets/kt_Food/2.png differ diff --git a/app/src/main/assets/kt_Food/2.svg b/app/src/main/assets/kt_Food/2.svg deleted file mode 100644 index 0dc8110..0000000 --- a/app/src/main/assets/kt_Food/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/3.png b/app/src/main/assets/kt_Food/3.png new file mode 100644 index 0000000..ffda2c6 Binary files /dev/null and b/app/src/main/assets/kt_Food/3.png differ diff --git a/app/src/main/assets/kt_Food/3.svg b/app/src/main/assets/kt_Food/3.svg deleted file mode 100644 index 7a2be89..0000000 --- a/app/src/main/assets/kt_Food/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/4.png b/app/src/main/assets/kt_Food/4.png new file mode 100644 index 0000000..e3963c9 Binary files /dev/null and b/app/src/main/assets/kt_Food/4.png differ diff --git a/app/src/main/assets/kt_Food/4.svg b/app/src/main/assets/kt_Food/4.svg deleted file mode 100644 index 93fd3ed..0000000 --- a/app/src/main/assets/kt_Food/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/5.png b/app/src/main/assets/kt_Food/5.png new file mode 100644 index 0000000..8ccfa77 Binary files /dev/null and b/app/src/main/assets/kt_Food/5.png differ diff --git a/app/src/main/assets/kt_Food/5.svg b/app/src/main/assets/kt_Food/5.svg deleted file mode 100644 index 6ad410d..0000000 --- a/app/src/main/assets/kt_Food/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/6.svg b/app/src/main/assets/kt_Food/6.svg deleted file mode 100644 index 2b35e16..0000000 --- a/app/src/main/assets/kt_Food/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Food/7.svg b/app/src/main/assets/kt_Food/7.svg deleted file mode 100644 index 4a28d16..0000000 --- a/app/src/main/assets/kt_Food/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/1.png b/app/src/main/assets/kt_Nature/1.png new file mode 100644 index 0000000..a785c70 Binary files /dev/null and b/app/src/main/assets/kt_Nature/1.png differ diff --git a/app/src/main/assets/kt_Nature/1.svg b/app/src/main/assets/kt_Nature/1.svg deleted file mode 100644 index 4d49b7c..0000000 --- a/app/src/main/assets/kt_Nature/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/2.png b/app/src/main/assets/kt_Nature/2.png new file mode 100644 index 0000000..e3c1d46 Binary files /dev/null and b/app/src/main/assets/kt_Nature/2.png differ diff --git a/app/src/main/assets/kt_Nature/2.svg b/app/src/main/assets/kt_Nature/2.svg deleted file mode 100644 index 6e077c5..0000000 --- a/app/src/main/assets/kt_Nature/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/3.png b/app/src/main/assets/kt_Nature/3.png new file mode 100644 index 0000000..b856ff0 Binary files /dev/null and b/app/src/main/assets/kt_Nature/3.png differ diff --git a/app/src/main/assets/kt_Nature/3.svg b/app/src/main/assets/kt_Nature/3.svg deleted file mode 100644 index 72cab9d..0000000 --- a/app/src/main/assets/kt_Nature/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/4.png b/app/src/main/assets/kt_Nature/4.png new file mode 100644 index 0000000..7c36488 Binary files /dev/null and b/app/src/main/assets/kt_Nature/4.png differ diff --git a/app/src/main/assets/kt_Nature/4.svg b/app/src/main/assets/kt_Nature/4.svg deleted file mode 100644 index 66eb006..0000000 --- a/app/src/main/assets/kt_Nature/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/5.png b/app/src/main/assets/kt_Nature/5.png new file mode 100644 index 0000000..9c0dd5f Binary files /dev/null and b/app/src/main/assets/kt_Nature/5.png differ diff --git a/app/src/main/assets/kt_Nature/5.svg b/app/src/main/assets/kt_Nature/5.svg deleted file mode 100644 index a8956ee..0000000 --- a/app/src/main/assets/kt_Nature/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Nature/6.png b/app/src/main/assets/kt_Nature/6.png new file mode 100644 index 0000000..ec6e458 Binary files /dev/null and b/app/src/main/assets/kt_Nature/6.png differ diff --git a/app/src/main/assets/kt_Nature/6.svg b/app/src/main/assets/kt_Nature/6.svg deleted file mode 100644 index eece789..0000000 --- a/app/src/main/assets/kt_Nature/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/1.png b/app/src/main/assets/kt_One Line Art/1.png new file mode 100644 index 0000000..d99fbf3 Binary files /dev/null and b/app/src/main/assets/kt_One Line Art/1.png differ diff --git a/app/src/main/assets/kt_One Line Art/1.svg b/app/src/main/assets/kt_One Line Art/1.svg deleted file mode 100644 index 5465df3..0000000 --- a/app/src/main/assets/kt_One Line Art/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/2.png b/app/src/main/assets/kt_One Line Art/2.png new file mode 100644 index 0000000..37fbf95 Binary files /dev/null and b/app/src/main/assets/kt_One Line Art/2.png differ diff --git a/app/src/main/assets/kt_One Line Art/2.svg b/app/src/main/assets/kt_One Line Art/2.svg deleted file mode 100644 index 8d8c581..0000000 --- a/app/src/main/assets/kt_One Line Art/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/3.png b/app/src/main/assets/kt_One Line Art/3.png new file mode 100644 index 0000000..29d0fc5 Binary files /dev/null and b/app/src/main/assets/kt_One Line Art/3.png differ diff --git a/app/src/main/assets/kt_One Line Art/3.svg b/app/src/main/assets/kt_One Line Art/3.svg deleted file mode 100644 index 4ec8394..0000000 --- a/app/src/main/assets/kt_One Line Art/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/4.png b/app/src/main/assets/kt_One Line Art/4.png new file mode 100644 index 0000000..10fe055 Binary files /dev/null and b/app/src/main/assets/kt_One Line Art/4.png differ diff --git a/app/src/main/assets/kt_One Line Art/4.svg b/app/src/main/assets/kt_One Line Art/4.svg deleted file mode 100644 index 34fc71c..0000000 --- a/app/src/main/assets/kt_One Line Art/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/5.png b/app/src/main/assets/kt_One Line Art/5.png new file mode 100644 index 0000000..b16f8c8 Binary files /dev/null and b/app/src/main/assets/kt_One Line Art/5.png differ diff --git a/app/src/main/assets/kt_One Line Art/5.svg b/app/src/main/assets/kt_One Line Art/5.svg deleted file mode 100644 index 715b277..0000000 --- a/app/src/main/assets/kt_One Line Art/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_One Line Art/6.svg b/app/src/main/assets/kt_One Line Art/6.svg deleted file mode 100644 index efaee39..0000000 --- a/app/src/main/assets/kt_One Line Art/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/1.png b/app/src/main/assets/kt_People/1.png new file mode 100644 index 0000000..cddb579 Binary files /dev/null and b/app/src/main/assets/kt_People/1.png differ diff --git a/app/src/main/assets/kt_People/1.svg b/app/src/main/assets/kt_People/1.svg deleted file mode 100644 index d589f97..0000000 --- a/app/src/main/assets/kt_People/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/2.png b/app/src/main/assets/kt_People/2.png new file mode 100644 index 0000000..2787770 Binary files /dev/null and b/app/src/main/assets/kt_People/2.png differ diff --git a/app/src/main/assets/kt_People/2.svg b/app/src/main/assets/kt_People/2.svg deleted file mode 100644 index eaec686..0000000 --- a/app/src/main/assets/kt_People/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/3.png b/app/src/main/assets/kt_People/3.png new file mode 100644 index 0000000..e19a20c Binary files /dev/null and b/app/src/main/assets/kt_People/3.png differ diff --git a/app/src/main/assets/kt_People/3.svg b/app/src/main/assets/kt_People/3.svg deleted file mode 100644 index 264f9d4..0000000 --- a/app/src/main/assets/kt_People/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/4.png b/app/src/main/assets/kt_People/4.png new file mode 100644 index 0000000..361359e Binary files /dev/null and b/app/src/main/assets/kt_People/4.png differ diff --git a/app/src/main/assets/kt_People/4.svg b/app/src/main/assets/kt_People/4.svg deleted file mode 100644 index bd9c104..0000000 --- a/app/src/main/assets/kt_People/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/5.png b/app/src/main/assets/kt_People/5.png new file mode 100644 index 0000000..e102072 Binary files /dev/null and b/app/src/main/assets/kt_People/5.png differ diff --git a/app/src/main/assets/kt_People/5.svg b/app/src/main/assets/kt_People/5.svg deleted file mode 100644 index 549b5e2..0000000 --- a/app/src/main/assets/kt_People/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/6.svg b/app/src/main/assets/kt_People/6.svg deleted file mode 100644 index 6c5e194..0000000 --- a/app/src/main/assets/kt_People/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/7.svg b/app/src/main/assets/kt_People/7.svg deleted file mode 100644 index 38c04bb..0000000 --- a/app/src/main/assets/kt_People/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_People/9.svg b/app/src/main/assets/kt_People/9.svg deleted file mode 100644 index 10f22da..0000000 --- a/app/src/main/assets/kt_People/9.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/1.png b/app/src/main/assets/kt_Space/1.png new file mode 100644 index 0000000..04fdd4f Binary files /dev/null and b/app/src/main/assets/kt_Space/1.png differ diff --git a/app/src/main/assets/kt_Space/1.svg b/app/src/main/assets/kt_Space/1.svg deleted file mode 100644 index 4c6168b..0000000 --- a/app/src/main/assets/kt_Space/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/2.png b/app/src/main/assets/kt_Space/2.png new file mode 100644 index 0000000..a9ed9a7 Binary files /dev/null and b/app/src/main/assets/kt_Space/2.png differ diff --git a/app/src/main/assets/kt_Space/2.svg b/app/src/main/assets/kt_Space/2.svg deleted file mode 100644 index 8fd9091..0000000 --- a/app/src/main/assets/kt_Space/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/3.png b/app/src/main/assets/kt_Space/3.png new file mode 100644 index 0000000..71f6b8c Binary files /dev/null and b/app/src/main/assets/kt_Space/3.png differ diff --git a/app/src/main/assets/kt_Space/3.svg b/app/src/main/assets/kt_Space/3.svg deleted file mode 100644 index 5e3618d..0000000 --- a/app/src/main/assets/kt_Space/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/4.png b/app/src/main/assets/kt_Space/4.png new file mode 100644 index 0000000..12b88ab Binary files /dev/null and b/app/src/main/assets/kt_Space/4.png differ diff --git a/app/src/main/assets/kt_Space/4.svg b/app/src/main/assets/kt_Space/4.svg deleted file mode 100644 index 48c98f8..0000000 --- a/app/src/main/assets/kt_Space/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/5.png b/app/src/main/assets/kt_Space/5.png new file mode 100644 index 0000000..92bcb52 Binary files /dev/null and b/app/src/main/assets/kt_Space/5.png differ diff --git a/app/src/main/assets/kt_Space/5.svg b/app/src/main/assets/kt_Space/5.svg deleted file mode 100644 index ab2ab9d..0000000 --- a/app/src/main/assets/kt_Space/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/6.png b/app/src/main/assets/kt_Space/6.png new file mode 100644 index 0000000..f3ff015 Binary files /dev/null and b/app/src/main/assets/kt_Space/6.png differ diff --git a/app/src/main/assets/kt_Space/6.svg b/app/src/main/assets/kt_Space/6.svg deleted file mode 100644 index 5347313..0000000 --- a/app/src/main/assets/kt_Space/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/7.png b/app/src/main/assets/kt_Space/7.png new file mode 100644 index 0000000..7f6cffc Binary files /dev/null and b/app/src/main/assets/kt_Space/7.png differ diff --git a/app/src/main/assets/kt_Space/7.svg b/app/src/main/assets/kt_Space/7.svg deleted file mode 100644 index 8d41686..0000000 --- a/app/src/main/assets/kt_Space/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/8.png b/app/src/main/assets/kt_Space/8.png new file mode 100644 index 0000000..e49f368 Binary files /dev/null and b/app/src/main/assets/kt_Space/8.png differ diff --git a/app/src/main/assets/kt_Space/8.svg b/app/src/main/assets/kt_Space/8.svg deleted file mode 100644 index f67e6dd..0000000 --- a/app/src/main/assets/kt_Space/8.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Space/9.png b/app/src/main/assets/kt_Space/9.png new file mode 100644 index 0000000..2e4b95f Binary files /dev/null and b/app/src/main/assets/kt_Space/9.png differ diff --git a/app/src/main/assets/kt_Space/9.svg b/app/src/main/assets/kt_Space/9.svg deleted file mode 100644 index 2c525a9..0000000 --- a/app/src/main/assets/kt_Space/9.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/1.png b/app/src/main/assets/kt_Tropical Paradise/1.png new file mode 100644 index 0000000..e6e4da8 Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/1.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/1.svg b/app/src/main/assets/kt_Tropical Paradise/1.svg deleted file mode 100644 index dc07758..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/2.png b/app/src/main/assets/kt_Tropical Paradise/2.png new file mode 100644 index 0000000..8622478 Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/2.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/2.svg b/app/src/main/assets/kt_Tropical Paradise/2.svg deleted file mode 100644 index 3e816f1..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/3.png b/app/src/main/assets/kt_Tropical Paradise/3.png new file mode 100644 index 0000000..5757019 Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/3.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/3.svg b/app/src/main/assets/kt_Tropical Paradise/3.svg deleted file mode 100644 index 0aab839..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/4.png b/app/src/main/assets/kt_Tropical Paradise/4.png new file mode 100644 index 0000000..30b0c55 Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/4.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/4.svg b/app/src/main/assets/kt_Tropical Paradise/4.svg deleted file mode 100644 index ec4a638..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/5.png b/app/src/main/assets/kt_Tropical Paradise/5.png new file mode 100644 index 0000000..a51897c Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/5.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/5.svg b/app/src/main/assets/kt_Tropical Paradise/5.svg deleted file mode 100644 index 0afef24..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/6.png b/app/src/main/assets/kt_Tropical Paradise/6.png new file mode 100644 index 0000000..e624a5d Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/6.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/6.svg b/app/src/main/assets/kt_Tropical Paradise/6.svg deleted file mode 100644 index 8dbd414..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_Tropical Paradise/7.png b/app/src/main/assets/kt_Tropical Paradise/7.png new file mode 100644 index 0000000..103d079 Binary files /dev/null and b/app/src/main/assets/kt_Tropical Paradise/7.png differ diff --git a/app/src/main/assets/kt_Tropical Paradise/7.svg b/app/src/main/assets/kt_Tropical Paradise/7.svg deleted file mode 100644 index 1d296c0..0000000 --- a/app/src/main/assets/kt_Tropical Paradise/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/1.png b/app/src/main/assets/kt_World Monuments/1.png new file mode 100644 index 0000000..6c01aed Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/1.png differ diff --git a/app/src/main/assets/kt_World Monuments/1.svg b/app/src/main/assets/kt_World Monuments/1.svg deleted file mode 100644 index a7eda24..0000000 --- a/app/src/main/assets/kt_World Monuments/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/2.png b/app/src/main/assets/kt_World Monuments/2.png new file mode 100644 index 0000000..34fec5b Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/2.png differ diff --git a/app/src/main/assets/kt_World Monuments/2.svg b/app/src/main/assets/kt_World Monuments/2.svg deleted file mode 100644 index da8855c..0000000 --- a/app/src/main/assets/kt_World Monuments/2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/3.png b/app/src/main/assets/kt_World Monuments/3.png new file mode 100644 index 0000000..8573115 Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/3.png differ diff --git a/app/src/main/assets/kt_World Monuments/3.svg b/app/src/main/assets/kt_World Monuments/3.svg deleted file mode 100644 index d0fdda9..0000000 --- a/app/src/main/assets/kt_World Monuments/3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/4.png b/app/src/main/assets/kt_World Monuments/4.png new file mode 100644 index 0000000..2724433 Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/4.png differ diff --git a/app/src/main/assets/kt_World Monuments/4.svg b/app/src/main/assets/kt_World Monuments/4.svg deleted file mode 100644 index bd5ce67..0000000 --- a/app/src/main/assets/kt_World Monuments/4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/5.png b/app/src/main/assets/kt_World Monuments/5.png new file mode 100644 index 0000000..fe21cfc Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/5.png differ diff --git a/app/src/main/assets/kt_World Monuments/5.svg b/app/src/main/assets/kt_World Monuments/5.svg deleted file mode 100644 index 5234438..0000000 --- a/app/src/main/assets/kt_World Monuments/5.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/6.png b/app/src/main/assets/kt_World Monuments/6.png new file mode 100644 index 0000000..4e6ad38 Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/6.png differ diff --git a/app/src/main/assets/kt_World Monuments/6.svg b/app/src/main/assets/kt_World Monuments/6.svg deleted file mode 100644 index 1665c30..0000000 --- a/app/src/main/assets/kt_World Monuments/6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/assets/kt_World Monuments/7.png b/app/src/main/assets/kt_World Monuments/7.png new file mode 100644 index 0000000..46cf5cb Binary files /dev/null and b/app/src/main/assets/kt_World Monuments/7.png differ diff --git a/app/src/main/assets/kt_World Monuments/7.svg b/app/src/main/assets/kt_World Monuments/7.svg deleted file mode 100644 index 74fd8bb..0000000 --- a/app/src/main/assets/kt_World Monuments/7.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListActivity.kt b/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListActivity.kt index 18d943f..0ed7831 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListActivity.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListActivity.kt @@ -2,7 +2,9 @@ package com.sketch.ar.artdrawing.allImageList import android.content.Intent import android.os.Bundle +import android.util.Log import android.widget.FrameLayout +import android.widget.ImageView import android.widget.TextView import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity @@ -34,9 +36,8 @@ class AllImageListActivity : AppCompatActivity() { AdManager.showTopOn(this) { } val recycler = findViewById(R.id.list_recyclerview) val title = findViewById(R.id.tv_category_name) - findViewById(R.id.icon_back).setOnClickListener { - finish() - } + val backLayout = findViewById(R.id.image_back) + val categoryName = intent.getStringExtra(IntentKey_Title) title.text = categoryName?.let { CommonUtils.getDisPlayName(it) } @@ -52,6 +53,11 @@ class AllImageListActivity : AppCompatActivity() { } } + backLayout.setOnClickListener { + Log.d("---------------------","============setOnClickListener") + finish() + } + } private fun InitCategoryList(category: String): AllImageListAdapter { @@ -61,7 +67,6 @@ class AllImageListActivity : AppCompatActivity() { }) } - return allImageListAdapter } } \ No newline at end of file diff --git a/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListAdapter.kt b/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListAdapter.kt index 9dee24c..f35bf4f 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListAdapter.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/allImageList/AllImageListAdapter.kt @@ -1,9 +1,14 @@ package com.sketch.ar.artdrawing.allImageList import android.content.Context +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.net.toUri import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.request.target.Target +import com.sketch.ar.artdrawing.R import com.sketch.ar.artdrawing.databinding.AdapterAllListBinding import com.sketch.ar.artdrawing.utils.BaseAdapter import com.sketch.ar.artdrawing.utils.CommonUtils @@ -24,9 +29,16 @@ class AllImageListAdapter(var category:String, context: Context, var clickAction val itemHolder = holder as VHolder data[position].let { val filePath = "$category/$it" - CommonUtils.loadImage(mContext, filePath, CommonUtils.dpToPx(60f), CommonUtils.dpToPx(140f)){ - itemHolder.vb.mainImage.setImageBitmap(it) - } + + val uri = "file:///android_asset/$filePath".toUri() + itemHolder.vb.mainImage.let { + Glide.with(mContext) + .asBitmap() + .load(uri) + .override(Target.SIZE_ORIGINAL) + .into(it) + } + itemHolder.vb.mainImage.setOnClickListener { clickAction(filePath) } diff --git a/app/src/main/java/com/sketch/ar/artdrawing/info/InfoActivity.kt b/app/src/main/java/com/sketch/ar/artdrawing/info/InfoActivity.kt index 0155e76..ec51264 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/info/InfoActivity.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/info/InfoActivity.kt @@ -3,6 +3,7 @@ package com.sketch.ar.artdrawing.info import android.Manifest import android.app.Activity import android.content.pm.PackageManager +import android.graphics.Bitmap import android.graphics.BitmapFactory import android.graphics.Matrix import android.graphics.Point @@ -16,9 +17,11 @@ import android.widget.FrameLayout import android.widget.ImageView import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener +import android.widget.Toast import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.camera.core.Camera +import androidx.camera.core.CameraProvider import androidx.camera.core.CameraSelector import androidx.camera.core.ImageCapture import androidx.camera.core.Preview @@ -35,7 +38,13 @@ import com.sketch.ar.artdrawing.utils.ObjectBoxHelper import com.sketch.ar.artdrawing.R import com.sketch.ar.artdrawing.utils.CommonUtils import androidx.core.graphics.scale +import androidx.core.net.toUri import com.ad.toponlibrary.AdManager +import com.bumptech.glide.Glide +import com.bumptech.glide.load.DataSource +import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.request.RequestListener +import com.bumptech.glide.request.target.Target class InfoActivity : AppCompatActivity() ,OnTouchListener{ companion object{ @@ -68,6 +77,7 @@ class InfoActivity : AppCompatActivity() ,OnTouchListener{ // private ImageView imPhoto; private var hasPermission = false + private var cameraProvider: ProcessCameraProvider? = null private var MODE = 0 //当前状态 private val MODE_NONE: Int = 0 //无操作 @@ -117,10 +127,15 @@ class InfoActivity : AppCompatActivity() ,OnTouchListener{ } } imTab2.setOnClickListener { - val selected: Boolean = imTab2.isSelected - imTab2.setSelected(!selected) - camera!!.cameraControl.enableTorch(!selected) + camera?.cameraControl?.let { + val selected: Boolean = imTab2.isSelected + imTab2.setSelected(!selected) + it.enableTorch(!selected) + }?:run { + Toast.makeText(this@InfoActivity,getString(R.string.no_camera_permission), Toast.LENGTH_SHORT).show() + } } + imTab3.setOnClickListener { val selected: Boolean = imTab3.isSelected imTab3.setSelected(!selected) @@ -152,13 +167,13 @@ class InfoActivity : AppCompatActivity() ,OnTouchListener{ val future = ProcessCameraProvider.getInstance(this) future.addListener({ try { - val cameraProvider = future.get() + cameraProvider = future.get() val preview = Preview.Builder().build() - cameraProvider.unbindAll() + cameraProvider?.unbindAll() val builder1 = ImageCapture.Builder() imageCapture = builder1.build() - camera = cameraProvider.bindToLifecycle( + camera = cameraProvider?.bindToLifecycle( this, cameraSelector!!, preview, imageCapture ) @@ -167,17 +182,52 @@ class InfoActivity : AppCompatActivity() ,OnTouchListener{ curBitmapPath?.let { path-> Log.d(MyApp.Companion.TAG, "--------path=${path}") - CommonUtils.loadImage(this@InfoActivity,path){ mbitmap-> - var finalBitmap = mbitmap?: BitmapFactory.decodeFile(path).scale(600, 600) - Log.d(MyApp.Companion.TAG, "-----mbitmap---${mbitmap} ${Thread.currentThread().name} finalBitmap=${finalBitmap}") - previewImage.setImageBitmap(finalBitmap) - val width = finalBitmap.width - val height = finalBitmap.height - onInitPos(width.toFloat(), height.toFloat()) + val uri = "file:///android_asset/$path".toUri() + previewImage.let { + Glide.with(this@InfoActivity) + .asBitmap() + .load(uri) + .override(Target.SIZE_ORIGINAL) + .listener(object : RequestListener { + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target, + isFirstResource: Boolean + ): Boolean { + + var finalBitmap = BitmapFactory.decodeFile(path).scale(600, 600) + + Log.d("ltt","============onLoadFailed ") + it.setImageBitmap(finalBitmap) + val width = finalBitmap.width + val height = finalBitmap.height + onInitPos(width.toFloat(), height.toFloat()) + + return false + } + + override fun onResourceReady( + resource: Bitmap, + model: Any, + target: Target?, + dataSource: DataSource, + isFirstResource: Boolean + ): Boolean { + Log.d("ltt","============onResourceReady") + it.setImageBitmap(resource) + val width = resource.width + val height = resource.height + onInitPos(width.toFloat(), height.toFloat()) + + return false + } + + }) + .preload() } - } } catch (e: Exception) { e.printStackTrace() @@ -276,4 +326,9 @@ class InfoActivity : AppCompatActivity() ,OnTouchListener{ previewImage.setImageMatrix(endMatrix) return true } + + override fun onDestroy() { + super.onDestroy() + cameraProvider?.unbindAll() + } } \ No newline at end of file diff --git a/app/src/main/java/com/sketch/ar/artdrawing/like/LikeAdapter.kt b/app/src/main/java/com/sketch/ar/artdrawing/like/LikeAdapter.kt index a08d56d..27ca023 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/like/LikeAdapter.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/like/LikeAdapter.kt @@ -3,10 +3,18 @@ package com.sketch.ar.artdrawing.like import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.graphics.scale +import androidx.core.net.toUri import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.load.DataSource +import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.request.RequestListener +import com.bumptech.glide.request.target.Target import com.sketch.ar.artdrawing.dataBean.DataLocal import com.sketch.ar.artdrawing.databinding.AdapterLikeBinding import com.sketch.ar.artdrawing.utils.BaseAdapter @@ -29,17 +37,49 @@ class LikeAdapter(context: Context, var clickAction:(path:String)->Unit): val beanUpload: DataLocal = it beanUpload.path?.let{ path-> - - itemHolder.vb.run { - CommonUtils.loadImage(mContext,path){ bitmap: Bitmap? -> - if(bitmap == null){ - mainImage.setImageBitmap(BitmapFactory.decodeFile(path)) - }else{ - mainImage.setImageBitmap(bitmap) - } + val uri = if(CommonUtils.isInternalCacheFile(mContext,path)){ + Log.d("ltt","=========1111=== ${path}") + path + }else{ + Log.d("ltt","=========3222=== ${path}") + "file:///android_asset/$path".toUri() } + + mainImage.let { + Glide.with(mContext) + .asBitmap() + .load(uri) + .override(Target.SIZE_ORIGINAL) + .listener(object : RequestListener { + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target, + isFirstResource: Boolean + ): Boolean { + var finalBitmap = BitmapFactory.decodeFile(path).scale(600, 600) + + it.setImageBitmap(finalBitmap) + + return false + } + + override fun onResourceReady( + resource: Bitmap, + model: Any, + target: Target?, + dataSource: DataSource, + isFirstResource: Boolean + ): Boolean { + return false + } + + }) + .into(it) + } + mainImage.setOnClickListener(View.OnClickListener { clickAction.invoke(path) }) diff --git a/app/src/main/java/com/sketch/ar/artdrawing/main/MainCategoryAdapter.kt b/app/src/main/java/com/sketch/ar/artdrawing/main/MainCategoryAdapter.kt index 3245ac6..2669e01 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/main/MainCategoryAdapter.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/main/MainCategoryAdapter.kt @@ -1,9 +1,14 @@ package com.sketch.ar.artdrawing.main import android.content.Context +import android.graphics.BitmapFactory +import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.net.toUri import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.request.target.Target import com.sketch.ar.artdrawing.databinding.AdapterMainCategoryBinding import com.sketch.ar.artdrawing.utils.BaseAdapter import com.sketch.ar.artdrawing.utils.CommonUtils @@ -28,11 +33,16 @@ class MainCategoryAdapter(context: Context, var clickAction: (categoryName: Stri data[position].let { val listAssetFiles = CommonUtils.listAssetFiles(mContext, it) - CommonUtils.loadImage( - mContext, - it + "/" + listAssetFiles[0], - image = itemHolder.vb.mainImage - ) + val path = it + "/" + listAssetFiles[0] + val uri = "file:///android_asset/$path".toUri() + itemHolder.vb.mainImage.let { + Glide.with(mContext) + .asBitmap() + .load(uri) + .override(Target.SIZE_ORIGINAL) + .into(it) + } + val replace = CommonUtils.getDisPlayName(it) itemHolder.vb.mainCategoryName.text = replace itemHolder.vb.mainImage.setOnClickListener { view -> @@ -43,6 +53,8 @@ class MainCategoryAdapter(context: Context, var clickAction: (categoryName: Stri } + + private fun getFirstFourFilesFromAssetsDir(context: Context, dirName: String): List { val fileList: MutableList = ArrayList() try { diff --git a/app/src/main/java/com/sketch/ar/artdrawing/utils/CommonUtils.kt b/app/src/main/java/com/sketch/ar/artdrawing/utils/CommonUtils.kt index 1415f00..343c626 100644 --- a/app/src/main/java/com/sketch/ar/artdrawing/utils/CommonUtils.kt +++ b/app/src/main/java/com/sketch/ar/artdrawing/utils/CommonUtils.kt @@ -1,159 +1,29 @@ package com.sketch.ar.artdrawing.utils + import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory -import android.graphics.Canvas import android.graphics.Point -import android.graphics.drawable.PictureDrawable import android.net.Uri -import android.os.Handler -import android.os.Looper import android.util.DisplayMetrics import android.util.Log import android.view.MotionEvent -import android.view.View import android.view.WindowManager -import android.widget.ImageView -import androidx.core.graphics.createBitmap -import androidx.core.graphics.scale -import androidx.core.net.toUri import com.sketch.ar.artdrawing.MyApp -import com.bumptech.glide.Glide -import com.bumptech.glide.load.DataSource -import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.target.Target -import com.caverock.androidsvg.SVG import java.io.File import java.io.FileOutputStream import java.io.IOException -import java.util.concurrent.Executors import kotlin.math.sqrt object CommonUtils { - fun loadSvgFromAssets(context: Context, filePath: String, imageView: ImageView) { - try { - val inputStream = context.assets.open(filePath) - val svg = SVG.getFromInputStream(inputStream) - val drawable = PictureDrawable(svg.renderToPicture()) - imageView.setLayerType(View.LAYER_TYPE_SOFTWARE, null) - imageView.setImageDrawable(drawable) - } catch (e: Exception) { - e.printStackTrace() - } - } - fun loadSvgToImageViewOld( - context: Context, - fileName: String, - width: Float, - height: Float, - im:ImageView? = null, - onBitmapResult: ((Bitmap?) -> Unit)? = null - ) { - Executors.newSingleThreadExecutor().execute { - try { - val svg = SVG.getFromAsset(context.assets, fileName) - val scaleX = width / svg.documentWidth - val scaleY = height / svg.documentHeight - - val bitmap = Bitmap.createBitmap(width.toInt(), height.toInt(), Bitmap.Config.ARGB_8888) - val canvas = Canvas(bitmap) - canvas.scale(scaleX, scaleY) - svg.renderToCanvas(canvas) - - Handler(Looper.getMainLooper()).post { - onBitmapResult?.invoke(bitmap) - im?.setImageBitmap(bitmap) - Log.d(MyApp.Companion.TAG, "im: $im bitmap=${bitmap}" ) - } - } catch (e: Exception) { - Log.e("SVG", "Error loading SVG: $fileName", e) - - Handler(Looper.getMainLooper()).post { - onBitmapResult?.invoke(null) - } - } - } - } - - fun loadSvgToImageView( - context: Context, - filePath: String, - widthPx: Float, - heightPx: Float, - imageView: ImageView, - onBitmapResult: ((bitmap: Bitmap?) -> Unit)? = null - ) { - Executors.newSingleThreadExecutor().execute { - try { - val svg = SVG.getFromAsset(context.assets, filePath) - val density = context.resources.displayMetrics.density - val bitmap = createBitmap((widthPx).toInt(), (heightPx).toInt()) - val canvas = Canvas(bitmap) - canvas.scale(density, density) - svg.setDocumentWidth("100%") - svg.setDocumentHeight("100%") - svg.renderToCanvas(canvas) - Handler(Looper.getMainLooper()).post { - onBitmapResult?.invoke(bitmap) - } - imageView.post { imageView.setImageBitmap(bitmap) } - - } catch (e: java.lang.Exception) { - Log.e("SVG", "Error loading SVG: $filePath", e) - Handler(Looper.getMainLooper()).post { - onBitmapResult?.invoke(null) - } - } - } - } - - fun loadImage( - context: Context, filePath: String, widthPx: Float = 600f, - heightPx: Float = 600f, image:ImageView? = null, onBitmapResult: ((bitmap: Bitmap?) -> Unit)? = null - ) { - - if (filePath.endsWith(".svg")) { - loadSvgToImageViewOld(context, filePath, widthPx, heightPx, im=image,onBitmapResult=onBitmapResult) - } else if (filePath.endsWith(".jpg")) { - val uri = "file:///android_asset/$filePath".toUri() - Glide.with(context) - .asBitmap() - .load(uri) - .override(Target.SIZE_ORIGINAL) - .listener(object : RequestListener { - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target, - isFirstResource: Boolean - ): Boolean { - onBitmapResult?.invoke(null) - return false - } - override fun onResourceReady( - resource: Bitmap, - model: Any, - target: Target?, - dataSource: DataSource, - isFirstResource: Boolean - ): Boolean { - onBitmapResult?.invoke(resource) - image?.setImageBitmap(resource.scale(600,600)) - return false - } - }) - .preload() - } - } fun listAssetFiles(context: Context, folderName: String): List { @@ -176,7 +46,6 @@ object CommonUtils { return fileName.replace("kt_", "") } - fun getScreen(context: Context): Point { val displayMetrics = DisplayMetrics() val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager @@ -189,13 +58,17 @@ object CommonUtils { return point } - fun getDistance(event: MotionEvent): Float { val x = event.getX(0) - event.getX(1) val y = event.getY(0) - event.getY(1) return sqrt((x * x + y * y).toDouble()).toFloat() } + fun isInternalCacheFile(context: Context, filePath: String): Boolean { + val internalCachePath = context.cacheDir.absolutePath // /data/user/0//cache + val internalFilePath = context.filesDir.absolutePath // /data/user/0//files + return filePath.startsWith(internalCachePath) || filePath.startsWith(internalFilePath) + } fun saveToStorage(fileName: String, fileUri: Uri, context: Context): Boolean { try { // 获取输入流 diff --git a/app/src/main/res/layout/activity_all_image_list.xml b/app/src/main/res/layout/activity_all_image_list.xml index 5c7f085..b3a0641 100644 --- a/app/src/main/res/layout/activity_all_image_list.xml +++ b/app/src/main/res/layout/activity_all_image_list.xml @@ -8,22 +8,16 @@ android:background="@color/color_647B90" tools:context=".allImageList.AllImageListActivity"> - + - + + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f886c3..be9b4d5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,4 +12,6 @@ Already imported Upload failed, please try again You haven\'t saved any sketches yet + + Camera permissions not obtained \ No newline at end of file