commit 3bac2e6ed9fbcb2fea344fb4ee2a310c2113df9d Author: litingting Date: Fri Apr 18 17:01:42 2025 +0800 V1.0.0(1) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..165bf57 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +app/src/test/java/com/draw/painting/test/ExampleUnitTest.java +.idea/ +.safedk/ diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/ARSketch.jks b/app/ARSketch.jks new file mode 100644 index 0000000..1455e57 Binary files /dev/null and b/app/ARSketch.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..7053ed8 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,82 @@ +import java.util.Date +import java.text.SimpleDateFormat + +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") +// id("com.google.firebase.crashlytics") +// id("com.google.gms.google-services") + id("io.objectbox") +} +val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) +android { + namespace = "com.ar.sketch.paint.drawing" + compileSdk = 34 + + defaultConfig { + //com.ar.sketch.paint.drawing + applicationId = "com.ar.sketch.paint.drawing.test" + minSdk = 23 + targetSdk = 34 + versionCode = 1 + versionName = "1.0.0" + setProperty( + "archivesBaseName", + "AR Sketch_V" + versionName + "(${versionCode})_$timestamp" + ) + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isDebuggable = true + isMinifyEnabled = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +// kotlinOptions { +// jvmTarget = "1.8" +// } + buildFeatures { + viewBinding = true + } +} + +dependencies { + + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") +// implementation("com.google.android.gms:play-services-location:21.3.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + + val camerax_version = "1.1.0-beta01" + //noinspection GradleDependency + implementation("androidx.camera:camera-core:${camerax_version}") + //noinspection GradleDependency + implementation("androidx.camera:camera-camera2:${camerax_version}") + //noinspection GradleDependency + implementation("androidx.camera:camera-lifecycle:${camerax_version}") + //noinspection GradleDependency +// implementation("androidx.camera:camera-video:${camerax_version}") + //noinspection GradleDependency + implementation("androidx.camera:camera-view:${camerax_version}") + //noinspection GradleDependency + implementation("androidx.camera:camera-extensions:${camerax_version}") + + implementation ("com.squareup.okhttp3:okhttp:4.12.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") + + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + implementation("com.google.android.gms:play-services-appset:16.0.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") +} \ No newline at end of file diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json new file mode 100644 index 0000000..9093113 --- /dev/null +++ b/app/objectbox-models/default.json @@ -0,0 +1,80 @@ +{ + "_note1": "KEEP THIS FILE! Check it into a version control system (VCS) like git.", + "_note2": "ObjectBox manages crucial IDs for your object model. See docs for details.", + "_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.", + "entities": [ + { + "id": "8:6670847138360228949", + "lastPropertyId": "2:3904212037995116562", + "name": "ImportData", + "properties": [ + { + "id": "1:2427539937749311109", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:3904212037995116562", + "name": "uri", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "9:173667538405234965", + "lastPropertyId": "2:3466597009432403945", + "name": "LocalData", + "properties": [ + { + "id": "1:8753926369376196392", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:3466597009432403945", + "name": "path", + "type": 9 + } + ], + "relations": [] + } + ], + "lastEntityId": "9:173667538405234965", + "lastIndexId": "0:0", + "lastRelationId": "0:0", + "lastSequenceId": "0:0", + "modelVersion": 5, + "modelVersionParserMinimum": 5, + "retiredEntityUids": [ + 4752690921563405782, + 3683195988363348208, + 3825568787982449740, + 6657683755955689878, + 407850772463518772, + 7538851138417121743, + 463965928465774918 + ], + "retiredIndexUids": [], + "retiredPropertyUids": [ + 8935738795063358965, + 6634881448055585465, + 5221624129603754986, + 5984527578734576412, + 804363456560139643, + 1837531769919373488, + 5348030114980625145, + 243415540686520025, + 7391488554923755890, + 481535799621363836, + 8358790201098602109, + 3359943781002877658, + 9141214615690805226, + 6460664315532313231, + 5181380632390917246 + ], + "retiredRelationUids": [], + "version": 1 +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..cf50408 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,22 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile + diff --git a/app/src/androidTest/java/com/paint/ar/drawing/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/paint/ar/drawing/ExampleInstrumentedTest.java new file mode 100644 index 0000000..c2fce35 --- /dev/null +++ b/app/src/androidTest/java/com/paint/ar/drawing/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.ar.sketch.paint.drawing; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.draw.painting.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..d8b9894 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/myfont.ttf b/app/src/main/assets/myfont.ttf new file mode 100644 index 0000000..23e4502 Binary files /dev/null and b/app/src/main/assets/myfont.ttf differ diff --git a/app/src/main/assets/res_Animals/1.jpg b/app/src/main/assets/res_Animals/1.jpg new file mode 100644 index 0000000..9488c65 Binary files /dev/null and b/app/src/main/assets/res_Animals/1.jpg differ diff --git a/app/src/main/assets/res_Animals/10.jpg b/app/src/main/assets/res_Animals/10.jpg new file mode 100644 index 0000000..78382a4 Binary files /dev/null and b/app/src/main/assets/res_Animals/10.jpg differ diff --git a/app/src/main/assets/res_Animals/11.jpg b/app/src/main/assets/res_Animals/11.jpg new file mode 100644 index 0000000..a4f7512 Binary files /dev/null and b/app/src/main/assets/res_Animals/11.jpg differ diff --git a/app/src/main/assets/res_Animals/12.jpg b/app/src/main/assets/res_Animals/12.jpg new file mode 100644 index 0000000..bab3cff Binary files /dev/null and b/app/src/main/assets/res_Animals/12.jpg differ diff --git a/app/src/main/assets/res_Animals/13.jpg b/app/src/main/assets/res_Animals/13.jpg new file mode 100644 index 0000000..5c3ef19 Binary files /dev/null and b/app/src/main/assets/res_Animals/13.jpg differ diff --git a/app/src/main/assets/res_Animals/14.jpg b/app/src/main/assets/res_Animals/14.jpg new file mode 100644 index 0000000..8b446f2 Binary files /dev/null and b/app/src/main/assets/res_Animals/14.jpg differ diff --git a/app/src/main/assets/res_Animals/15.jpg b/app/src/main/assets/res_Animals/15.jpg new file mode 100644 index 0000000..2f9dc4e Binary files /dev/null and b/app/src/main/assets/res_Animals/15.jpg differ diff --git a/app/src/main/assets/res_Animals/16.jpg b/app/src/main/assets/res_Animals/16.jpg new file mode 100644 index 0000000..aad9788 Binary files /dev/null and b/app/src/main/assets/res_Animals/16.jpg differ diff --git a/app/src/main/assets/res_Animals/17.jpg b/app/src/main/assets/res_Animals/17.jpg new file mode 100644 index 0000000..17c6f07 Binary files /dev/null and b/app/src/main/assets/res_Animals/17.jpg differ diff --git a/app/src/main/assets/res_Animals/18.jpg b/app/src/main/assets/res_Animals/18.jpg new file mode 100644 index 0000000..2ce93a7 Binary files /dev/null and b/app/src/main/assets/res_Animals/18.jpg differ diff --git a/app/src/main/assets/res_Animals/19.jpg b/app/src/main/assets/res_Animals/19.jpg new file mode 100644 index 0000000..2b24f31 Binary files /dev/null and b/app/src/main/assets/res_Animals/19.jpg differ diff --git a/app/src/main/assets/res_Animals/2.jpg b/app/src/main/assets/res_Animals/2.jpg new file mode 100644 index 0000000..0a0c2e7 Binary files /dev/null and b/app/src/main/assets/res_Animals/2.jpg differ diff --git a/app/src/main/assets/res_Animals/20.jpg b/app/src/main/assets/res_Animals/20.jpg new file mode 100644 index 0000000..347cddc Binary files /dev/null and b/app/src/main/assets/res_Animals/20.jpg differ diff --git a/app/src/main/assets/res_Animals/21.jpg b/app/src/main/assets/res_Animals/21.jpg new file mode 100644 index 0000000..5a04764 Binary files /dev/null and b/app/src/main/assets/res_Animals/21.jpg differ diff --git a/app/src/main/assets/res_Animals/22.jpg b/app/src/main/assets/res_Animals/22.jpg new file mode 100644 index 0000000..c18d8ad Binary files /dev/null and b/app/src/main/assets/res_Animals/22.jpg differ diff --git a/app/src/main/assets/res_Animals/23.jpg b/app/src/main/assets/res_Animals/23.jpg new file mode 100644 index 0000000..4270d19 Binary files /dev/null and b/app/src/main/assets/res_Animals/23.jpg differ diff --git a/app/src/main/assets/res_Animals/24.jpg b/app/src/main/assets/res_Animals/24.jpg new file mode 100644 index 0000000..355a944 Binary files /dev/null and b/app/src/main/assets/res_Animals/24.jpg differ diff --git a/app/src/main/assets/res_Animals/25.jpg b/app/src/main/assets/res_Animals/25.jpg new file mode 100644 index 0000000..c670943 Binary files /dev/null and b/app/src/main/assets/res_Animals/25.jpg differ diff --git a/app/src/main/assets/res_Animals/26.jpg b/app/src/main/assets/res_Animals/26.jpg new file mode 100644 index 0000000..4b95b01 Binary files /dev/null and b/app/src/main/assets/res_Animals/26.jpg differ diff --git a/app/src/main/assets/res_Animals/27.jpg b/app/src/main/assets/res_Animals/27.jpg new file mode 100644 index 0000000..87a8c12 Binary files /dev/null and b/app/src/main/assets/res_Animals/27.jpg differ diff --git a/app/src/main/assets/res_Animals/28.jpg b/app/src/main/assets/res_Animals/28.jpg new file mode 100644 index 0000000..770686a Binary files /dev/null and b/app/src/main/assets/res_Animals/28.jpg differ diff --git a/app/src/main/assets/res_Animals/29.jpg b/app/src/main/assets/res_Animals/29.jpg new file mode 100644 index 0000000..7127a11 Binary files /dev/null and b/app/src/main/assets/res_Animals/29.jpg differ diff --git a/app/src/main/assets/res_Animals/3.jpg b/app/src/main/assets/res_Animals/3.jpg new file mode 100644 index 0000000..4bf4897 Binary files /dev/null and b/app/src/main/assets/res_Animals/3.jpg differ diff --git a/app/src/main/assets/res_Animals/30.jpg b/app/src/main/assets/res_Animals/30.jpg new file mode 100644 index 0000000..f1d2047 Binary files /dev/null and b/app/src/main/assets/res_Animals/30.jpg differ diff --git a/app/src/main/assets/res_Animals/31.jpg b/app/src/main/assets/res_Animals/31.jpg new file mode 100644 index 0000000..0d08aa8 Binary files /dev/null and b/app/src/main/assets/res_Animals/31.jpg differ diff --git a/app/src/main/assets/res_Animals/4.jpg b/app/src/main/assets/res_Animals/4.jpg new file mode 100644 index 0000000..838c582 Binary files /dev/null and b/app/src/main/assets/res_Animals/4.jpg differ diff --git a/app/src/main/assets/res_Animals/5.jpg b/app/src/main/assets/res_Animals/5.jpg new file mode 100644 index 0000000..36bd2bf Binary files /dev/null and b/app/src/main/assets/res_Animals/5.jpg differ diff --git a/app/src/main/assets/res_Animals/6.jpg b/app/src/main/assets/res_Animals/6.jpg new file mode 100644 index 0000000..dceb49b Binary files /dev/null and b/app/src/main/assets/res_Animals/6.jpg differ diff --git a/app/src/main/assets/res_Animals/7.jpg b/app/src/main/assets/res_Animals/7.jpg new file mode 100644 index 0000000..ebd4694 Binary files /dev/null and b/app/src/main/assets/res_Animals/7.jpg differ diff --git a/app/src/main/assets/res_Animals/8.jpg b/app/src/main/assets/res_Animals/8.jpg new file mode 100644 index 0000000..e5e3c63 Binary files /dev/null and b/app/src/main/assets/res_Animals/8.jpg differ diff --git a/app/src/main/assets/res_Animals/9.jpg b/app/src/main/assets/res_Animals/9.jpg new file mode 100644 index 0000000..e7a1862 Binary files /dev/null and b/app/src/main/assets/res_Animals/9.jpg differ diff --git a/app/src/main/assets/res_Birds/1.jpg b/app/src/main/assets/res_Birds/1.jpg new file mode 100644 index 0000000..d235225 Binary files /dev/null and b/app/src/main/assets/res_Birds/1.jpg differ diff --git a/app/src/main/assets/res_Birds/10.jpg b/app/src/main/assets/res_Birds/10.jpg new file mode 100644 index 0000000..e348ffe Binary files /dev/null and b/app/src/main/assets/res_Birds/10.jpg differ diff --git a/app/src/main/assets/res_Birds/11.jpg b/app/src/main/assets/res_Birds/11.jpg new file mode 100644 index 0000000..921b5b9 Binary files /dev/null and b/app/src/main/assets/res_Birds/11.jpg differ diff --git a/app/src/main/assets/res_Birds/12.jpg b/app/src/main/assets/res_Birds/12.jpg new file mode 100644 index 0000000..7b4055b Binary files /dev/null and b/app/src/main/assets/res_Birds/12.jpg differ diff --git a/app/src/main/assets/res_Birds/13.jpg b/app/src/main/assets/res_Birds/13.jpg new file mode 100644 index 0000000..021b7a4 Binary files /dev/null and b/app/src/main/assets/res_Birds/13.jpg differ diff --git a/app/src/main/assets/res_Birds/14.jpg b/app/src/main/assets/res_Birds/14.jpg new file mode 100644 index 0000000..2074c6f Binary files /dev/null and b/app/src/main/assets/res_Birds/14.jpg differ diff --git a/app/src/main/assets/res_Birds/15.jpg b/app/src/main/assets/res_Birds/15.jpg new file mode 100644 index 0000000..59b0e47 Binary files /dev/null and b/app/src/main/assets/res_Birds/15.jpg differ diff --git a/app/src/main/assets/res_Birds/16.jpg b/app/src/main/assets/res_Birds/16.jpg new file mode 100644 index 0000000..fe950d1 Binary files /dev/null and b/app/src/main/assets/res_Birds/16.jpg differ diff --git a/app/src/main/assets/res_Birds/17.jpg b/app/src/main/assets/res_Birds/17.jpg new file mode 100644 index 0000000..484f39a Binary files /dev/null and b/app/src/main/assets/res_Birds/17.jpg differ diff --git a/app/src/main/assets/res_Birds/18.jpg b/app/src/main/assets/res_Birds/18.jpg new file mode 100644 index 0000000..2792ed1 Binary files /dev/null and b/app/src/main/assets/res_Birds/18.jpg differ diff --git a/app/src/main/assets/res_Birds/19.jpg b/app/src/main/assets/res_Birds/19.jpg new file mode 100644 index 0000000..9e9bb27 Binary files /dev/null and b/app/src/main/assets/res_Birds/19.jpg differ diff --git a/app/src/main/assets/res_Birds/2.jpg b/app/src/main/assets/res_Birds/2.jpg new file mode 100644 index 0000000..0929272 Binary files /dev/null and b/app/src/main/assets/res_Birds/2.jpg differ diff --git a/app/src/main/assets/res_Birds/3.jpg b/app/src/main/assets/res_Birds/3.jpg new file mode 100644 index 0000000..1376a50 Binary files /dev/null and b/app/src/main/assets/res_Birds/3.jpg differ diff --git a/app/src/main/assets/res_Birds/4.jpg b/app/src/main/assets/res_Birds/4.jpg new file mode 100644 index 0000000..1cd8f9c Binary files /dev/null and b/app/src/main/assets/res_Birds/4.jpg differ diff --git a/app/src/main/assets/res_Birds/5.jpg b/app/src/main/assets/res_Birds/5.jpg new file mode 100644 index 0000000..7637589 Binary files /dev/null and b/app/src/main/assets/res_Birds/5.jpg differ diff --git a/app/src/main/assets/res_Birds/6.jpg b/app/src/main/assets/res_Birds/6.jpg new file mode 100644 index 0000000..3bf16b6 Binary files /dev/null and b/app/src/main/assets/res_Birds/6.jpg differ diff --git a/app/src/main/assets/res_Birds/7.jpg b/app/src/main/assets/res_Birds/7.jpg new file mode 100644 index 0000000..076e51d Binary files /dev/null and b/app/src/main/assets/res_Birds/7.jpg differ diff --git a/app/src/main/assets/res_Birds/8.jpg b/app/src/main/assets/res_Birds/8.jpg new file mode 100644 index 0000000..71f5cf7 Binary files /dev/null and b/app/src/main/assets/res_Birds/8.jpg differ diff --git a/app/src/main/assets/res_Birds/9.jpg b/app/src/main/assets/res_Birds/9.jpg new file mode 100644 index 0000000..8767032 Binary files /dev/null and b/app/src/main/assets/res_Birds/9.jpg differ diff --git a/app/src/main/assets/res_Butterfly/1.jpg b/app/src/main/assets/res_Butterfly/1.jpg new file mode 100644 index 0000000..0d713b7 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/1.jpg differ diff --git a/app/src/main/assets/res_Butterfly/10.jpg b/app/src/main/assets/res_Butterfly/10.jpg new file mode 100644 index 0000000..ae497c8 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/10.jpg differ diff --git a/app/src/main/assets/res_Butterfly/11.jpg b/app/src/main/assets/res_Butterfly/11.jpg new file mode 100644 index 0000000..d2e39ef Binary files /dev/null and b/app/src/main/assets/res_Butterfly/11.jpg differ diff --git a/app/src/main/assets/res_Butterfly/12.jpg b/app/src/main/assets/res_Butterfly/12.jpg new file mode 100644 index 0000000..410af7c Binary files /dev/null and b/app/src/main/assets/res_Butterfly/12.jpg differ diff --git a/app/src/main/assets/res_Butterfly/13.jpg b/app/src/main/assets/res_Butterfly/13.jpg new file mode 100644 index 0000000..233a998 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/13.jpg differ diff --git a/app/src/main/assets/res_Butterfly/14.jpg b/app/src/main/assets/res_Butterfly/14.jpg new file mode 100644 index 0000000..9545c0f Binary files /dev/null and b/app/src/main/assets/res_Butterfly/14.jpg differ diff --git a/app/src/main/assets/res_Butterfly/15.jpg b/app/src/main/assets/res_Butterfly/15.jpg new file mode 100644 index 0000000..aa0da5b Binary files /dev/null and b/app/src/main/assets/res_Butterfly/15.jpg differ diff --git a/app/src/main/assets/res_Butterfly/16.jpg b/app/src/main/assets/res_Butterfly/16.jpg new file mode 100644 index 0000000..4b118cf Binary files /dev/null and b/app/src/main/assets/res_Butterfly/16.jpg differ diff --git a/app/src/main/assets/res_Butterfly/17.jpg b/app/src/main/assets/res_Butterfly/17.jpg new file mode 100644 index 0000000..ebfdc2e Binary files /dev/null and b/app/src/main/assets/res_Butterfly/17.jpg differ diff --git a/app/src/main/assets/res_Butterfly/18.jpg b/app/src/main/assets/res_Butterfly/18.jpg new file mode 100644 index 0000000..7b81ca1 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/18.jpg differ diff --git a/app/src/main/assets/res_Butterfly/19.jpg b/app/src/main/assets/res_Butterfly/19.jpg new file mode 100644 index 0000000..903fd82 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/19.jpg differ diff --git a/app/src/main/assets/res_Butterfly/2.jpg b/app/src/main/assets/res_Butterfly/2.jpg new file mode 100644 index 0000000..f92c438 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/2.jpg differ diff --git a/app/src/main/assets/res_Butterfly/20.jpg b/app/src/main/assets/res_Butterfly/20.jpg new file mode 100644 index 0000000..7d0dc2e Binary files /dev/null and b/app/src/main/assets/res_Butterfly/20.jpg differ diff --git a/app/src/main/assets/res_Butterfly/21.jpg b/app/src/main/assets/res_Butterfly/21.jpg new file mode 100644 index 0000000..ff82d93 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/21.jpg differ diff --git a/app/src/main/assets/res_Butterfly/3.jpg b/app/src/main/assets/res_Butterfly/3.jpg new file mode 100644 index 0000000..5251134 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/3.jpg differ diff --git a/app/src/main/assets/res_Butterfly/4.jpg b/app/src/main/assets/res_Butterfly/4.jpg new file mode 100644 index 0000000..01d5932 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/4.jpg differ diff --git a/app/src/main/assets/res_Butterfly/5.jpg b/app/src/main/assets/res_Butterfly/5.jpg new file mode 100644 index 0000000..cc99ed5 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/5.jpg differ diff --git a/app/src/main/assets/res_Butterfly/6.jpg b/app/src/main/assets/res_Butterfly/6.jpg new file mode 100644 index 0000000..6d02805 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/6.jpg differ diff --git a/app/src/main/assets/res_Butterfly/7.jpg b/app/src/main/assets/res_Butterfly/7.jpg new file mode 100644 index 0000000..dd52dbd Binary files /dev/null and b/app/src/main/assets/res_Butterfly/7.jpg differ diff --git a/app/src/main/assets/res_Butterfly/8.jpg b/app/src/main/assets/res_Butterfly/8.jpg new file mode 100644 index 0000000..d519ca7 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/8.jpg differ diff --git a/app/src/main/assets/res_Butterfly/9.jpg b/app/src/main/assets/res_Butterfly/9.jpg new file mode 100644 index 0000000..0cedb47 Binary files /dev/null and b/app/src/main/assets/res_Butterfly/9.jpg differ diff --git a/app/src/main/assets/res_Cafe/1.jpg b/app/src/main/assets/res_Cafe/1.jpg new file mode 100644 index 0000000..b347b44 Binary files /dev/null and b/app/src/main/assets/res_Cafe/1.jpg differ diff --git a/app/src/main/assets/res_Cafe/10.jpg b/app/src/main/assets/res_Cafe/10.jpg new file mode 100644 index 0000000..3728490 Binary files /dev/null and b/app/src/main/assets/res_Cafe/10.jpg differ diff --git a/app/src/main/assets/res_Cafe/11.jpg b/app/src/main/assets/res_Cafe/11.jpg new file mode 100644 index 0000000..bff21e1 Binary files /dev/null and b/app/src/main/assets/res_Cafe/11.jpg differ diff --git a/app/src/main/assets/res_Cafe/12.jpg b/app/src/main/assets/res_Cafe/12.jpg new file mode 100644 index 0000000..3966d4a Binary files /dev/null and b/app/src/main/assets/res_Cafe/12.jpg differ diff --git a/app/src/main/assets/res_Cafe/13.jpg b/app/src/main/assets/res_Cafe/13.jpg new file mode 100644 index 0000000..8200e12 Binary files /dev/null and b/app/src/main/assets/res_Cafe/13.jpg differ diff --git a/app/src/main/assets/res_Cafe/14.jpg b/app/src/main/assets/res_Cafe/14.jpg new file mode 100644 index 0000000..65ee383 Binary files /dev/null and b/app/src/main/assets/res_Cafe/14.jpg differ diff --git a/app/src/main/assets/res_Cafe/15.jpg b/app/src/main/assets/res_Cafe/15.jpg new file mode 100644 index 0000000..01df5e5 Binary files /dev/null and b/app/src/main/assets/res_Cafe/15.jpg differ diff --git a/app/src/main/assets/res_Cafe/16.jpg b/app/src/main/assets/res_Cafe/16.jpg new file mode 100644 index 0000000..ff679c1 Binary files /dev/null and b/app/src/main/assets/res_Cafe/16.jpg differ diff --git a/app/src/main/assets/res_Cafe/17.jpg b/app/src/main/assets/res_Cafe/17.jpg new file mode 100644 index 0000000..42fdf87 Binary files /dev/null and b/app/src/main/assets/res_Cafe/17.jpg differ diff --git a/app/src/main/assets/res_Cafe/18.jpg b/app/src/main/assets/res_Cafe/18.jpg new file mode 100644 index 0000000..06d300e Binary files /dev/null and b/app/src/main/assets/res_Cafe/18.jpg differ diff --git a/app/src/main/assets/res_Cafe/19.jpg b/app/src/main/assets/res_Cafe/19.jpg new file mode 100644 index 0000000..42aaa2c Binary files /dev/null and b/app/src/main/assets/res_Cafe/19.jpg differ diff --git a/app/src/main/assets/res_Cafe/2.jpg b/app/src/main/assets/res_Cafe/2.jpg new file mode 100644 index 0000000..14d9b25 Binary files /dev/null and b/app/src/main/assets/res_Cafe/2.jpg differ diff --git a/app/src/main/assets/res_Cafe/20.jpg b/app/src/main/assets/res_Cafe/20.jpg new file mode 100644 index 0000000..5dad84c Binary files /dev/null and b/app/src/main/assets/res_Cafe/20.jpg differ diff --git a/app/src/main/assets/res_Cafe/21.jpg b/app/src/main/assets/res_Cafe/21.jpg new file mode 100644 index 0000000..c019faa Binary files /dev/null and b/app/src/main/assets/res_Cafe/21.jpg differ diff --git a/app/src/main/assets/res_Cafe/22.jpg b/app/src/main/assets/res_Cafe/22.jpg new file mode 100644 index 0000000..28cdc4e Binary files /dev/null and b/app/src/main/assets/res_Cafe/22.jpg differ diff --git a/app/src/main/assets/res_Cafe/23.jpg b/app/src/main/assets/res_Cafe/23.jpg new file mode 100644 index 0000000..973a5c2 Binary files /dev/null and b/app/src/main/assets/res_Cafe/23.jpg differ diff --git a/app/src/main/assets/res_Cafe/24.jpg b/app/src/main/assets/res_Cafe/24.jpg new file mode 100644 index 0000000..3c36d8a Binary files /dev/null and b/app/src/main/assets/res_Cafe/24.jpg differ diff --git a/app/src/main/assets/res_Cafe/25.jpg b/app/src/main/assets/res_Cafe/25.jpg new file mode 100644 index 0000000..c7be496 Binary files /dev/null and b/app/src/main/assets/res_Cafe/25.jpg differ diff --git a/app/src/main/assets/res_Cafe/26.jpg b/app/src/main/assets/res_Cafe/26.jpg new file mode 100644 index 0000000..7229696 Binary files /dev/null and b/app/src/main/assets/res_Cafe/26.jpg differ diff --git a/app/src/main/assets/res_Cafe/27.jpg b/app/src/main/assets/res_Cafe/27.jpg new file mode 100644 index 0000000..f857542 Binary files /dev/null and b/app/src/main/assets/res_Cafe/27.jpg differ diff --git a/app/src/main/assets/res_Cafe/28.jpg b/app/src/main/assets/res_Cafe/28.jpg new file mode 100644 index 0000000..8cde6de Binary files /dev/null and b/app/src/main/assets/res_Cafe/28.jpg differ diff --git a/app/src/main/assets/res_Cafe/29.jpg b/app/src/main/assets/res_Cafe/29.jpg new file mode 100644 index 0000000..8affd30 Binary files /dev/null and b/app/src/main/assets/res_Cafe/29.jpg differ diff --git a/app/src/main/assets/res_Cafe/3.jpg b/app/src/main/assets/res_Cafe/3.jpg new file mode 100644 index 0000000..b1c3cfa Binary files /dev/null and b/app/src/main/assets/res_Cafe/3.jpg differ diff --git a/app/src/main/assets/res_Cafe/30.jpg b/app/src/main/assets/res_Cafe/30.jpg new file mode 100644 index 0000000..f71ce84 Binary files /dev/null and b/app/src/main/assets/res_Cafe/30.jpg differ diff --git a/app/src/main/assets/res_Cafe/31.jpg b/app/src/main/assets/res_Cafe/31.jpg new file mode 100644 index 0000000..a5d22ca Binary files /dev/null and b/app/src/main/assets/res_Cafe/31.jpg differ diff --git a/app/src/main/assets/res_Cafe/32.jpg b/app/src/main/assets/res_Cafe/32.jpg new file mode 100644 index 0000000..8513a5e Binary files /dev/null and b/app/src/main/assets/res_Cafe/32.jpg differ diff --git a/app/src/main/assets/res_Cafe/33.jpg b/app/src/main/assets/res_Cafe/33.jpg new file mode 100644 index 0000000..fcdcbcc Binary files /dev/null and b/app/src/main/assets/res_Cafe/33.jpg differ diff --git a/app/src/main/assets/res_Cafe/34.jpg b/app/src/main/assets/res_Cafe/34.jpg new file mode 100644 index 0000000..51bbf4b Binary files /dev/null and b/app/src/main/assets/res_Cafe/34.jpg differ diff --git a/app/src/main/assets/res_Cafe/35.jpg b/app/src/main/assets/res_Cafe/35.jpg new file mode 100644 index 0000000..e1067da Binary files /dev/null and b/app/src/main/assets/res_Cafe/35.jpg differ diff --git a/app/src/main/assets/res_Cafe/36.jpg b/app/src/main/assets/res_Cafe/36.jpg new file mode 100644 index 0000000..181a84a Binary files /dev/null and b/app/src/main/assets/res_Cafe/36.jpg differ diff --git a/app/src/main/assets/res_Cafe/37.jpg b/app/src/main/assets/res_Cafe/37.jpg new file mode 100644 index 0000000..d8ffb00 Binary files /dev/null and b/app/src/main/assets/res_Cafe/37.jpg differ diff --git a/app/src/main/assets/res_Cafe/38.jpg b/app/src/main/assets/res_Cafe/38.jpg new file mode 100644 index 0000000..abdba50 Binary files /dev/null and b/app/src/main/assets/res_Cafe/38.jpg differ diff --git a/app/src/main/assets/res_Cafe/4.jpg b/app/src/main/assets/res_Cafe/4.jpg new file mode 100644 index 0000000..8792f16 Binary files /dev/null and b/app/src/main/assets/res_Cafe/4.jpg differ diff --git a/app/src/main/assets/res_Cafe/5.jpg b/app/src/main/assets/res_Cafe/5.jpg new file mode 100644 index 0000000..89630aa Binary files /dev/null and b/app/src/main/assets/res_Cafe/5.jpg differ diff --git a/app/src/main/assets/res_Cafe/6.jpg b/app/src/main/assets/res_Cafe/6.jpg new file mode 100644 index 0000000..7e6832e Binary files /dev/null and b/app/src/main/assets/res_Cafe/6.jpg differ diff --git a/app/src/main/assets/res_Cafe/7.jpg b/app/src/main/assets/res_Cafe/7.jpg new file mode 100644 index 0000000..f4d2afb Binary files /dev/null and b/app/src/main/assets/res_Cafe/7.jpg differ diff --git a/app/src/main/assets/res_Cafe/8.jpg b/app/src/main/assets/res_Cafe/8.jpg new file mode 100644 index 0000000..78f5ccf Binary files /dev/null and b/app/src/main/assets/res_Cafe/8.jpg differ diff --git a/app/src/main/assets/res_Cafe/9.jpg b/app/src/main/assets/res_Cafe/9.jpg new file mode 100644 index 0000000..4038bb5 Binary files /dev/null and b/app/src/main/assets/res_Cafe/9.jpg differ diff --git a/app/src/main/assets/res_Cartoons/1.jpg b/app/src/main/assets/res_Cartoons/1.jpg new file mode 100644 index 0000000..74bf123 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/1.jpg differ diff --git a/app/src/main/assets/res_Cartoons/10.jpg b/app/src/main/assets/res_Cartoons/10.jpg new file mode 100644 index 0000000..450fa6e Binary files /dev/null and b/app/src/main/assets/res_Cartoons/10.jpg differ diff --git a/app/src/main/assets/res_Cartoons/11.jpg b/app/src/main/assets/res_Cartoons/11.jpg new file mode 100644 index 0000000..1f2a904 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/11.jpg differ diff --git a/app/src/main/assets/res_Cartoons/12.jpg b/app/src/main/assets/res_Cartoons/12.jpg new file mode 100644 index 0000000..86ef206 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/12.jpg differ diff --git a/app/src/main/assets/res_Cartoons/13.jpg b/app/src/main/assets/res_Cartoons/13.jpg new file mode 100644 index 0000000..92e1d75 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/13.jpg differ diff --git a/app/src/main/assets/res_Cartoons/14.jpg b/app/src/main/assets/res_Cartoons/14.jpg new file mode 100644 index 0000000..c82e897 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/14.jpg differ diff --git a/app/src/main/assets/res_Cartoons/15.jpg b/app/src/main/assets/res_Cartoons/15.jpg new file mode 100644 index 0000000..bcd8678 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/15.jpg differ diff --git a/app/src/main/assets/res_Cartoons/16.jpg b/app/src/main/assets/res_Cartoons/16.jpg new file mode 100644 index 0000000..18377bd Binary files /dev/null and b/app/src/main/assets/res_Cartoons/16.jpg differ diff --git a/app/src/main/assets/res_Cartoons/17.jpg b/app/src/main/assets/res_Cartoons/17.jpg new file mode 100644 index 0000000..45aafbb Binary files /dev/null and b/app/src/main/assets/res_Cartoons/17.jpg differ diff --git a/app/src/main/assets/res_Cartoons/18.jpg b/app/src/main/assets/res_Cartoons/18.jpg new file mode 100644 index 0000000..048d253 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/18.jpg differ diff --git a/app/src/main/assets/res_Cartoons/19.jpg b/app/src/main/assets/res_Cartoons/19.jpg new file mode 100644 index 0000000..c2501b2 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/19.jpg differ diff --git a/app/src/main/assets/res_Cartoons/2.jpg b/app/src/main/assets/res_Cartoons/2.jpg new file mode 100644 index 0000000..8baf95b Binary files /dev/null and b/app/src/main/assets/res_Cartoons/2.jpg differ diff --git a/app/src/main/assets/res_Cartoons/20.jpg b/app/src/main/assets/res_Cartoons/20.jpg new file mode 100644 index 0000000..fb7901c Binary files /dev/null and b/app/src/main/assets/res_Cartoons/20.jpg differ diff --git a/app/src/main/assets/res_Cartoons/21.jpg b/app/src/main/assets/res_Cartoons/21.jpg new file mode 100644 index 0000000..ed7104e Binary files /dev/null and b/app/src/main/assets/res_Cartoons/21.jpg differ diff --git a/app/src/main/assets/res_Cartoons/22.jpg b/app/src/main/assets/res_Cartoons/22.jpg new file mode 100644 index 0000000..cd003eb Binary files /dev/null and b/app/src/main/assets/res_Cartoons/22.jpg differ diff --git a/app/src/main/assets/res_Cartoons/23.jpg b/app/src/main/assets/res_Cartoons/23.jpg new file mode 100644 index 0000000..77b49a4 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/23.jpg differ diff --git a/app/src/main/assets/res_Cartoons/24.jpg b/app/src/main/assets/res_Cartoons/24.jpg new file mode 100644 index 0000000..1c7dc65 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/24.jpg differ diff --git a/app/src/main/assets/res_Cartoons/25.jpg b/app/src/main/assets/res_Cartoons/25.jpg new file mode 100644 index 0000000..442aec2 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/25.jpg differ diff --git a/app/src/main/assets/res_Cartoons/26.jpg b/app/src/main/assets/res_Cartoons/26.jpg new file mode 100644 index 0000000..ec4a2ff Binary files /dev/null and b/app/src/main/assets/res_Cartoons/26.jpg differ diff --git a/app/src/main/assets/res_Cartoons/3.jpg b/app/src/main/assets/res_Cartoons/3.jpg new file mode 100644 index 0000000..e099902 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/3.jpg differ diff --git a/app/src/main/assets/res_Cartoons/4.jpg b/app/src/main/assets/res_Cartoons/4.jpg new file mode 100644 index 0000000..a4c69ba Binary files /dev/null and b/app/src/main/assets/res_Cartoons/4.jpg differ diff --git a/app/src/main/assets/res_Cartoons/5.jpg b/app/src/main/assets/res_Cartoons/5.jpg new file mode 100644 index 0000000..b32485d Binary files /dev/null and b/app/src/main/assets/res_Cartoons/5.jpg differ diff --git a/app/src/main/assets/res_Cartoons/6.jpg b/app/src/main/assets/res_Cartoons/6.jpg new file mode 100644 index 0000000..0e0a7ef Binary files /dev/null and b/app/src/main/assets/res_Cartoons/6.jpg differ diff --git a/app/src/main/assets/res_Cartoons/7.jpg b/app/src/main/assets/res_Cartoons/7.jpg new file mode 100644 index 0000000..ecd8dc0 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/7.jpg differ diff --git a/app/src/main/assets/res_Cartoons/8.jpg b/app/src/main/assets/res_Cartoons/8.jpg new file mode 100644 index 0000000..f6ea587 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/8.jpg differ diff --git a/app/src/main/assets/res_Cartoons/9.jpg b/app/src/main/assets/res_Cartoons/9.jpg new file mode 100644 index 0000000..da4c151 Binary files /dev/null and b/app/src/main/assets/res_Cartoons/9.jpg differ diff --git a/app/src/main/assets/res_Christmas/1.jpg b/app/src/main/assets/res_Christmas/1.jpg new file mode 100644 index 0000000..cc1fafb Binary files /dev/null and b/app/src/main/assets/res_Christmas/1.jpg differ diff --git a/app/src/main/assets/res_Christmas/10.jpg b/app/src/main/assets/res_Christmas/10.jpg new file mode 100644 index 0000000..e5e63d6 Binary files /dev/null and b/app/src/main/assets/res_Christmas/10.jpg differ diff --git a/app/src/main/assets/res_Christmas/11.jpg b/app/src/main/assets/res_Christmas/11.jpg new file mode 100644 index 0000000..cae5d66 Binary files /dev/null and b/app/src/main/assets/res_Christmas/11.jpg differ diff --git a/app/src/main/assets/res_Christmas/12.jpg b/app/src/main/assets/res_Christmas/12.jpg new file mode 100644 index 0000000..13fd21f Binary files /dev/null and b/app/src/main/assets/res_Christmas/12.jpg differ diff --git a/app/src/main/assets/res_Christmas/13.jpg b/app/src/main/assets/res_Christmas/13.jpg new file mode 100644 index 0000000..1fa30fe Binary files /dev/null and b/app/src/main/assets/res_Christmas/13.jpg differ diff --git a/app/src/main/assets/res_Christmas/14.jpg b/app/src/main/assets/res_Christmas/14.jpg new file mode 100644 index 0000000..aec6dcf Binary files /dev/null and b/app/src/main/assets/res_Christmas/14.jpg differ diff --git a/app/src/main/assets/res_Christmas/15.jpg b/app/src/main/assets/res_Christmas/15.jpg new file mode 100644 index 0000000..647c8b6 Binary files /dev/null and b/app/src/main/assets/res_Christmas/15.jpg differ diff --git a/app/src/main/assets/res_Christmas/16.jpg b/app/src/main/assets/res_Christmas/16.jpg new file mode 100644 index 0000000..b36a79c Binary files /dev/null and b/app/src/main/assets/res_Christmas/16.jpg differ diff --git a/app/src/main/assets/res_Christmas/17.jpg b/app/src/main/assets/res_Christmas/17.jpg new file mode 100644 index 0000000..2655af2 Binary files /dev/null and b/app/src/main/assets/res_Christmas/17.jpg differ diff --git a/app/src/main/assets/res_Christmas/18.jpg b/app/src/main/assets/res_Christmas/18.jpg new file mode 100644 index 0000000..e784d64 Binary files /dev/null and b/app/src/main/assets/res_Christmas/18.jpg differ diff --git a/app/src/main/assets/res_Christmas/19.jpg b/app/src/main/assets/res_Christmas/19.jpg new file mode 100644 index 0000000..fcf2085 Binary files /dev/null and b/app/src/main/assets/res_Christmas/19.jpg differ diff --git a/app/src/main/assets/res_Christmas/2.jpg b/app/src/main/assets/res_Christmas/2.jpg new file mode 100644 index 0000000..326e86b Binary files /dev/null and b/app/src/main/assets/res_Christmas/2.jpg differ diff --git a/app/src/main/assets/res_Christmas/20.jpg b/app/src/main/assets/res_Christmas/20.jpg new file mode 100644 index 0000000..a9e3c89 Binary files /dev/null and b/app/src/main/assets/res_Christmas/20.jpg differ diff --git a/app/src/main/assets/res_Christmas/21.jpg b/app/src/main/assets/res_Christmas/21.jpg new file mode 100644 index 0000000..71b4150 Binary files /dev/null and b/app/src/main/assets/res_Christmas/21.jpg differ diff --git a/app/src/main/assets/res_Christmas/22.jpg b/app/src/main/assets/res_Christmas/22.jpg new file mode 100644 index 0000000..3c99d0d Binary files /dev/null and b/app/src/main/assets/res_Christmas/22.jpg differ diff --git a/app/src/main/assets/res_Christmas/23.jpg b/app/src/main/assets/res_Christmas/23.jpg new file mode 100644 index 0000000..32c3b03 Binary files /dev/null and b/app/src/main/assets/res_Christmas/23.jpg differ diff --git a/app/src/main/assets/res_Christmas/24.jpg b/app/src/main/assets/res_Christmas/24.jpg new file mode 100644 index 0000000..80fd836 Binary files /dev/null and b/app/src/main/assets/res_Christmas/24.jpg differ diff --git a/app/src/main/assets/res_Christmas/25.jpg b/app/src/main/assets/res_Christmas/25.jpg new file mode 100644 index 0000000..8e2bef6 Binary files /dev/null and b/app/src/main/assets/res_Christmas/25.jpg differ diff --git a/app/src/main/assets/res_Christmas/3.jpg b/app/src/main/assets/res_Christmas/3.jpg new file mode 100644 index 0000000..4c24cd2 Binary files /dev/null and b/app/src/main/assets/res_Christmas/3.jpg differ diff --git a/app/src/main/assets/res_Christmas/4.jpg b/app/src/main/assets/res_Christmas/4.jpg new file mode 100644 index 0000000..28fb1b0 Binary files /dev/null and b/app/src/main/assets/res_Christmas/4.jpg differ diff --git a/app/src/main/assets/res_Christmas/5.jpg b/app/src/main/assets/res_Christmas/5.jpg new file mode 100644 index 0000000..93ad555 Binary files /dev/null and b/app/src/main/assets/res_Christmas/5.jpg differ diff --git a/app/src/main/assets/res_Christmas/6.jpg b/app/src/main/assets/res_Christmas/6.jpg new file mode 100644 index 0000000..02fe302 Binary files /dev/null and b/app/src/main/assets/res_Christmas/6.jpg differ diff --git a/app/src/main/assets/res_Christmas/7.jpg b/app/src/main/assets/res_Christmas/7.jpg new file mode 100644 index 0000000..dc41982 Binary files /dev/null and b/app/src/main/assets/res_Christmas/7.jpg differ diff --git a/app/src/main/assets/res_Christmas/8.jpg b/app/src/main/assets/res_Christmas/8.jpg new file mode 100644 index 0000000..5f13019 Binary files /dev/null and b/app/src/main/assets/res_Christmas/8.jpg differ diff --git a/app/src/main/assets/res_Christmas/9.jpg b/app/src/main/assets/res_Christmas/9.jpg new file mode 100644 index 0000000..e556980 Binary files /dev/null and b/app/src/main/assets/res_Christmas/9.jpg differ diff --git a/app/src/main/assets/res_Festivals/1.jpg b/app/src/main/assets/res_Festivals/1.jpg new file mode 100644 index 0000000..125d632 Binary files /dev/null and b/app/src/main/assets/res_Festivals/1.jpg differ diff --git a/app/src/main/assets/res_Festivals/10.jpg b/app/src/main/assets/res_Festivals/10.jpg new file mode 100644 index 0000000..d17b9f1 Binary files /dev/null and b/app/src/main/assets/res_Festivals/10.jpg differ diff --git a/app/src/main/assets/res_Festivals/11.jpg b/app/src/main/assets/res_Festivals/11.jpg new file mode 100644 index 0000000..702f052 Binary files /dev/null and b/app/src/main/assets/res_Festivals/11.jpg differ diff --git a/app/src/main/assets/res_Festivals/12.jpg b/app/src/main/assets/res_Festivals/12.jpg new file mode 100644 index 0000000..6f231e1 Binary files /dev/null and b/app/src/main/assets/res_Festivals/12.jpg differ diff --git a/app/src/main/assets/res_Festivals/13.jpg b/app/src/main/assets/res_Festivals/13.jpg new file mode 100644 index 0000000..20556a1 Binary files /dev/null and b/app/src/main/assets/res_Festivals/13.jpg differ diff --git a/app/src/main/assets/res_Festivals/14.jpg b/app/src/main/assets/res_Festivals/14.jpg new file mode 100644 index 0000000..fb78127 Binary files /dev/null and b/app/src/main/assets/res_Festivals/14.jpg differ diff --git a/app/src/main/assets/res_Festivals/15.jpg b/app/src/main/assets/res_Festivals/15.jpg new file mode 100644 index 0000000..e74f47e Binary files /dev/null and b/app/src/main/assets/res_Festivals/15.jpg differ diff --git a/app/src/main/assets/res_Festivals/16.jpg b/app/src/main/assets/res_Festivals/16.jpg new file mode 100644 index 0000000..136f6e8 Binary files /dev/null and b/app/src/main/assets/res_Festivals/16.jpg differ diff --git a/app/src/main/assets/res_Festivals/17.jpg b/app/src/main/assets/res_Festivals/17.jpg new file mode 100644 index 0000000..fd50e67 Binary files /dev/null and b/app/src/main/assets/res_Festivals/17.jpg differ diff --git a/app/src/main/assets/res_Festivals/18.jpg b/app/src/main/assets/res_Festivals/18.jpg new file mode 100644 index 0000000..d3f7936 Binary files /dev/null and b/app/src/main/assets/res_Festivals/18.jpg differ diff --git a/app/src/main/assets/res_Festivals/19.jpg b/app/src/main/assets/res_Festivals/19.jpg new file mode 100644 index 0000000..9a4f1b8 Binary files /dev/null and b/app/src/main/assets/res_Festivals/19.jpg differ diff --git a/app/src/main/assets/res_Festivals/2.jpg b/app/src/main/assets/res_Festivals/2.jpg new file mode 100644 index 0000000..84aa31a Binary files /dev/null and b/app/src/main/assets/res_Festivals/2.jpg differ diff --git a/app/src/main/assets/res_Festivals/20.jpg b/app/src/main/assets/res_Festivals/20.jpg new file mode 100644 index 0000000..268c943 Binary files /dev/null and b/app/src/main/assets/res_Festivals/20.jpg differ diff --git a/app/src/main/assets/res_Festivals/21.jpg b/app/src/main/assets/res_Festivals/21.jpg new file mode 100644 index 0000000..614bffd Binary files /dev/null and b/app/src/main/assets/res_Festivals/21.jpg differ diff --git a/app/src/main/assets/res_Festivals/22.jpg b/app/src/main/assets/res_Festivals/22.jpg new file mode 100644 index 0000000..f81eb8d Binary files /dev/null and b/app/src/main/assets/res_Festivals/22.jpg differ diff --git a/app/src/main/assets/res_Festivals/3.jpg b/app/src/main/assets/res_Festivals/3.jpg new file mode 100644 index 0000000..5ca2b11 Binary files /dev/null and b/app/src/main/assets/res_Festivals/3.jpg differ diff --git a/app/src/main/assets/res_Festivals/4.jpg b/app/src/main/assets/res_Festivals/4.jpg new file mode 100644 index 0000000..1f8cc81 Binary files /dev/null and b/app/src/main/assets/res_Festivals/4.jpg differ diff --git a/app/src/main/assets/res_Festivals/5.jpg b/app/src/main/assets/res_Festivals/5.jpg new file mode 100644 index 0000000..7f1bd1a Binary files /dev/null and b/app/src/main/assets/res_Festivals/5.jpg differ diff --git a/app/src/main/assets/res_Festivals/6.jpg b/app/src/main/assets/res_Festivals/6.jpg new file mode 100644 index 0000000..9cf832a Binary files /dev/null and b/app/src/main/assets/res_Festivals/6.jpg differ diff --git a/app/src/main/assets/res_Festivals/7.jpg b/app/src/main/assets/res_Festivals/7.jpg new file mode 100644 index 0000000..dcd83f3 Binary files /dev/null and b/app/src/main/assets/res_Festivals/7.jpg differ diff --git a/app/src/main/assets/res_Festivals/8.jpg b/app/src/main/assets/res_Festivals/8.jpg new file mode 100644 index 0000000..1117f09 Binary files /dev/null and b/app/src/main/assets/res_Festivals/8.jpg differ diff --git a/app/src/main/assets/res_Festivals/9.jpg b/app/src/main/assets/res_Festivals/9.jpg new file mode 100644 index 0000000..39d8467 Binary files /dev/null and b/app/src/main/assets/res_Festivals/9.jpg differ diff --git a/app/src/main/assets/res_Flowers/1.jpg b/app/src/main/assets/res_Flowers/1.jpg new file mode 100644 index 0000000..217d9c8 Binary files /dev/null and b/app/src/main/assets/res_Flowers/1.jpg differ diff --git a/app/src/main/assets/res_Flowers/10.jpg b/app/src/main/assets/res_Flowers/10.jpg new file mode 100644 index 0000000..ba84e61 Binary files /dev/null and b/app/src/main/assets/res_Flowers/10.jpg differ diff --git a/app/src/main/assets/res_Flowers/11.jpg b/app/src/main/assets/res_Flowers/11.jpg new file mode 100644 index 0000000..e579753 Binary files /dev/null and b/app/src/main/assets/res_Flowers/11.jpg differ diff --git a/app/src/main/assets/res_Flowers/12.jpg b/app/src/main/assets/res_Flowers/12.jpg new file mode 100644 index 0000000..26092f9 Binary files /dev/null and b/app/src/main/assets/res_Flowers/12.jpg differ diff --git a/app/src/main/assets/res_Flowers/13.jpg b/app/src/main/assets/res_Flowers/13.jpg new file mode 100644 index 0000000..41d2df3 Binary files /dev/null and b/app/src/main/assets/res_Flowers/13.jpg differ diff --git a/app/src/main/assets/res_Flowers/14.jpg b/app/src/main/assets/res_Flowers/14.jpg new file mode 100644 index 0000000..c44df66 Binary files /dev/null and b/app/src/main/assets/res_Flowers/14.jpg differ diff --git a/app/src/main/assets/res_Flowers/15.jpg b/app/src/main/assets/res_Flowers/15.jpg new file mode 100644 index 0000000..ea34d36 Binary files /dev/null and b/app/src/main/assets/res_Flowers/15.jpg differ diff --git a/app/src/main/assets/res_Flowers/16.jpg b/app/src/main/assets/res_Flowers/16.jpg new file mode 100644 index 0000000..506beb1 Binary files /dev/null and b/app/src/main/assets/res_Flowers/16.jpg differ diff --git a/app/src/main/assets/res_Flowers/17.jpg b/app/src/main/assets/res_Flowers/17.jpg new file mode 100644 index 0000000..3764b21 Binary files /dev/null and b/app/src/main/assets/res_Flowers/17.jpg differ diff --git a/app/src/main/assets/res_Flowers/18.jpg b/app/src/main/assets/res_Flowers/18.jpg new file mode 100644 index 0000000..a759ab6 Binary files /dev/null and b/app/src/main/assets/res_Flowers/18.jpg differ diff --git a/app/src/main/assets/res_Flowers/19.jpg b/app/src/main/assets/res_Flowers/19.jpg new file mode 100644 index 0000000..e8c2a84 Binary files /dev/null and b/app/src/main/assets/res_Flowers/19.jpg differ diff --git a/app/src/main/assets/res_Flowers/2.jpg b/app/src/main/assets/res_Flowers/2.jpg new file mode 100644 index 0000000..fb7e56f Binary files /dev/null and b/app/src/main/assets/res_Flowers/2.jpg differ diff --git a/app/src/main/assets/res_Flowers/20.jpg b/app/src/main/assets/res_Flowers/20.jpg new file mode 100644 index 0000000..93e5408 Binary files /dev/null and b/app/src/main/assets/res_Flowers/20.jpg differ diff --git a/app/src/main/assets/res_Flowers/21.jpg b/app/src/main/assets/res_Flowers/21.jpg new file mode 100644 index 0000000..4fa3a77 Binary files /dev/null and b/app/src/main/assets/res_Flowers/21.jpg differ diff --git a/app/src/main/assets/res_Flowers/22.jpg b/app/src/main/assets/res_Flowers/22.jpg new file mode 100644 index 0000000..6f45df7 Binary files /dev/null and b/app/src/main/assets/res_Flowers/22.jpg differ diff --git a/app/src/main/assets/res_Flowers/23.jpg b/app/src/main/assets/res_Flowers/23.jpg new file mode 100644 index 0000000..46e806d Binary files /dev/null and b/app/src/main/assets/res_Flowers/23.jpg differ diff --git a/app/src/main/assets/res_Flowers/3.jpg b/app/src/main/assets/res_Flowers/3.jpg new file mode 100644 index 0000000..22a741c Binary files /dev/null and b/app/src/main/assets/res_Flowers/3.jpg differ diff --git a/app/src/main/assets/res_Flowers/4.jpg b/app/src/main/assets/res_Flowers/4.jpg new file mode 100644 index 0000000..dd0a30f Binary files /dev/null and b/app/src/main/assets/res_Flowers/4.jpg differ diff --git a/app/src/main/assets/res_Flowers/5.jpg b/app/src/main/assets/res_Flowers/5.jpg new file mode 100644 index 0000000..9dcb4f5 Binary files /dev/null and b/app/src/main/assets/res_Flowers/5.jpg differ diff --git a/app/src/main/assets/res_Flowers/6.jpg b/app/src/main/assets/res_Flowers/6.jpg new file mode 100644 index 0000000..cdf1f65 Binary files /dev/null and b/app/src/main/assets/res_Flowers/6.jpg differ diff --git a/app/src/main/assets/res_Flowers/7.jpg b/app/src/main/assets/res_Flowers/7.jpg new file mode 100644 index 0000000..caab990 Binary files /dev/null and b/app/src/main/assets/res_Flowers/7.jpg differ diff --git a/app/src/main/assets/res_Flowers/8.jpg b/app/src/main/assets/res_Flowers/8.jpg new file mode 100644 index 0000000..c43832b Binary files /dev/null and b/app/src/main/assets/res_Flowers/8.jpg differ diff --git a/app/src/main/assets/res_Flowers/9.jpg b/app/src/main/assets/res_Flowers/9.jpg new file mode 100644 index 0000000..5b78ee1 Binary files /dev/null and b/app/src/main/assets/res_Flowers/9.jpg differ diff --git a/app/src/main/assets/res_Fruits/1.jpg b/app/src/main/assets/res_Fruits/1.jpg new file mode 100644 index 0000000..767c0b4 Binary files /dev/null and b/app/src/main/assets/res_Fruits/1.jpg differ diff --git a/app/src/main/assets/res_Fruits/10.jpg b/app/src/main/assets/res_Fruits/10.jpg new file mode 100644 index 0000000..95bdbca Binary files /dev/null and b/app/src/main/assets/res_Fruits/10.jpg differ diff --git a/app/src/main/assets/res_Fruits/11.jpg b/app/src/main/assets/res_Fruits/11.jpg new file mode 100644 index 0000000..b0bb89a Binary files /dev/null and b/app/src/main/assets/res_Fruits/11.jpg differ diff --git a/app/src/main/assets/res_Fruits/12.jpg b/app/src/main/assets/res_Fruits/12.jpg new file mode 100644 index 0000000..c1d9bad Binary files /dev/null and b/app/src/main/assets/res_Fruits/12.jpg differ diff --git a/app/src/main/assets/res_Fruits/13.jpg b/app/src/main/assets/res_Fruits/13.jpg new file mode 100644 index 0000000..f44fb86 Binary files /dev/null and b/app/src/main/assets/res_Fruits/13.jpg differ diff --git a/app/src/main/assets/res_Fruits/14.jpg b/app/src/main/assets/res_Fruits/14.jpg new file mode 100644 index 0000000..459a60c Binary files /dev/null and b/app/src/main/assets/res_Fruits/14.jpg differ diff --git a/app/src/main/assets/res_Fruits/15.jpg b/app/src/main/assets/res_Fruits/15.jpg new file mode 100644 index 0000000..a4e4abe Binary files /dev/null and b/app/src/main/assets/res_Fruits/15.jpg differ diff --git a/app/src/main/assets/res_Fruits/16.jpg b/app/src/main/assets/res_Fruits/16.jpg new file mode 100644 index 0000000..33a7a9a Binary files /dev/null and b/app/src/main/assets/res_Fruits/16.jpg differ diff --git a/app/src/main/assets/res_Fruits/17.jpg b/app/src/main/assets/res_Fruits/17.jpg new file mode 100644 index 0000000..c193b1e Binary files /dev/null and b/app/src/main/assets/res_Fruits/17.jpg differ diff --git a/app/src/main/assets/res_Fruits/18.jpg b/app/src/main/assets/res_Fruits/18.jpg new file mode 100644 index 0000000..f0ca248 Binary files /dev/null and b/app/src/main/assets/res_Fruits/18.jpg differ diff --git a/app/src/main/assets/res_Fruits/19.jpg b/app/src/main/assets/res_Fruits/19.jpg new file mode 100644 index 0000000..d93dfde Binary files /dev/null and b/app/src/main/assets/res_Fruits/19.jpg differ diff --git a/app/src/main/assets/res_Fruits/2.jpg b/app/src/main/assets/res_Fruits/2.jpg new file mode 100644 index 0000000..b32f9f5 Binary files /dev/null and b/app/src/main/assets/res_Fruits/2.jpg differ diff --git a/app/src/main/assets/res_Fruits/20.jpg b/app/src/main/assets/res_Fruits/20.jpg new file mode 100644 index 0000000..cc3fe93 Binary files /dev/null and b/app/src/main/assets/res_Fruits/20.jpg differ diff --git a/app/src/main/assets/res_Fruits/21.jpg b/app/src/main/assets/res_Fruits/21.jpg new file mode 100644 index 0000000..c1813eb Binary files /dev/null and b/app/src/main/assets/res_Fruits/21.jpg differ diff --git a/app/src/main/assets/res_Fruits/22.jpg b/app/src/main/assets/res_Fruits/22.jpg new file mode 100644 index 0000000..47387e1 Binary files /dev/null and b/app/src/main/assets/res_Fruits/22.jpg differ diff --git a/app/src/main/assets/res_Fruits/23.jpg b/app/src/main/assets/res_Fruits/23.jpg new file mode 100644 index 0000000..7f173ec Binary files /dev/null and b/app/src/main/assets/res_Fruits/23.jpg differ diff --git a/app/src/main/assets/res_Fruits/24.jpg b/app/src/main/assets/res_Fruits/24.jpg new file mode 100644 index 0000000..a7ae235 Binary files /dev/null and b/app/src/main/assets/res_Fruits/24.jpg differ diff --git a/app/src/main/assets/res_Fruits/25.jpg b/app/src/main/assets/res_Fruits/25.jpg new file mode 100644 index 0000000..dd664bb Binary files /dev/null and b/app/src/main/assets/res_Fruits/25.jpg differ diff --git a/app/src/main/assets/res_Fruits/26.jpg b/app/src/main/assets/res_Fruits/26.jpg new file mode 100644 index 0000000..c8e4723 Binary files /dev/null and b/app/src/main/assets/res_Fruits/26.jpg differ diff --git a/app/src/main/assets/res_Fruits/27.jpg b/app/src/main/assets/res_Fruits/27.jpg new file mode 100644 index 0000000..816337d Binary files /dev/null and b/app/src/main/assets/res_Fruits/27.jpg differ diff --git a/app/src/main/assets/res_Fruits/28.jpg b/app/src/main/assets/res_Fruits/28.jpg new file mode 100644 index 0000000..29973d5 Binary files /dev/null and b/app/src/main/assets/res_Fruits/28.jpg differ diff --git a/app/src/main/assets/res_Fruits/29.jpg b/app/src/main/assets/res_Fruits/29.jpg new file mode 100644 index 0000000..4f0750f Binary files /dev/null and b/app/src/main/assets/res_Fruits/29.jpg differ diff --git a/app/src/main/assets/res_Fruits/3.jpg b/app/src/main/assets/res_Fruits/3.jpg new file mode 100644 index 0000000..f57893b Binary files /dev/null and b/app/src/main/assets/res_Fruits/3.jpg differ diff --git a/app/src/main/assets/res_Fruits/30.jpg b/app/src/main/assets/res_Fruits/30.jpg new file mode 100644 index 0000000..cfd117a Binary files /dev/null and b/app/src/main/assets/res_Fruits/30.jpg differ diff --git a/app/src/main/assets/res_Fruits/31.jpg b/app/src/main/assets/res_Fruits/31.jpg new file mode 100644 index 0000000..b59a7c5 Binary files /dev/null and b/app/src/main/assets/res_Fruits/31.jpg differ diff --git a/app/src/main/assets/res_Fruits/32.jpg b/app/src/main/assets/res_Fruits/32.jpg new file mode 100644 index 0000000..8f70790 Binary files /dev/null and b/app/src/main/assets/res_Fruits/32.jpg differ diff --git a/app/src/main/assets/res_Fruits/33.jpg b/app/src/main/assets/res_Fruits/33.jpg new file mode 100644 index 0000000..373b142 Binary files /dev/null and b/app/src/main/assets/res_Fruits/33.jpg differ diff --git a/app/src/main/assets/res_Fruits/34.jpg b/app/src/main/assets/res_Fruits/34.jpg new file mode 100644 index 0000000..c5beb91 Binary files /dev/null and b/app/src/main/assets/res_Fruits/34.jpg differ diff --git a/app/src/main/assets/res_Fruits/35.jpg b/app/src/main/assets/res_Fruits/35.jpg new file mode 100644 index 0000000..79cd667 Binary files /dev/null and b/app/src/main/assets/res_Fruits/35.jpg differ diff --git a/app/src/main/assets/res_Fruits/36.jpg b/app/src/main/assets/res_Fruits/36.jpg new file mode 100644 index 0000000..c0cb185 Binary files /dev/null and b/app/src/main/assets/res_Fruits/36.jpg differ diff --git a/app/src/main/assets/res_Fruits/37.jpg b/app/src/main/assets/res_Fruits/37.jpg new file mode 100644 index 0000000..ba1b245 Binary files /dev/null and b/app/src/main/assets/res_Fruits/37.jpg differ diff --git a/app/src/main/assets/res_Fruits/38.jpg b/app/src/main/assets/res_Fruits/38.jpg new file mode 100644 index 0000000..c7eccb8 Binary files /dev/null and b/app/src/main/assets/res_Fruits/38.jpg differ diff --git a/app/src/main/assets/res_Fruits/39.jpg b/app/src/main/assets/res_Fruits/39.jpg new file mode 100644 index 0000000..bc95aaa Binary files /dev/null and b/app/src/main/assets/res_Fruits/39.jpg differ diff --git a/app/src/main/assets/res_Fruits/4.jpg b/app/src/main/assets/res_Fruits/4.jpg new file mode 100644 index 0000000..2d7465d Binary files /dev/null and b/app/src/main/assets/res_Fruits/4.jpg differ diff --git a/app/src/main/assets/res_Fruits/5.jpg b/app/src/main/assets/res_Fruits/5.jpg new file mode 100644 index 0000000..8ed633f Binary files /dev/null and b/app/src/main/assets/res_Fruits/5.jpg differ diff --git a/app/src/main/assets/res_Fruits/6.jpg b/app/src/main/assets/res_Fruits/6.jpg new file mode 100644 index 0000000..06ce330 Binary files /dev/null and b/app/src/main/assets/res_Fruits/6.jpg differ diff --git a/app/src/main/assets/res_Fruits/7.jpg b/app/src/main/assets/res_Fruits/7.jpg new file mode 100644 index 0000000..6153618 Binary files /dev/null and b/app/src/main/assets/res_Fruits/7.jpg differ diff --git a/app/src/main/assets/res_Fruits/8.jpg b/app/src/main/assets/res_Fruits/8.jpg new file mode 100644 index 0000000..e333f0f Binary files /dev/null and b/app/src/main/assets/res_Fruits/8.jpg differ diff --git a/app/src/main/assets/res_Fruits/9.jpg b/app/src/main/assets/res_Fruits/9.jpg new file mode 100644 index 0000000..d549d15 Binary files /dev/null and b/app/src/main/assets/res_Fruits/9.jpg differ diff --git a/app/src/main/assets/res_General/1.jpg b/app/src/main/assets/res_General/1.jpg new file mode 100644 index 0000000..eb7c14b Binary files /dev/null and b/app/src/main/assets/res_General/1.jpg differ diff --git a/app/src/main/assets/res_General/10.jpg b/app/src/main/assets/res_General/10.jpg new file mode 100644 index 0000000..eacd298 Binary files /dev/null and b/app/src/main/assets/res_General/10.jpg differ diff --git a/app/src/main/assets/res_General/11.jpg b/app/src/main/assets/res_General/11.jpg new file mode 100644 index 0000000..273a876 Binary files /dev/null and b/app/src/main/assets/res_General/11.jpg differ diff --git a/app/src/main/assets/res_General/12.jpg b/app/src/main/assets/res_General/12.jpg new file mode 100644 index 0000000..5d786c5 Binary files /dev/null and b/app/src/main/assets/res_General/12.jpg differ diff --git a/app/src/main/assets/res_General/13.jpg b/app/src/main/assets/res_General/13.jpg new file mode 100644 index 0000000..486441a Binary files /dev/null and b/app/src/main/assets/res_General/13.jpg differ diff --git a/app/src/main/assets/res_General/14.jpg b/app/src/main/assets/res_General/14.jpg new file mode 100644 index 0000000..c36516b Binary files /dev/null and b/app/src/main/assets/res_General/14.jpg differ diff --git a/app/src/main/assets/res_General/15.jpg b/app/src/main/assets/res_General/15.jpg new file mode 100644 index 0000000..9d19fdf Binary files /dev/null and b/app/src/main/assets/res_General/15.jpg differ diff --git a/app/src/main/assets/res_General/2.jpg b/app/src/main/assets/res_General/2.jpg new file mode 100644 index 0000000..090d5d5 Binary files /dev/null and b/app/src/main/assets/res_General/2.jpg differ diff --git a/app/src/main/assets/res_General/3.jpg b/app/src/main/assets/res_General/3.jpg new file mode 100644 index 0000000..a17f1b2 Binary files /dev/null and b/app/src/main/assets/res_General/3.jpg differ diff --git a/app/src/main/assets/res_General/4.jpg b/app/src/main/assets/res_General/4.jpg new file mode 100644 index 0000000..2f4d8a2 Binary files /dev/null and b/app/src/main/assets/res_General/4.jpg differ diff --git a/app/src/main/assets/res_General/5.jpg b/app/src/main/assets/res_General/5.jpg new file mode 100644 index 0000000..8ac1cdb Binary files /dev/null and b/app/src/main/assets/res_General/5.jpg differ diff --git a/app/src/main/assets/res_General/6.jpg b/app/src/main/assets/res_General/6.jpg new file mode 100644 index 0000000..95cc582 Binary files /dev/null and b/app/src/main/assets/res_General/6.jpg differ diff --git a/app/src/main/assets/res_General/7.jpg b/app/src/main/assets/res_General/7.jpg new file mode 100644 index 0000000..91cbcfd Binary files /dev/null and b/app/src/main/assets/res_General/7.jpg differ diff --git a/app/src/main/assets/res_General/8.jpg b/app/src/main/assets/res_General/8.jpg new file mode 100644 index 0000000..af8da73 Binary files /dev/null and b/app/src/main/assets/res_General/8.jpg differ diff --git a/app/src/main/assets/res_General/9.jpg b/app/src/main/assets/res_General/9.jpg new file mode 100644 index 0000000..d5cfb72 Binary files /dev/null and b/app/src/main/assets/res_General/9.jpg differ diff --git a/app/src/main/assets/res_Mehndi/1.jpg b/app/src/main/assets/res_Mehndi/1.jpg new file mode 100644 index 0000000..8dd8843 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/1.jpg differ diff --git a/app/src/main/assets/res_Mehndi/10.jpg b/app/src/main/assets/res_Mehndi/10.jpg new file mode 100644 index 0000000..2432a79 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/10.jpg differ diff --git a/app/src/main/assets/res_Mehndi/11.jpg b/app/src/main/assets/res_Mehndi/11.jpg new file mode 100644 index 0000000..aba85bf Binary files /dev/null and b/app/src/main/assets/res_Mehndi/11.jpg differ diff --git a/app/src/main/assets/res_Mehndi/12.jpg b/app/src/main/assets/res_Mehndi/12.jpg new file mode 100644 index 0000000..f71ae22 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/12.jpg differ diff --git a/app/src/main/assets/res_Mehndi/2.jpg b/app/src/main/assets/res_Mehndi/2.jpg new file mode 100644 index 0000000..0f56bf7 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/2.jpg differ diff --git a/app/src/main/assets/res_Mehndi/3.jpg b/app/src/main/assets/res_Mehndi/3.jpg new file mode 100644 index 0000000..2bc7b69 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/3.jpg differ diff --git a/app/src/main/assets/res_Mehndi/4.jpg b/app/src/main/assets/res_Mehndi/4.jpg new file mode 100644 index 0000000..6fc3f70 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/4.jpg differ diff --git a/app/src/main/assets/res_Mehndi/5.jpg b/app/src/main/assets/res_Mehndi/5.jpg new file mode 100644 index 0000000..dccb5cf Binary files /dev/null and b/app/src/main/assets/res_Mehndi/5.jpg differ diff --git a/app/src/main/assets/res_Mehndi/6.jpg b/app/src/main/assets/res_Mehndi/6.jpg new file mode 100644 index 0000000..4e052dd Binary files /dev/null and b/app/src/main/assets/res_Mehndi/6.jpg differ diff --git a/app/src/main/assets/res_Mehndi/7.jpg b/app/src/main/assets/res_Mehndi/7.jpg new file mode 100644 index 0000000..021e789 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/7.jpg differ diff --git a/app/src/main/assets/res_Mehndi/8.jpg b/app/src/main/assets/res_Mehndi/8.jpg new file mode 100644 index 0000000..dd45b50 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/8.jpg differ diff --git a/app/src/main/assets/res_Mehndi/9.jpg b/app/src/main/assets/res_Mehndi/9.jpg new file mode 100644 index 0000000..6ff2300 Binary files /dev/null and b/app/src/main/assets/res_Mehndi/9.jpg differ diff --git a/app/src/main/assets/res_Nature/1.jpg b/app/src/main/assets/res_Nature/1.jpg new file mode 100644 index 0000000..22c00e3 Binary files /dev/null and b/app/src/main/assets/res_Nature/1.jpg differ diff --git a/app/src/main/assets/res_Nature/10.jpg b/app/src/main/assets/res_Nature/10.jpg new file mode 100644 index 0000000..65aab09 Binary files /dev/null and b/app/src/main/assets/res_Nature/10.jpg differ diff --git a/app/src/main/assets/res_Nature/11.jpg b/app/src/main/assets/res_Nature/11.jpg new file mode 100644 index 0000000..23c6653 Binary files /dev/null and b/app/src/main/assets/res_Nature/11.jpg differ diff --git a/app/src/main/assets/res_Nature/12.jpg b/app/src/main/assets/res_Nature/12.jpg new file mode 100644 index 0000000..36e1835 Binary files /dev/null and b/app/src/main/assets/res_Nature/12.jpg differ diff --git a/app/src/main/assets/res_Nature/13.jpg b/app/src/main/assets/res_Nature/13.jpg new file mode 100644 index 0000000..5816b61 Binary files /dev/null and b/app/src/main/assets/res_Nature/13.jpg differ diff --git a/app/src/main/assets/res_Nature/14.jpg b/app/src/main/assets/res_Nature/14.jpg new file mode 100644 index 0000000..b4e5dc6 Binary files /dev/null and b/app/src/main/assets/res_Nature/14.jpg differ diff --git a/app/src/main/assets/res_Nature/15.jpg b/app/src/main/assets/res_Nature/15.jpg new file mode 100644 index 0000000..5424ac4 Binary files /dev/null and b/app/src/main/assets/res_Nature/15.jpg differ diff --git a/app/src/main/assets/res_Nature/16.jpg b/app/src/main/assets/res_Nature/16.jpg new file mode 100644 index 0000000..fd00791 Binary files /dev/null and b/app/src/main/assets/res_Nature/16.jpg differ diff --git a/app/src/main/assets/res_Nature/17.jpg b/app/src/main/assets/res_Nature/17.jpg new file mode 100644 index 0000000..38410e8 Binary files /dev/null and b/app/src/main/assets/res_Nature/17.jpg differ diff --git a/app/src/main/assets/res_Nature/18.jpg b/app/src/main/assets/res_Nature/18.jpg new file mode 100644 index 0000000..5ae5028 Binary files /dev/null and b/app/src/main/assets/res_Nature/18.jpg differ diff --git a/app/src/main/assets/res_Nature/19.jpg b/app/src/main/assets/res_Nature/19.jpg new file mode 100644 index 0000000..e49b4f1 Binary files /dev/null and b/app/src/main/assets/res_Nature/19.jpg differ diff --git a/app/src/main/assets/res_Nature/2.jpg b/app/src/main/assets/res_Nature/2.jpg new file mode 100644 index 0000000..3b5ec4c Binary files /dev/null and b/app/src/main/assets/res_Nature/2.jpg differ diff --git a/app/src/main/assets/res_Nature/20.jpg b/app/src/main/assets/res_Nature/20.jpg new file mode 100644 index 0000000..cc94724 Binary files /dev/null and b/app/src/main/assets/res_Nature/20.jpg differ diff --git a/app/src/main/assets/res_Nature/21.jpg b/app/src/main/assets/res_Nature/21.jpg new file mode 100644 index 0000000..dfa6c09 Binary files /dev/null and b/app/src/main/assets/res_Nature/21.jpg differ diff --git a/app/src/main/assets/res_Nature/22.jpg b/app/src/main/assets/res_Nature/22.jpg new file mode 100644 index 0000000..c05e638 Binary files /dev/null and b/app/src/main/assets/res_Nature/22.jpg differ diff --git a/app/src/main/assets/res_Nature/23.jpg b/app/src/main/assets/res_Nature/23.jpg new file mode 100644 index 0000000..6f932ec Binary files /dev/null and b/app/src/main/assets/res_Nature/23.jpg differ diff --git a/app/src/main/assets/res_Nature/3.jpg b/app/src/main/assets/res_Nature/3.jpg new file mode 100644 index 0000000..1423546 Binary files /dev/null and b/app/src/main/assets/res_Nature/3.jpg differ diff --git a/app/src/main/assets/res_Nature/4.jpg b/app/src/main/assets/res_Nature/4.jpg new file mode 100644 index 0000000..5499510 Binary files /dev/null and b/app/src/main/assets/res_Nature/4.jpg differ diff --git a/app/src/main/assets/res_Nature/5.jpg b/app/src/main/assets/res_Nature/5.jpg new file mode 100644 index 0000000..434261a Binary files /dev/null and b/app/src/main/assets/res_Nature/5.jpg differ diff --git a/app/src/main/assets/res_Nature/6.jpg b/app/src/main/assets/res_Nature/6.jpg new file mode 100644 index 0000000..f50166b Binary files /dev/null and b/app/src/main/assets/res_Nature/6.jpg differ diff --git a/app/src/main/assets/res_Nature/7.jpg b/app/src/main/assets/res_Nature/7.jpg new file mode 100644 index 0000000..96e178c Binary files /dev/null and b/app/src/main/assets/res_Nature/7.jpg differ diff --git a/app/src/main/assets/res_Nature/8.jpg b/app/src/main/assets/res_Nature/8.jpg new file mode 100644 index 0000000..c68f4f1 Binary files /dev/null and b/app/src/main/assets/res_Nature/8.jpg differ diff --git a/app/src/main/assets/res_Nature/9.jpg b/app/src/main/assets/res_Nature/9.jpg new file mode 100644 index 0000000..6b8ccb4 Binary files /dev/null and b/app/src/main/assets/res_Nature/9.jpg differ diff --git a/app/src/main/assets/res_Properties/1.jpg b/app/src/main/assets/res_Properties/1.jpg new file mode 100644 index 0000000..3289a38 Binary files /dev/null and b/app/src/main/assets/res_Properties/1.jpg differ diff --git a/app/src/main/assets/res_Properties/10.jpg b/app/src/main/assets/res_Properties/10.jpg new file mode 100644 index 0000000..b065539 Binary files /dev/null and b/app/src/main/assets/res_Properties/10.jpg differ diff --git a/app/src/main/assets/res_Properties/11.jpg b/app/src/main/assets/res_Properties/11.jpg new file mode 100644 index 0000000..12d28b1 Binary files /dev/null and b/app/src/main/assets/res_Properties/11.jpg differ diff --git a/app/src/main/assets/res_Properties/12.jpg b/app/src/main/assets/res_Properties/12.jpg new file mode 100644 index 0000000..182879f Binary files /dev/null and b/app/src/main/assets/res_Properties/12.jpg differ diff --git a/app/src/main/assets/res_Properties/13.jpg b/app/src/main/assets/res_Properties/13.jpg new file mode 100644 index 0000000..4263530 Binary files /dev/null and b/app/src/main/assets/res_Properties/13.jpg differ diff --git a/app/src/main/assets/res_Properties/14.jpg b/app/src/main/assets/res_Properties/14.jpg new file mode 100644 index 0000000..42e4ab3 Binary files /dev/null and b/app/src/main/assets/res_Properties/14.jpg differ diff --git a/app/src/main/assets/res_Properties/15.jpg b/app/src/main/assets/res_Properties/15.jpg new file mode 100644 index 0000000..b529436 Binary files /dev/null and b/app/src/main/assets/res_Properties/15.jpg differ diff --git a/app/src/main/assets/res_Properties/16.jpg b/app/src/main/assets/res_Properties/16.jpg new file mode 100644 index 0000000..85caef0 Binary files /dev/null and b/app/src/main/assets/res_Properties/16.jpg differ diff --git a/app/src/main/assets/res_Properties/17.jpg b/app/src/main/assets/res_Properties/17.jpg new file mode 100644 index 0000000..6295f58 Binary files /dev/null and b/app/src/main/assets/res_Properties/17.jpg differ diff --git a/app/src/main/assets/res_Properties/18.jpg b/app/src/main/assets/res_Properties/18.jpg new file mode 100644 index 0000000..f8e4e87 Binary files /dev/null and b/app/src/main/assets/res_Properties/18.jpg differ diff --git a/app/src/main/assets/res_Properties/19.jpg b/app/src/main/assets/res_Properties/19.jpg new file mode 100644 index 0000000..c476493 Binary files /dev/null and b/app/src/main/assets/res_Properties/19.jpg differ diff --git a/app/src/main/assets/res_Properties/2.jpg b/app/src/main/assets/res_Properties/2.jpg new file mode 100644 index 0000000..084fa51 Binary files /dev/null and b/app/src/main/assets/res_Properties/2.jpg differ diff --git a/app/src/main/assets/res_Properties/3.jpg b/app/src/main/assets/res_Properties/3.jpg new file mode 100644 index 0000000..4ee71c4 Binary files /dev/null and b/app/src/main/assets/res_Properties/3.jpg differ diff --git a/app/src/main/assets/res_Properties/4.jpg b/app/src/main/assets/res_Properties/4.jpg new file mode 100644 index 0000000..25912f1 Binary files /dev/null and b/app/src/main/assets/res_Properties/4.jpg differ diff --git a/app/src/main/assets/res_Properties/5.jpg b/app/src/main/assets/res_Properties/5.jpg new file mode 100644 index 0000000..77c2aa8 Binary files /dev/null and b/app/src/main/assets/res_Properties/5.jpg differ diff --git a/app/src/main/assets/res_Properties/6.jpg b/app/src/main/assets/res_Properties/6.jpg new file mode 100644 index 0000000..75b1e32 Binary files /dev/null and b/app/src/main/assets/res_Properties/6.jpg differ diff --git a/app/src/main/assets/res_Properties/7.jpg b/app/src/main/assets/res_Properties/7.jpg new file mode 100644 index 0000000..f059989 Binary files /dev/null and b/app/src/main/assets/res_Properties/7.jpg differ diff --git a/app/src/main/assets/res_Properties/8.jpg b/app/src/main/assets/res_Properties/8.jpg new file mode 100644 index 0000000..6be97eb Binary files /dev/null and b/app/src/main/assets/res_Properties/8.jpg differ diff --git a/app/src/main/assets/res_Properties/9.jpg b/app/src/main/assets/res_Properties/9.jpg new file mode 100644 index 0000000..626cab9 Binary files /dev/null and b/app/src/main/assets/res_Properties/9.jpg differ diff --git a/app/src/main/assets/res_Rangoli/1.jpg b/app/src/main/assets/res_Rangoli/1.jpg new file mode 100644 index 0000000..e628714 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/1.jpg differ diff --git a/app/src/main/assets/res_Rangoli/10.jpg b/app/src/main/assets/res_Rangoli/10.jpg new file mode 100644 index 0000000..f6e9d09 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/10.jpg differ diff --git a/app/src/main/assets/res_Rangoli/13.jpg b/app/src/main/assets/res_Rangoli/13.jpg new file mode 100644 index 0000000..9741d57 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/13.jpg differ diff --git a/app/src/main/assets/res_Rangoli/14.jpg b/app/src/main/assets/res_Rangoli/14.jpg new file mode 100644 index 0000000..3ca4970 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/14.jpg differ diff --git a/app/src/main/assets/res_Rangoli/15.jpg b/app/src/main/assets/res_Rangoli/15.jpg new file mode 100644 index 0000000..98abac3 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/15.jpg differ diff --git a/app/src/main/assets/res_Rangoli/16.jpg b/app/src/main/assets/res_Rangoli/16.jpg new file mode 100644 index 0000000..150dfdc Binary files /dev/null and b/app/src/main/assets/res_Rangoli/16.jpg differ diff --git a/app/src/main/assets/res_Rangoli/17.jpg b/app/src/main/assets/res_Rangoli/17.jpg new file mode 100644 index 0000000..4127115 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/17.jpg differ diff --git a/app/src/main/assets/res_Rangoli/18.jpg b/app/src/main/assets/res_Rangoli/18.jpg new file mode 100644 index 0000000..6ae96e9 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/18.jpg differ diff --git a/app/src/main/assets/res_Rangoli/19.jpg b/app/src/main/assets/res_Rangoli/19.jpg new file mode 100644 index 0000000..ffcbd6a Binary files /dev/null and b/app/src/main/assets/res_Rangoli/19.jpg differ diff --git a/app/src/main/assets/res_Rangoli/2.jpg b/app/src/main/assets/res_Rangoli/2.jpg new file mode 100644 index 0000000..7329109 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/2.jpg differ diff --git a/app/src/main/assets/res_Rangoli/20.jpg b/app/src/main/assets/res_Rangoli/20.jpg new file mode 100644 index 0000000..b7be138 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/20.jpg differ diff --git a/app/src/main/assets/res_Rangoli/21.jpg b/app/src/main/assets/res_Rangoli/21.jpg new file mode 100644 index 0000000..eaa5fdf Binary files /dev/null and b/app/src/main/assets/res_Rangoli/21.jpg differ diff --git a/app/src/main/assets/res_Rangoli/22.jpg b/app/src/main/assets/res_Rangoli/22.jpg new file mode 100644 index 0000000..28aca48 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/22.jpg differ diff --git a/app/src/main/assets/res_Rangoli/23.jpg b/app/src/main/assets/res_Rangoli/23.jpg new file mode 100644 index 0000000..057d2d4 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/23.jpg differ diff --git a/app/src/main/assets/res_Rangoli/24.jpg b/app/src/main/assets/res_Rangoli/24.jpg new file mode 100644 index 0000000..e933061 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/24.jpg differ diff --git a/app/src/main/assets/res_Rangoli/25.jpg b/app/src/main/assets/res_Rangoli/25.jpg new file mode 100644 index 0000000..569a74c Binary files /dev/null and b/app/src/main/assets/res_Rangoli/25.jpg differ diff --git a/app/src/main/assets/res_Rangoli/3.jpg b/app/src/main/assets/res_Rangoli/3.jpg new file mode 100644 index 0000000..569342c Binary files /dev/null and b/app/src/main/assets/res_Rangoli/3.jpg differ diff --git a/app/src/main/assets/res_Rangoli/4.jpg b/app/src/main/assets/res_Rangoli/4.jpg new file mode 100644 index 0000000..7c5d0de Binary files /dev/null and b/app/src/main/assets/res_Rangoli/4.jpg differ diff --git a/app/src/main/assets/res_Rangoli/5.jpg b/app/src/main/assets/res_Rangoli/5.jpg new file mode 100644 index 0000000..5a3228f Binary files /dev/null and b/app/src/main/assets/res_Rangoli/5.jpg differ diff --git a/app/src/main/assets/res_Rangoli/6.jpg b/app/src/main/assets/res_Rangoli/6.jpg new file mode 100644 index 0000000..270f078 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/6.jpg differ diff --git a/app/src/main/assets/res_Rangoli/7.jpg b/app/src/main/assets/res_Rangoli/7.jpg new file mode 100644 index 0000000..241beac Binary files /dev/null and b/app/src/main/assets/res_Rangoli/7.jpg differ diff --git a/app/src/main/assets/res_Rangoli/8.jpg b/app/src/main/assets/res_Rangoli/8.jpg new file mode 100644 index 0000000..c62e0d7 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/8.jpg differ diff --git a/app/src/main/assets/res_Rangoli/9.jpg b/app/src/main/assets/res_Rangoli/9.jpg new file mode 100644 index 0000000..bcd14a7 Binary files /dev/null and b/app/src/main/assets/res_Rangoli/9.jpg differ diff --git a/app/src/main/assets/res_Sports/1.jpg b/app/src/main/assets/res_Sports/1.jpg new file mode 100644 index 0000000..cd1cb09 Binary files /dev/null and b/app/src/main/assets/res_Sports/1.jpg differ diff --git a/app/src/main/assets/res_Sports/10.jpg b/app/src/main/assets/res_Sports/10.jpg new file mode 100644 index 0000000..2ec81a5 Binary files /dev/null and b/app/src/main/assets/res_Sports/10.jpg differ diff --git a/app/src/main/assets/res_Sports/11.jpg b/app/src/main/assets/res_Sports/11.jpg new file mode 100644 index 0000000..f00ecb5 Binary files /dev/null and b/app/src/main/assets/res_Sports/11.jpg differ diff --git a/app/src/main/assets/res_Sports/12.jpg b/app/src/main/assets/res_Sports/12.jpg new file mode 100644 index 0000000..b004929 Binary files /dev/null and b/app/src/main/assets/res_Sports/12.jpg differ diff --git a/app/src/main/assets/res_Sports/13.jpg b/app/src/main/assets/res_Sports/13.jpg new file mode 100644 index 0000000..73fa886 Binary files /dev/null and b/app/src/main/assets/res_Sports/13.jpg differ diff --git a/app/src/main/assets/res_Sports/14.jpg b/app/src/main/assets/res_Sports/14.jpg new file mode 100644 index 0000000..3d9069e Binary files /dev/null and b/app/src/main/assets/res_Sports/14.jpg differ diff --git a/app/src/main/assets/res_Sports/15.jpg b/app/src/main/assets/res_Sports/15.jpg new file mode 100644 index 0000000..a090c83 Binary files /dev/null and b/app/src/main/assets/res_Sports/15.jpg differ diff --git a/app/src/main/assets/res_Sports/16.jpg b/app/src/main/assets/res_Sports/16.jpg new file mode 100644 index 0000000..185d6e3 Binary files /dev/null and b/app/src/main/assets/res_Sports/16.jpg differ diff --git a/app/src/main/assets/res_Sports/17.jpg b/app/src/main/assets/res_Sports/17.jpg new file mode 100644 index 0000000..b8193fa Binary files /dev/null and b/app/src/main/assets/res_Sports/17.jpg differ diff --git a/app/src/main/assets/res_Sports/18.jpg b/app/src/main/assets/res_Sports/18.jpg new file mode 100644 index 0000000..ba4fcea Binary files /dev/null and b/app/src/main/assets/res_Sports/18.jpg differ diff --git a/app/src/main/assets/res_Sports/19.jpg b/app/src/main/assets/res_Sports/19.jpg new file mode 100644 index 0000000..617c2af Binary files /dev/null and b/app/src/main/assets/res_Sports/19.jpg differ diff --git a/app/src/main/assets/res_Sports/2.jpg b/app/src/main/assets/res_Sports/2.jpg new file mode 100644 index 0000000..59890e5 Binary files /dev/null and b/app/src/main/assets/res_Sports/2.jpg differ diff --git a/app/src/main/assets/res_Sports/20.jpg b/app/src/main/assets/res_Sports/20.jpg new file mode 100644 index 0000000..4032ff4 Binary files /dev/null and b/app/src/main/assets/res_Sports/20.jpg differ diff --git a/app/src/main/assets/res_Sports/21.jpg b/app/src/main/assets/res_Sports/21.jpg new file mode 100644 index 0000000..23979ba Binary files /dev/null and b/app/src/main/assets/res_Sports/21.jpg differ diff --git a/app/src/main/assets/res_Sports/22.jpg b/app/src/main/assets/res_Sports/22.jpg new file mode 100644 index 0000000..c61e91e Binary files /dev/null and b/app/src/main/assets/res_Sports/22.jpg differ diff --git a/app/src/main/assets/res_Sports/23.jpg b/app/src/main/assets/res_Sports/23.jpg new file mode 100644 index 0000000..7bf0806 Binary files /dev/null and b/app/src/main/assets/res_Sports/23.jpg differ diff --git a/app/src/main/assets/res_Sports/24.jpg b/app/src/main/assets/res_Sports/24.jpg new file mode 100644 index 0000000..23cbc17 Binary files /dev/null and b/app/src/main/assets/res_Sports/24.jpg differ diff --git a/app/src/main/assets/res_Sports/25.jpg b/app/src/main/assets/res_Sports/25.jpg new file mode 100644 index 0000000..06d992e Binary files /dev/null and b/app/src/main/assets/res_Sports/25.jpg differ diff --git a/app/src/main/assets/res_Sports/26.jpg b/app/src/main/assets/res_Sports/26.jpg new file mode 100644 index 0000000..26af61e Binary files /dev/null and b/app/src/main/assets/res_Sports/26.jpg differ diff --git a/app/src/main/assets/res_Sports/27.jpg b/app/src/main/assets/res_Sports/27.jpg new file mode 100644 index 0000000..91bf104 Binary files /dev/null and b/app/src/main/assets/res_Sports/27.jpg differ diff --git a/app/src/main/assets/res_Sports/28.jpg b/app/src/main/assets/res_Sports/28.jpg new file mode 100644 index 0000000..8c790e7 Binary files /dev/null and b/app/src/main/assets/res_Sports/28.jpg differ diff --git a/app/src/main/assets/res_Sports/3.jpg b/app/src/main/assets/res_Sports/3.jpg new file mode 100644 index 0000000..8315af5 Binary files /dev/null and b/app/src/main/assets/res_Sports/3.jpg differ diff --git a/app/src/main/assets/res_Sports/4.jpg b/app/src/main/assets/res_Sports/4.jpg new file mode 100644 index 0000000..8070e68 Binary files /dev/null and b/app/src/main/assets/res_Sports/4.jpg differ diff --git a/app/src/main/assets/res_Sports/5.jpg b/app/src/main/assets/res_Sports/5.jpg new file mode 100644 index 0000000..5bcb837 Binary files /dev/null and b/app/src/main/assets/res_Sports/5.jpg differ diff --git a/app/src/main/assets/res_Sports/6.jpg b/app/src/main/assets/res_Sports/6.jpg new file mode 100644 index 0000000..038521f Binary files /dev/null and b/app/src/main/assets/res_Sports/6.jpg differ diff --git a/app/src/main/assets/res_Sports/7.jpg b/app/src/main/assets/res_Sports/7.jpg new file mode 100644 index 0000000..73bf0de Binary files /dev/null and b/app/src/main/assets/res_Sports/7.jpg differ diff --git a/app/src/main/assets/res_Sports/8.jpg b/app/src/main/assets/res_Sports/8.jpg new file mode 100644 index 0000000..6c565f8 Binary files /dev/null and b/app/src/main/assets/res_Sports/8.jpg differ diff --git a/app/src/main/assets/res_Sports/9.jpg b/app/src/main/assets/res_Sports/9.jpg new file mode 100644 index 0000000..130cd94 Binary files /dev/null and b/app/src/main/assets/res_Sports/9.jpg differ diff --git a/app/src/main/assets/res_Vehicles/1.jpg b/app/src/main/assets/res_Vehicles/1.jpg new file mode 100644 index 0000000..da449f7 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/1.jpg differ diff --git a/app/src/main/assets/res_Vehicles/10.jpg b/app/src/main/assets/res_Vehicles/10.jpg new file mode 100644 index 0000000..0084613 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/10.jpg differ diff --git a/app/src/main/assets/res_Vehicles/11.jpg b/app/src/main/assets/res_Vehicles/11.jpg new file mode 100644 index 0000000..ba5f4d4 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/11.jpg differ diff --git a/app/src/main/assets/res_Vehicles/12.jpg b/app/src/main/assets/res_Vehicles/12.jpg new file mode 100644 index 0000000..32c7908 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/12.jpg differ diff --git a/app/src/main/assets/res_Vehicles/13.jpg b/app/src/main/assets/res_Vehicles/13.jpg new file mode 100644 index 0000000..dd47e76 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/13.jpg differ diff --git a/app/src/main/assets/res_Vehicles/14.jpg b/app/src/main/assets/res_Vehicles/14.jpg new file mode 100644 index 0000000..8b886e6 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/14.jpg differ diff --git a/app/src/main/assets/res_Vehicles/15.jpg b/app/src/main/assets/res_Vehicles/15.jpg new file mode 100644 index 0000000..cf78752 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/15.jpg differ diff --git a/app/src/main/assets/res_Vehicles/16.jpg b/app/src/main/assets/res_Vehicles/16.jpg new file mode 100644 index 0000000..87f8a19 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/16.jpg differ diff --git a/app/src/main/assets/res_Vehicles/17.jpg b/app/src/main/assets/res_Vehicles/17.jpg new file mode 100644 index 0000000..011b53b Binary files /dev/null and b/app/src/main/assets/res_Vehicles/17.jpg differ diff --git a/app/src/main/assets/res_Vehicles/18.jpg b/app/src/main/assets/res_Vehicles/18.jpg new file mode 100644 index 0000000..c4433c8 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/18.jpg differ diff --git a/app/src/main/assets/res_Vehicles/19.jpg b/app/src/main/assets/res_Vehicles/19.jpg new file mode 100644 index 0000000..b9361f1 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/19.jpg differ diff --git a/app/src/main/assets/res_Vehicles/2.jpg b/app/src/main/assets/res_Vehicles/2.jpg new file mode 100644 index 0000000..ff06675 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/2.jpg differ diff --git a/app/src/main/assets/res_Vehicles/20.jpg b/app/src/main/assets/res_Vehicles/20.jpg new file mode 100644 index 0000000..3e22c5c Binary files /dev/null and b/app/src/main/assets/res_Vehicles/20.jpg differ diff --git a/app/src/main/assets/res_Vehicles/21.jpg b/app/src/main/assets/res_Vehicles/21.jpg new file mode 100644 index 0000000..f93b99a Binary files /dev/null and b/app/src/main/assets/res_Vehicles/21.jpg differ diff --git a/app/src/main/assets/res_Vehicles/22.jpg b/app/src/main/assets/res_Vehicles/22.jpg new file mode 100644 index 0000000..952afa9 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/22.jpg differ diff --git a/app/src/main/assets/res_Vehicles/23.jpg b/app/src/main/assets/res_Vehicles/23.jpg new file mode 100644 index 0000000..a6e1c25 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/23.jpg differ diff --git a/app/src/main/assets/res_Vehicles/24.jpg b/app/src/main/assets/res_Vehicles/24.jpg new file mode 100644 index 0000000..83c706a Binary files /dev/null and b/app/src/main/assets/res_Vehicles/24.jpg differ diff --git a/app/src/main/assets/res_Vehicles/25.jpg b/app/src/main/assets/res_Vehicles/25.jpg new file mode 100644 index 0000000..6ebdbf7 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/25.jpg differ diff --git a/app/src/main/assets/res_Vehicles/26.jpg b/app/src/main/assets/res_Vehicles/26.jpg new file mode 100644 index 0000000..3805357 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/26.jpg differ diff --git a/app/src/main/assets/res_Vehicles/27.jpg b/app/src/main/assets/res_Vehicles/27.jpg new file mode 100644 index 0000000..0849027 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/27.jpg differ diff --git a/app/src/main/assets/res_Vehicles/28.jpg b/app/src/main/assets/res_Vehicles/28.jpg new file mode 100644 index 0000000..019baa9 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/28.jpg differ diff --git a/app/src/main/assets/res_Vehicles/29.jpg b/app/src/main/assets/res_Vehicles/29.jpg new file mode 100644 index 0000000..c7e0d3a Binary files /dev/null and b/app/src/main/assets/res_Vehicles/29.jpg differ diff --git a/app/src/main/assets/res_Vehicles/3.jpg b/app/src/main/assets/res_Vehicles/3.jpg new file mode 100644 index 0000000..eb33365 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/3.jpg differ diff --git a/app/src/main/assets/res_Vehicles/30.jpg b/app/src/main/assets/res_Vehicles/30.jpg new file mode 100644 index 0000000..3820102 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/30.jpg differ diff --git a/app/src/main/assets/res_Vehicles/31.jpg b/app/src/main/assets/res_Vehicles/31.jpg new file mode 100644 index 0000000..bba9999 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/31.jpg differ diff --git a/app/src/main/assets/res_Vehicles/32.jpg b/app/src/main/assets/res_Vehicles/32.jpg new file mode 100644 index 0000000..6d64a3f Binary files /dev/null and b/app/src/main/assets/res_Vehicles/32.jpg differ diff --git a/app/src/main/assets/res_Vehicles/4.jpg b/app/src/main/assets/res_Vehicles/4.jpg new file mode 100644 index 0000000..968f0ad Binary files /dev/null and b/app/src/main/assets/res_Vehicles/4.jpg differ diff --git a/app/src/main/assets/res_Vehicles/5.jpg b/app/src/main/assets/res_Vehicles/5.jpg new file mode 100644 index 0000000..abdd96c Binary files /dev/null and b/app/src/main/assets/res_Vehicles/5.jpg differ diff --git a/app/src/main/assets/res_Vehicles/6.jpg b/app/src/main/assets/res_Vehicles/6.jpg new file mode 100644 index 0000000..7eeb870 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/6.jpg differ diff --git a/app/src/main/assets/res_Vehicles/7.jpg b/app/src/main/assets/res_Vehicles/7.jpg new file mode 100644 index 0000000..c5e6294 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/7.jpg differ diff --git a/app/src/main/assets/res_Vehicles/8.jpg b/app/src/main/assets/res_Vehicles/8.jpg new file mode 100644 index 0000000..6628782 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/8.jpg differ diff --git a/app/src/main/assets/res_Vehicles/9.jpg b/app/src/main/assets/res_Vehicles/9.jpg new file mode 100644 index 0000000..367b772 Binary files /dev/null and b/app/src/main/assets/res_Vehicles/9.jpg differ diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/act/PageList.java b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageList.java new file mode 100644 index 0000000..eb70670 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageList.java @@ -0,0 +1,62 @@ +package com.ar.sketch.paint.drawing.act; + +import android.os.Bundle; +import android.view.View; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.ar.sketch.paint.drawing.adapter.RecyclerList; +import com.ar.sketch.paint.drawing.databinding.PageItemBinding; +import com.ar.sketch.paint.drawing.tool.ItemDec; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.ar.sketch.paint.drawing.tool.Utils; + +import java.util.List; + +public class PageList extends AppCompatActivity { + + private PageItemBinding preViewBinding; + + private String dirStr; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + preViewBinding = PageItemBinding.inflate(getLayoutInflater()); + setContentView(preViewBinding.getRoot()); + Utils.setStatusBarTextColor(this, true); + dirStr = getIntent().getStringExtra(MyArApp.Key_ViewDir); + preViewBinding.categoryName.setText(dirStr.substring(dirStr.lastIndexOf("_") + 1)); + + + + onInitList(); + onInitClick(); + } + + private void onInitList() { + + List list = Utils.fileExistsInAssets(this, dirStr); + ItemDec itemDec = new ItemDec(10, 10, 5); + RecyclerList recyclerList = new RecyclerList(this, list); + preViewBinding.recyclerview.setAdapter(recyclerList); + preViewBinding.recyclerview.addItemDecoration(itemDec); + preViewBinding.recyclerview.setLayoutManager(new GridLayoutManager(this, 2)); + } + + private void onInitClick() { + preViewBinding.back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + + + +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/act/PageMain.java b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageMain.java new file mode 100644 index 0000000..2baaced --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageMain.java @@ -0,0 +1,114 @@ +package com.ar.sketch.paint.drawing.act; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager2.adapter.FragmentStateAdapter; +import androidx.viewpager2.widget.ViewPager2; + +import com.ar.sketch.paint.drawing.R; +import com.ar.sketch.paint.drawing.databinding.PageHomeBinding; +import com.ar.sketch.paint.drawing.frag.PageFavorite; +import com.ar.sketch.paint.drawing.frag.PageHome; +import com.ar.sketch.paint.drawing.frag.PageImport; +import com.ar.sketch.paint.drawing.tool.Utils; +import com.google.android.material.tabs.TabLayout; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class PageMain extends AppCompatActivity { + + private PageHomeBinding binding; + + private List listFragment = new ArrayList<>(); + + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Utils.setStatusBarTextColor(this, true); + binding = PageHomeBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + listFragment.add(PageHome.newInstance()); + listFragment.add(PageImport.newInstance()); + listFragment.add(PageFavorite.newInstance()); + + onTabInit(); + binding.viewPager2.setUserInputEnabled(false); + binding.viewPager2.setAdapter(new FragmentStateAdapter(this) { + @NonNull + @Override + public Fragment createFragment(int position) { + return listFragment.get(position); + } + + @Override + public int getItemCount() { + return listFragment.size(); + } + }); + bingTabVp(); + } + private void bingTabVp() { + binding.tab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + ImageView icon = Objects.requireNonNull(tab.getCustomView()).findViewById(R.id.im_icon); + icon.setSelected(true); + binding.viewPager2.setCurrentItem(tab.getPosition()); + } + + @Override + public void onTabUnselected(TabLayout.Tab tab) { + ImageView icon = Objects.requireNonNull(tab.getCustomView()).findViewById(R.id.im_icon); + icon.setSelected(false); + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + + } + }); + binding.viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { + @Override + public void onPageSelected(int position) { + super.onPageSelected(position); + Objects.requireNonNull(binding.tab.getTabAt(position)).select(); + } + }); + } + + + private void onTabInit() { + + for (int i = 0; i < listFragment.size(); i++) { + TabLayout.Tab tab = binding.tab.newTab(); + View inflate = LayoutInflater.from(this).inflate(R.layout.list_tab, null, false); + ImageView icon = inflate.findViewById(R.id.im_icon); + if (i == 0) { + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ch_tab_home)); + } else if (i == 1){ + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ch_import)); + }else { + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ch_tab_like)); + } + tab.setCustomView(inflate); + binding.tab.addTab(tab); + } + + } + + + + +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/act/PagePreview.java b/app/src/main/java/com/ar/sketch/paint/drawing/act/PagePreview.java new file mode 100644 index 0000000..a4e9cb8 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/act/PagePreview.java @@ -0,0 +1,340 @@ +package com.ar.sketch.paint.drawing.act; + +import android.Manifest; +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.Matrix; +import android.graphics.Point; +import android.graphics.PointF; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.provider.MediaStore; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.SeekBar; +import android.widget.Toast; + +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.camera.core.Camera; +import androidx.camera.core.CameraSelector; +import androidx.camera.core.ImageCapture; +import androidx.camera.core.Preview; +import androidx.camera.lifecycle.ProcessCameraProvider; +import androidx.camera.view.PreviewView; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + +import com.ar.sketch.paint.drawing.dbmanager.MyDataBase; +import com.ar.sketch.paint.drawing.tool.Utils; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.google.common.util.concurrent.ListenableFuture; +import com.ar.sketch.paint.drawing.R; + +public class PagePreview extends AppCompatActivity implements View.OnTouchListener, View.OnClickListener { + private CameraSelector cameraSelector; + private String[] permissions; + + private Camera camera; + private ImageCapture imageCapture; + private PreviewView previewView; + private ImageView imageView; + private SeekBar seekBar; + + + + + private int MODE;//当前状态 + public static final int MODE_NONE = 0;//无操作 + public static final int MODE_DRAG = 1;//单指操作 + public static final int MODE_SCALE = 2;//双指操作 + + private Matrix startMatrix = new Matrix(); + private Matrix endMatrix = new Matrix();//变化后的矩阵 + private PointF startPointF = new PointF();//初始坐标 + private float distance;//初始距离 + private float scaleMultiple;//缩放倍数 + + private ImageView flashIm, imZoom, imBack,imFavorite; + private ImageView imPhoto; + + private String curBitmapPath; + private boolean hasPermission = false; + private boolean isMain; + private String ismain; + + private ActivityResultLauncher intentActivityResultLauncher; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.page_preview); + Utils.setStatusBarTextColor(this, true); + Intent intent = getIntent(); + isMain = intent.getBooleanExtra(MyArApp.Key_ISMAIN, false); + + + previewView = findViewById(R.id.preview); + imageView = findViewById(R.id.image); + imBack = findViewById(R.id.back); + + seekBar = findViewById(R.id.seekbar); + flashIm = findViewById(R.id.im_flash); + imPhoto = findViewById(R.id.im_photo); + imZoom = findViewById(R.id.im_zoom); + imFavorite = findViewById(R.id.im_favorite); + + + + curBitmapPath = getIntent().getStringExtra(MyArApp.Key_Camera); + + boolean b = MyDataBase.queryIsLike(curBitmapPath); + imFavorite.setSelected(b); + + intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { + if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) { + Uri imageUri = result.getData().getData(); + if(imageUri!= null){ + String lastPathSegment = imageUri.getLastPathSegment(); + int index = lastPathSegment.lastIndexOf("/"); + String name = lastPathSegment.substring(index+1); + double uriFileSize = Utils.getUriFileSize(PagePreview.this, imageUri); + Log.d(MyArApp.TAG, "------uriFileSize-----" + uriFileSize+"--Mb"); + if(uriFileSize>=5){ + Toast.makeText(PagePreview.this, getString(R.string.import_im_too_big), Toast.LENGTH_SHORT).show(); + return; + } + imageView.setImageURI(imageUri); + new Thread(new Runnable() { + @Override + public void run() { + boolean b = Utils.saveToInternalStorage(name, imageUri, PagePreview.this); + if(b){ + String importPath = Utils.getImportPath(name); + MyDataBase.insertImport(importPath); + } + } + }).start(); + + + } + + } + + }); + + init(); + initClick(); + } + + + + private void onInitIm(float imW, float imH) { + Point screen = Utils.getScreen(this); + float newX = screen.x / 2f - imW / 2; + float newY = screen.y / 2f - imH / 2; + startMatrix.postTranslate(newX, newY); + imageView.setImageMatrix(startMatrix); + } + + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction() & event.getActionMasked()) { + case MotionEvent.ACTION_DOWN: + + startMatrix.set(imageView.getImageMatrix()); + endMatrix.set(imageView.getImageMatrix()); + + startPointF.set(event.getX(), event.getY()); + + + + + MODE = MODE_DRAG; + + break; + case MotionEvent.ACTION_POINTER_DOWN: + + startMatrix.set(endMatrix); + + distance = Utils.getDistance(event); + + MODE = MODE_SCALE; + + break; + case MotionEvent.ACTION_MOVE://滑动（单+双） + if (MODE == MODE_DRAG) {//单指滑动时 + + endMatrix.set(startMatrix); + //向矩阵传入位移距离 + endMatrix.postTranslate(event.getX() - startPointF.x, event.getY() - startPointF.y); + Log.d("---------------tt", "------ACTION_MOVE-----x=" + event.getX() + "------y=" + event.getY()); + } else if (MODE == MODE_SCALE) {//双指滑动时 + //计算缩放倍数 + scaleMultiple = Utils.getDistance(event) / distance; + //获取初始矩阵 + endMatrix.set(startMatrix); + //向矩阵传入缩放倍数 + endMatrix.postScale(scaleMultiple, scaleMultiple, startPointF.x, startPointF.y); + } + break; + case MotionEvent.ACTION_UP://单指离开 + case MotionEvent.ACTION_POINTER_UP://双指离开 + //手指离开后，重置状态 + MODE = MODE_NONE; + + break; + } + //事件结束后，把矩阵的变化同步到ImageView上 + imageView.setImageMatrix(endMatrix); + return true; + } + + @Override + public void onClick(View v) { + if (v.equals(imBack)) { + + if (isMain) { + finish(); + } else { + finish(); + } + + } else { + if (!hasPermission) { + showNoPermission(); + return; + } + if (v.equals(flashIm)) { + boolean selected = flashIm.isSelected(); + flashIm.setSelected(!selected); + camera.getCameraControl().enableTorch(!selected); + } else if (v.equals(imPhoto)) { + Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + intentActivityResultLauncher.launch(intent); + } else if (v.equals(imZoom)) { + if (seekBar.getVisibility() == View.VISIBLE) { + seekBar.setVisibility(View.GONE); + } else if (seekBar.getVisibility() == View.GONE) { + seekBar.setVisibility(View.VISIBLE); + } + }else if(v.equals(imFavorite)){ + boolean selected = imFavorite.isSelected(); + imFavorite.setSelected(!selected); + boolean newSelect = imFavorite.isSelected(); + if(newSelect){ + MyDataBase.insertOrUpdateLike(curBitmapPath); + }else { + MyDataBase.deleteLike(curBitmapPath); + + } + } + } + + } + + private void initClick() { + imBack.setOnClickListener(this); + flashIm.setOnClickListener(this); + imPhoto.setOnClickListener(this); + imZoom.setOnClickListener(this); + imFavorite.setOnClickListener(this); + seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + float v = (seekBar.getMax() - progress) / 10.0f; + imageView.setAlpha(v); + + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + + } + + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + + } + }); + } + + private void init() { + cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA; + permissions = new String[]{android.Manifest.permission.CAMERA}; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions = new String[]{android.Manifest.permission.CAMERA, Manifest.permission.READ_MEDIA_IMAGES}; + } else { + permissions = new String[]{android.Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; + } + if (!Utils.checkPermission(this,permissions)) { + hasPermission = false; + imageView.setOnTouchListener(null); + ActivityCompat.requestPermissions(this, permissions, 0); + } else { + hasPermission = true; + imageView.setOnTouchListener(this); + startCamera(); + } + } + + private void startCamera() { + ListenableFuture future = ProcessCameraProvider.getInstance(this); + future.addListener(() -> { + try { + ProcessCameraProvider cameraProvider = future.get(); + + Preview preview = new Preview.Builder().build(); + cameraProvider.unbindAll(); + ImageCapture.Builder builder1 = new ImageCapture.Builder(); + imageCapture = builder1.build(); + camera = cameraProvider.bindToLifecycle(this, cameraSelector, preview, imageCapture); + + preview.setSurfaceProvider(previewView.getSurfaceProvider()); + + if (curBitmapPath != null) { + Bitmap bitmap = Utils.loadImage(this, curBitmapPath); + imageView.setImageBitmap(bitmap); + int width = bitmap.getWidth(); + int height = bitmap.getHeight(); + onInitIm(width, height); + } + + } catch (Exception e) { + e.printStackTrace(); + } + }, ContextCompat.getMainExecutor(this)); + + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (requestCode == 0) { + if (Utils.checkPermission(PagePreview.this,permissions)) { + hasPermission = true; + imageView.setOnTouchListener(this); + startCamera(); + } else { + hasPermission = false; + imageView.setOnTouchListener(null); + } + + } + } + + + + + private void showNoPermission() { + Toast.makeText(this, getString(R.string.permission_fail), Toast.LENGTH_SHORT).show(); + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/act/PageWelcome.java b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageWelcome.java new file mode 100644 index 0000000..e2630f6 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/act/PageWelcome.java @@ -0,0 +1,57 @@ +package com.ar.sketch.paint.drawing.act; + +import android.content.Intent; +import android.os.Bundle; +import android.os.CountDownTimer; + +import androidx.appcompat.app.AppCompatActivity; + +import com.ar.sketch.paint.drawing.databinding.PageWelcomeBinding; +import com.ar.sketch.paint.drawing.tool.Utils; + +public class PageWelcome extends AppCompatActivity { + + private PageWelcomeBinding binding; + private long time = 1000; + private CountDownTimer countDownTimer; + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = PageWelcomeBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + Utils.setStatusBarTextColor(this, true); + + + countDownTimer= new CountDownTimer(time,100) { + @Override + public void onTick(long millisUntilFinished) { + int progressPercentage = (int) ((100 * millisUntilFinished) / time); + int Percentage = 100 - progressPercentage; + binding.loadingPb.setProgress(Percentage); + } + + @Override + public void onFinish() { + enterMain(); + } + }; + countDownTimer.start(); + } + private void enterMain() { + binding.loadingPb.setProgress(100); + Intent intent = new Intent(PageWelcome.this, PageMain.class); + startActivity(intent); + finish(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (countDownTimer != null) { + countDownTimer.cancel(); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/act/UploadActivity.kt b/app/src/main/java/com/ar/sketch/paint/drawing/act/UploadActivity.kt new file mode 100644 index 0000000..2ec84af --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/act/UploadActivity.kt @@ -0,0 +1,73 @@ +package com.ar.sketch.paint.drawing.act + +import android.Manifest +import android.annotation.SuppressLint +import android.content.pm.PackageManager +import android.os.Bundle +import android.util.Log +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat + +import com.ar.sketch.paint.drawing.databinding.ActivityUploadBinding +import com.ar.sketch.paint.drawing.tool.Http +import com.ar.sketch.paint.drawing.tool.Upload +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch + + +class UploadActivity : AppCompatActivity() { + + + private lateinit var requestPermissionLauncher: ActivityResultLauncher> + private val permissions = arrayOf( + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION + ) + private lateinit var binding: ActivityUploadBinding + + @SuppressLint("SuspiciousIndentation") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityUploadBinding.inflate(layoutInflater) + setContentView(binding.root) + +// requestPermissionLauncher = +// registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result -> +// val phoneGranted: Boolean = result[Manifest.permission.READ_PHONE_STATE] == true +// val locationGranted: Boolean = +// result[Manifest.permission.ACCESS_FINE_LOCATION] == true +// val coarseLocation: Boolean = +// result[Manifest.permission.ACCESS_COARSE_LOCATION] == true +// +// Log.e("Permission", "1=${phoneGranted} 2= ${locationGranted} 3=$coarseLocation") +// if (phoneGranted && locationGranted && coarseLocation) { +// Upload.getData(this) +// } +// +// } +// +// +// if (ContextCompat.checkSelfPermission( +// this, +// Manifest.permission.READ_PHONE_STATE +// ) != PackageManager.PERMISSION_GRANTED +// || ContextCompat.checkSelfPermission( +// this, +// Manifest.permission.ACCESS_FINE_LOCATION +// ) != PackageManager.PERMISSION_GRANTED +// ) { +// +//// requestPermissionLauncher.launch(permissions) +// } else { +// Upload.getData(this) +// } + binding.btn.setOnClickListener { + Http.makeGetRequest(this) + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListFavorite.java b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListFavorite.java new file mode 100644 index 0000000..0f0a449 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListFavorite.java @@ -0,0 +1,93 @@ +package com.ar.sketch.paint.drawing.adapter; + +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.paint.drawing.dbmanager.LocalData; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.ar.sketch.paint.drawing.act.PagePreview; +import com.ar.sketch.paint.drawing.tool.Utils; +import com.ar.sketch.paint.drawing.R; + +import java.util.List; + +public class ListFavorite extends RecyclerView.Adapter { + + + private Activity mCon; + private List data; + + + public void setData(List data) { + this.data = data; + notifyDataSetChanged(); + } + public ListFavorite(Activity mCon) { + this.mCon = mCon; + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_list, parent, false); + return new HomeVH(view); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + LocalData localData = data.get(position); + String name = localData.getPath(); + new Thread(new Runnable() { + @Override + public void run() { + Bitmap bitmap = Utils.loadImage(mCon, name); + mCon.runOnUiThread(()->{ + holder.previewIm.setImageBitmap(bitmap); + }); + + } + }).start(); + + + holder.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mCon, PagePreview.class); + intent.putExtra(MyArApp.Key_Camera, name); + mCon.startActivity(intent); + } + }); + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ImageView previewIm, imFavorite; + + private CardView cardView ; + + + public HomeVH(@NonNull View itemView) { + super(itemView); + previewIm = itemView.findViewById(R.id.imPreview); + cardView = itemView.findViewById(R.id.card_view); + + imFavorite = itemView.findViewById(R.id.im_favorite); + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListImport.java b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListImport.java new file mode 100644 index 0000000..f55d9ea --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListImport.java @@ -0,0 +1,112 @@ +package com.ar.sketch.paint.drawing.adapter; + +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.paint.drawing.act.PagePreview; +import com.ar.sketch.paint.drawing.databinding.ListImportBinding; +import com.ar.sketch.paint.drawing.dbmanager.ImportData; +import com.ar.sketch.paint.drawing.dbmanager.MyDataBase; +import com.ar.sketch.paint.drawing.tool.MyArApp; + +import java.util.ArrayList; +import java.util.List; + +public class ListImport extends RecyclerView.Adapter { + + + private Activity mCon; + private List data = new ArrayList<>(); + + + public void setData(List data) { + this.data = data; + notifyDataSetChanged(); + } + public ListImport(Activity mCon) { + this.mCon = mCon; + } + + public void addData(ImportData newData){ + data.add(newData); + int i = data.size() - 1; + notifyItemInserted(i); + notifyItemChanged(i); + + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + return new HomeVH(ListImportBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + ImportData importData = data.get(position); + String path = importData.getUri(); + new Thread(new Runnable() { + @Override + public void run() { + Bitmap bitmap = BitmapFactory.decodeFile(path); + mCon.runOnUiThread(()->{ + holder.binding.imPreview.setImageBitmap(bitmap); + }); + + } + }).start(); + + + + holder.binding.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mCon, PagePreview.class); + intent.putExtra(MyArApp.Key_Camera, path); + mCon.startActivity(intent); + } + }); + holder.binding.delete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + int adapterPosition = holder.getAdapterPosition(); + MyDataBase.deleteImport(path); + data.remove(adapterPosition); + notifyItemRemoved(adapterPosition); + } + }); + + + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + + + private ListImportBinding binding; + + + public HomeVH(@NonNull ListImportBinding itemView) { + super(itemView.getRoot()); + binding = itemView; + + + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListMain.java b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListMain.java new file mode 100644 index 0000000..fdfa276 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/ListMain.java @@ -0,0 +1,93 @@ +package com.ar.sketch.paint.drawing.adapter; + +import android.content.Context; +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.paint.drawing.api.OnClick; +import com.ar.sketch.paint.drawing.databinding.ListHomeBinding; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.ar.sketch.paint.drawing.tool.Utils; + +import java.util.ArrayList; +import java.util.List; + +public class ListMain extends RecyclerView.Adapter { + private List nameList = MyArApp.getAllDir(); + + private Context mCon; + + private OnClick listener; + + public ListMain(Context mCon) { + this.mCon = mCon; + } + + public void setListener(OnClick listener) { + this.listener = listener; + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + return new HomeVH(ListHomeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + String dir = nameList.get(position); + String filePath = dir + "/1.jpg"; + String filePath2 = dir + "/2.jpg"; + String filePath3 = dir + "/3.jpg"; + String filePath4 = dir + "/4.jpg"; + Bitmap bitmap = Utils.loadImageFromAssets(mCon, filePath); + String substring = dir.substring(dir.lastIndexOf("_") + 1); + + holder.itemBinding.name.setText(substring); + List data = new ArrayList<>(); + data.add(filePath); + data.add(filePath2); + data.add(filePath3); + data.add(filePath4); + listChild listAdapter = new listChild(mCon, data); + listAdapter.setListener(listener); + holder.itemBinding.childRecycler.setAdapter(listAdapter); + holder.itemBinding.childRecycler.setLayoutManager(new LinearLayoutManager(mCon, LinearLayoutManager.HORIZONTAL, false)); + + holder.itemBinding.all.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + listener.onClickItem(0, dir); + } + + } + }); + + + } + + + @Override + public int getItemCount() { + return nameList.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ListHomeBinding itemBinding; + + public HomeVH(@NonNull ListHomeBinding itemHomeBinding) { + super(itemHomeBinding.getRoot()); + itemBinding = itemHomeBinding; + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/adapter/RecyclerList.java b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/RecyclerList.java new file mode 100644 index 0000000..2864dfe --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/RecyclerList.java @@ -0,0 +1,79 @@ +package com.ar.sketch.paint.drawing.adapter; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.paint.drawing.act.PagePreview; +import com.ar.sketch.paint.drawing.databinding.ListListBinding; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.ar.sketch.paint.drawing.tool.Utils; + +import java.util.List; + +public class RecyclerList extends RecyclerView.Adapter { + + + private Context mCon; + private List data; + + + + public RecyclerList(Context mCon, List bitmapList) { + this.mCon = mCon; + data = bitmapList; + } + + + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + return new HomeVH( ListListBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + + String name = data.get(position); + Bitmap bitmap = Utils.loadImageFromAssets(mCon, name); + holder.binding.imPreview.setImageBitmap(bitmap); + + holder.binding.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mCon, PagePreview.class); + intent.putExtra(MyArApp.Key_Camera, name); + mCon.startActivity(intent); + } + }); + + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ListListBinding binding; + + + + + public HomeVH(@NonNull ListListBinding itemView) { + super(itemView.getRoot()); + binding = itemView; + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/adapter/listChild.java b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/listChild.java new file mode 100644 index 0000000..7fd1fbb --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/adapter/listChild.java @@ -0,0 +1,83 @@ +package com.ar.sketch.paint.drawing.adapter; + +import android.content.Context; +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.paint.drawing.api.OnClick; +import com.ar.sketch.paint.drawing.databinding.ListChildBinding; +import com.ar.sketch.paint.drawing.tool.Utils; + +import java.util.List; + +public class listChild extends RecyclerView.Adapter { + + + private Context mCon; + private List data; + + private OnClick listener; + + + public void setListener(OnClick listener) { + this.listener = listener; + } + + public listChild(Context mCon, List bitmapList ) { + this.mCon = mCon; + data = bitmapList; + + } + + + @NonNull + @Override + public ChildVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + + return new ChildVH( ListChildBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ChildVH holder, int position) { + + String name = data.get(position); + Bitmap bitmap = Utils.loadImageFromAssets(mCon, name); + holder.binding.imPreview.setImageBitmap(bitmap); + holder.binding.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + listener.onClickItem(1, name); + } + } + }); + + + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class ChildVH extends RecyclerView.ViewHolder { + + + private ListChildBinding binding; + + + public ChildVH(@NonNull ListChildBinding itemView) { + super(itemView.getRoot()); + binding = itemView; + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/api/OnClick.java b/app/src/main/java/com/ar/sketch/paint/drawing/api/OnClick.java new file mode 100644 index 0000000..c3779f7 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/api/OnClick.java @@ -0,0 +1,6 @@ +package com.ar.sketch.paint.drawing.api; + +public interface OnClick { + + void onClickItem(int type,String dir); +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/api/OnLike.java b/app/src/main/java/com/ar/sketch/paint/drawing/api/OnLike.java new file mode 100644 index 0000000..3ec8acd --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/api/OnLike.java @@ -0,0 +1,7 @@ +package com.ar.sketch.paint.drawing.api; + +public interface OnLike { + + void onAddLike(); + void onDeleteLike(); +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/ImportData.java b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/ImportData.java new file mode 100644 index 0000000..dd73bb1 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/ImportData.java @@ -0,0 +1,32 @@ +package com.ar.sketch.paint.drawing.dbmanager; + + +import io.objectbox.annotation.Entity; +import io.objectbox.annotation.Id; + +@Entity +public class ImportData { + + @Id + private long id; + + private String uri; + + + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/LocalData.java b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/LocalData.java new file mode 100644 index 0000000..d9f5c39 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/LocalData.java @@ -0,0 +1,32 @@ +package com.ar.sketch.paint.drawing.dbmanager; + + +import io.objectbox.annotation.Entity; +import io.objectbox.annotation.Id; + +@Entity +public class LocalData { + + @Id + private long id; + + private String path; + + + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/MyDataBase.java b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/MyDataBase.java new file mode 100644 index 0000000..c1cd810 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/dbmanager/MyDataBase.java @@ -0,0 +1,148 @@ +package com.ar.sketch.paint.drawing.dbmanager; + +import android.content.Context; +import android.util.Log; + +import com.ar.sketch.paint.drawing.api.OnLike; +import com.ar.sketch.paint.drawing.tool.MyArApp; + +import java.util.ArrayList; +import java.util.List; + +import io.objectbox.Box; +import io.objectbox.BoxStore; +import io.objectbox.query.QueryBuilder; + +public class MyDataBase { + + private static BoxStore boxStore; + + private static Box LikeBox; + + private static Box ImportBox; + + private static List list = new ArrayList<>(); + + public static void addListener(OnLike listener) { + list.add(listener); + } + + public static void init(Context context) { + boxStore = MyObjectBox.builder().androidContext(context).build(); + } + + private static Box getObjectBoxLike() { + if (LikeBox == null) { + LikeBox = boxStore.boxFor(LocalData.class); + } + + return LikeBox; + } + private static Box getObjectBoxImport() { + if (ImportBox == null) { + ImportBox = boxStore.boxFor(ImportData.class); + } + + return ImportBox; + } + + public static void insertOrUpdateLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + LocalData first = objectBoxLike.query() + .equal(LocalData_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first == null) { + LocalData localData = new LocalData(); + localData.setPath(mPath); + objectBoxLike.put(localData); + for(OnLike listener:list){ + listener.onAddLike(); + } + } else { + + } + } + public static void insertImport(String muri) { + Box objectBoxImport = getObjectBoxImport(); + ImportData first = objectBoxImport.query() + .equal(ImportData_.uri, muri, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first == null) { + + ImportData importData = new ImportData(); + importData.setUri(muri); + objectBoxImport.put(importData); + } else { + + } + + } + + public static void deleteImport(String mPath) { + Box objectBoxImport = getObjectBoxImport(); + ImportData first = objectBoxImport.query() + .equal(ImportData_.uri, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first != null) { + objectBoxImport.remove(first); + for(OnLike listener:list){ +// listener.onDeleteLike(); + } + Log.d(MyArApp.TAG, "--------deleteImport imId=" + mPath); + } + + + } + + public static void deleteLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + LocalData boxLike = objectBoxLike.query() + .equal(LocalData_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (boxLike != null) { + objectBoxLike.remove(boxLike); + for(OnLike listener:list){ + listener.onDeleteLike(); + } + Log.d(MyArApp.TAG, "--------deleteLike imId=" + mPath); + } + + + } + + public static List queryAllLike() { + return getObjectBoxLike().query() + .build() + .find(); + } + + public static List queryAllImport() { + return getObjectBoxImport().query() + .build() + .find(); + } + public static boolean queryIsImport(String mPath) { + Box objectBoxImport = getObjectBoxImport(); + ImportData first = objectBoxImport.query() + .equal(ImportData_.uri, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + return first != null; + + } + + + public static boolean queryIsLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + LocalData first = objectBoxLike.query() + .equal(LocalData_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + return first != null; + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageFavorite.java b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageFavorite.java new file mode 100644 index 0000000..61c22b7 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageFavorite.java @@ -0,0 +1,79 @@ +package com.ar.sketch.paint.drawing.frag; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.ar.sketch.paint.drawing.adapter.ListFavorite; +import com.ar.sketch.paint.drawing.api.OnLike; +import com.ar.sketch.paint.drawing.databinding.FragmentFavoriteBinding; +import com.ar.sketch.paint.drawing.dbmanager.LocalData; +import com.ar.sketch.paint.drawing.dbmanager.MyDataBase; +import com.ar.sketch.paint.drawing.tool.ItemDec; + +import java.util.List; + +public class PageFavorite extends Fragment { + private FragmentFavoriteBinding binding; + + public PageFavorite() { + + } + public static PageFavorite newInstance() { + return new PageFavorite(); + } + + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + binding = FragmentFavoriteBinding.inflate(getLayoutInflater()); + onInit(); + + return binding.getRoot(); + } + + private void onInit(){ + List datumLocals = MyDataBase.queryAllLike(); + ListFavorite listFavorite = new ListFavorite(requireActivity()); + listFavorite.setData(datumLocals); + updateUi(datumLocals); + ItemDec itemDec = new ItemDec(10, 10, 5); + binding.recyclerview.addItemDecoration(itemDec); + binding.recyclerview.setAdapter(listFavorite); + binding.recyclerview.setLayoutManager(new GridLayoutManager(requireContext(), 3)); + + + MyDataBase.addListener(new OnLike() { + @Override + public void onAddLike() { + List datumLocals = MyDataBase.queryAllLike(); + listFavorite.setData(datumLocals); + updateUi(datumLocals); + } + + @Override + public void onDeleteLike() { + List datumLocals = MyDataBase.queryAllLike(); + listFavorite.setData(datumLocals); + updateUi(datumLocals); + } + }); + } + + private void updateUi(List datumLocals){ + if(datumLocals.size()>0){ + binding.recyclerview.setVisibility(View.VISIBLE); + binding.layoutNoFavorite.setVisibility(View.GONE); + }else { + binding.recyclerview.setVisibility(View.GONE); + binding.layoutNoFavorite.setVisibility(View.VISIBLE); + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageHome.java b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageHome.java new file mode 100644 index 0000000..25bb4a7 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageHome.java @@ -0,0 +1,70 @@ +package com.ar.sketch.paint.drawing.frag; + +import android.content.Intent; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.ar.sketch.paint.drawing.act.PageList; +import com.ar.sketch.paint.drawing.act.PagePreview; +import com.ar.sketch.paint.drawing.adapter.ListMain; +import com.ar.sketch.paint.drawing.api.OnClick; +import com.ar.sketch.paint.drawing.databinding.FragmentHomeBinding; +import com.ar.sketch.paint.drawing.tool.MyArApp; + +public class PageHome extends Fragment implements OnClick { + + private FragmentHomeBinding binding; + + public PageHome() { + + } + + public static PageHome newInstance() { + PageHome fragment = new PageHome(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + binding = FragmentHomeBinding.inflate(getLayoutInflater()); + onInitRecycler(); + + + return binding.getRoot(); + } + + private void onInitRecycler() { + ListMain listMain = new ListMain(requireContext()); + listMain.setListener(this::onClickItem); + binding.recyclerview.setAdapter(listMain); + binding.recyclerview.setLayoutManager(new GridLayoutManager(requireContext(), 1)); + } + + + @Override + public void onClickItem(int type, String dir) { + switch (type) { + case 0: + Intent intent = new Intent(requireContext(), PageList.class); + intent.putExtra(MyArApp.Key_ViewDir, dir); + startActivity(intent); + break; + case 1: + Intent intent1 = new Intent(requireContext(), PagePreview.class); + intent1.putExtra(MyArApp.Key_Camera, dir); + startActivity(intent1); + break; + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageImport.java b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageImport.java new file mode 100644 index 0000000..24d9be4 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/frag/PageImport.java @@ -0,0 +1,215 @@ +package com.ar.sketch.paint.drawing.frag; + +import android.Manifest; +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.provider.MediaStore; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.ar.sketch.paint.drawing.R; +import com.ar.sketch.paint.drawing.adapter.ListImport; +import com.ar.sketch.paint.drawing.databinding.FragmentImportBinding; +import com.ar.sketch.paint.drawing.dbmanager.ImportData; +import com.ar.sketch.paint.drawing.dbmanager.MyDataBase; +import com.ar.sketch.paint.drawing.tool.ItemDec; +import com.ar.sketch.paint.drawing.tool.MyArApp; +import com.ar.sketch.paint.drawing.tool.Utils; + +import java.io.File; +import java.util.List; +import java.util.Map; + +public class PageImport extends Fragment { + + private FragmentImportBinding binding; + + + private String[] permissions; + + private ListImport listImport; + private ActivityResultLauncher intentActivityResultLauncher; + private ActivityResultLauncher permissionsLauncher; + public PageImport() { + + } + + public static PageImport newInstance() { + PageImport fragment = new PageImport(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + binding = FragmentImportBinding.inflate(getLayoutInflater()); + onInit(); + + return binding.getRoot(); + } + + + private void onInit() { + + binding.loading.setVisibility(View.VISIBLE); + loadImport(); + binding.btnImport.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + checkPermission(); + } + }); + + permissionsLauncher = registerForActivityResult( + new ActivityResultContracts.RequestMultiplePermissions(), + new ActivityResultCallback>() { + @Override + public void onActivityResult(Map result) { + Boolean isGranted = true; + for (Map.Entry entry : result.entrySet()) { + String permission = entry.getKey(); + isGranted = entry.getValue(); + if(!entry.getValue()){ + isGranted = false; + } + } + if (isGranted) { + startIntent(); + }else { + Toast.makeText(requireContext(), " Permission denied", Toast.LENGTH_SHORT).show(); + } + } + } + ); + intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { + if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) { + Uri imageUri = result.getData().getData(); + if (imageUri != null) { + binding.loading.setVisibility(View.VISIBLE); + double uriFileSize = Utils.getUriFileSize(requireContext(), imageUri); + Log.d(MyArApp.TAG, "------uriFileSize-----" + uriFileSize + "--Mb"); + if (uriFileSize >= 5) { + binding.loading.setVisibility(View.GONE); + Toast.makeText(requireContext(), getString(R.string.import_im_too_big), Toast.LENGTH_SHORT).show(); + return; + } + String lastPathSegment = imageUri.getLastPathSegment(); + int index = lastPathSegment.lastIndexOf("/"); + + String name = lastPathSegment.substring(index + 1); + String importPath = Utils.getImportPath(name); + new Thread(new Runnable() { + @Override + public void run() { + File file = new File(importPath); + boolean isimport = MyDataBase.queryIsImport(importPath); + if (file.exists()) { + if (!isimport) { + MyDataBase.insertImport(importPath); + } + requireActivity().runOnUiThread(() -> { + binding.loading.setVisibility(View.GONE); + if (isimport) { + Toast.makeText(requireContext(), getString(R.string.import_already), Toast.LENGTH_SHORT).show(); + } else { + ImportData importData = new ImportData(); + importData.setUri(importPath); + listImport.addData(importData); + updateUi(true); + } + }); + } else { + boolean b = Utils.saveToInternalStorage(name, imageUri, requireContext()); + if (b) { + MyDataBase.insertImport(importPath); + } + requireActivity().runOnUiThread(() -> { + binding.loading.setVisibility(View.GONE); + if (b) { + ImportData importData = new ImportData(); + importData.setUri(importPath); + listImport.addData(importData); + updateUi(true); + } else { + Toast.makeText(requireContext(), getString(R.string.import_fail), Toast.LENGTH_SHORT).show(); + } + }); + } + + } + }).start(); + } + + } + + }); + } + + private void checkPermission() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions = new String[]{Manifest.permission.READ_MEDIA_IMAGES}; + } else { + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; + } + if (!Utils.checkPermission(requireActivity(), permissions)) { + permissionsLauncher.launch(permissions); + } else { + startIntent(); + } + } + + + private void startIntent() { + Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + intentActivityResultLauncher.launch(intent); + } + + + private void loadImport() { + ItemDec itemDec = new ItemDec(10, 10, 5); + binding.recyclerview.addItemDecoration(itemDec); + listImport = new ListImport(requireActivity()); + new Thread(new Runnable() { + @Override + public void run() { + List importUrises = MyDataBase.queryAllImport(); + requireActivity().runOnUiThread(() -> { + listImport.setData(importUrises); + updateUi(importUrises.size() > 0); + binding.loading.setVisibility(View.GONE); + }); + } + }).start(); + binding.recyclerview.setAdapter(listImport); + binding.recyclerview.setLayoutManager(new GridLayoutManager(requireActivity(), 3)); + } + + + private void updateUi(boolean isShow) { + if (isShow) { + binding.recyclerview.setVisibility(View.VISIBLE); + binding.layoutNoImport.setVisibility(View.GONE); + } else { + binding.recyclerview.setVisibility(View.GONE); + binding.layoutNoImport.setVisibility(View.VISIBLE); + } + + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/AESUtils.kt b/app/src/main/java/com/ar/sketch/paint/drawing/tool/AESUtils.kt new file mode 100644 index 0000000..69c2607 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/AESUtils.kt @@ -0,0 +1,105 @@ +import android.app.Activity +import android.provider.Contacts.SettingsColumns.KEY +import android.util.Base64 +import com.ar.sketch.paint.drawing.tool.Upload +import java.security.SecureRandom +import javax.crypto.Cipher +import javax.crypto.KeyGenerator +import javax.crypto.SecretKey +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + + +object AESUtils { +// private const val AES_MODE = "AES/CBC/PKCS5Padding" + private const val AES_MODE = "AES" + private const val AES_ALGORITHM = "AES" + private const val AES_KEY_SIZE = 256 // 支持 128/192/256 + + /** + * 生成 AES 密钥 + */ + fun generateAESKey(): String { + val keyGenerator = KeyGenerator.getInstance(AES_ALGORITHM) + keyGenerator.init(AES_KEY_SIZE, SecureRandom()) + val secretKey: SecretKey = keyGenerator.generateKey() + return Base64.encodeToString(secretKey.encoded, Base64.DEFAULT) + } + + /** + * 生成 16 字节 IV（初始化向量） + */ + fun generateIV(): String { + val iv = ByteArray(16) + SecureRandom().nextBytes(iv) + return Base64.encodeToString(iv, Base64.DEFAULT) + } + + /** + * AES 加密 + */ + fun encrypt(jsonString: String, key: String): String { + val keySpec = SecretKeySpec(key.toByteArray(Charsets.UTF_8), AES_ALGORITHM) + val ivSpec = IvParameterSpec(key.toByteArray(Charsets.UTF_8)) + + val cipher = Cipher.getInstance(AES_MODE) + cipher.init(Cipher.ENCRYPT_MODE, keySpec) + + val encryptedBytes = cipher.doFinal(jsonString.toByteArray(Charsets.UTF_8)) + return Base64.encodeToString(encryptedBytes, Base64.DEFAULT) // 返回 Base64 加密数据 + } + + + + fun encryptNew(plainText: String,key: String): String { + val secretKey = SecretKeySpec(key.toByteArray(), AES_MODE) + val cipher = Cipher.getInstance(AES_MODE) + cipher.init(Cipher.ENCRYPT_MODE, secretKey) + val encryptedBytes = cipher.doFinal(plainText.toByteArray()) + return Base64.encodeToString(encryptedBytes, Base64.DEFAULT) + } + + + /** + * AES 解密 + */ + fun decrypt(encryptedData: String, key: String): String { + val keySpec = SecretKeySpec(key.toByteArray(Charsets.UTF_8), AES_ALGORITHM) + val ivSpec = IvParameterSpec(key.toByteArray(Charsets.UTF_8)) + + val cipher = Cipher.getInstance(AES_MODE) + cipher.init(Cipher.DECRYPT_MODE, keySpec) + + val decryptedBytes = cipher.doFinal(Base64.decode(encryptedData, Base64.DEFAULT)) + return String(decryptedBytes, Charsets.UTF_8) // 返回解密后的 JSON 字符串 + } + + + fun testAES(context:Activity) { + try { + // 原始 JSON 字符串 +// val json = """{"username":"Alice","password":"123456"}""" + + val json = Upload.getData(context) + + // 生成 AES 密钥和 IV + val aesKey = "e67cbcee5e573d1b" + val aesIV = generateIV() + + println("AES 密钥: $aesKey") +// println("AES IV: $aesIV") + + // 加密 JSON + val encryptedData = encrypt(json, aesKey) + println("加密后: $encryptedData") + + // 解密 JSON + val decryptedData = decrypt(encryptedData, aesKey) + println("解密后: $decryptedData") + + } catch (e: Exception) { + e.printStackTrace() + } + } + +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/FontTv.java b/app/src/main/java/com/ar/sketch/paint/drawing/tool/FontTv.java new file mode 100644 index 0000000..11981eb --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/FontTv.java @@ -0,0 +1,32 @@ +package com.ar.sketch.paint.drawing.tool; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; + +import androidx.annotation.Nullable; + +import com.ar.sketch.paint.drawing.R; + +public class FontTv extends androidx.appcompat.widget.AppCompatTextView { + + + public FontTv(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + initAttrs(context,attrs); + } + + + private void initAttrs(Context context, AttributeSet attrs){ + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MyTV); + boolean aBoolean = typedArray.getBoolean(R.styleable.MyTV_apply_font,false); + if(aBoolean){ + Utils.initFont(this); + } + + typedArray.recycle(); + } + + + +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/Http.kt b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Http.kt new file mode 100644 index 0000000..83dd0c9 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Http.kt @@ -0,0 +1,73 @@ +package com.ar.sketch.paint.drawing.tool + +import AESUtils +import android.app.Activity +import android.util.Log +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import okhttp3.Call +import okhttp3.Callback +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.Response +import okhttp3.logging.HttpLoggingInterceptor +import org.json.JSONObject +import java.io.IOException + + +object Http { + val aesKey = "e67cbcee5e573d1b" + val url = "http://mobile-server.lux-ad.com:58077/api/mobile/save" + + + fun makeGetRequest(context: Activity) { + val logging = HttpLoggingInterceptor() + logging.setLevel(HttpLoggingInterceptor.Level.BODY) + + + + GlobalScope.launch(Dispatchers.IO) { + val data = Upload.getData(context) + + withContext(Dispatchers.Main){ + val encryptJson = AESUtils.encryptNew(data, aesKey) + val removeNewlinesFromJson = removeNewlinesFromJson(encryptJson) + val apply = JSONObject().apply { + put("encrypted", removeNewlinesFromJson) + } + val client: OkHttpClient = OkHttpClient.Builder() + .addInterceptor(logging) + .build() +// val client = OkHttpClient() + val requestBody: RequestBody = + apply.toString().toRequestBody("application/json; charset=utf-8".toMediaType()) + + val request: Request = Request.Builder() + .url(url) + .post(requestBody) + .build() + client.newCall(request).enqueue(object : Callback { + override fun onFailure(call: Call, e: IOException) { + Log.e("==================", "onFailure e=${e.message}") + } + + override fun onResponse(call: Call, response: Response) { + Log.e("==================", "response=${response.code} ${response.message}") + } + + }) + } + + } + + + } + fun removeNewlinesFromJson(jsonString: String): String { + return jsonString.replace("\n", "").replace("\r", "") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/ItemDec.java b/app/src/main/java/com/ar/sketch/paint/drawing/tool/ItemDec.java new file mode 100644 index 0000000..f2b1515 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/ItemDec.java @@ -0,0 +1,74 @@ +package com.ar.sketch.paint.drawing.tool; + +import android.graphics.Rect; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; + + +public class ItemDec extends RecyclerView.ItemDecoration { + + private int v, h, ex; + + public ItemDec(int v, int h, int ex) { + this.v = Math.round(dpToPx(v)); + this.h = Math.round(dpToPx(h)); + this.ex = Math.round(dpToPx(ex)); + } + + @Override + public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { + super.getItemOffsets(outRect, view, parent, state); + int spanCount = 1; + int spanSize = 1; + int spanIndex = 0; + + int childAdapterPosition = parent.getChildAdapterPosition(view); + RecyclerView.LayoutManager layoutManager = parent.getLayoutManager(); + if (layoutManager instanceof StaggeredGridLayoutManager) { + StaggeredGridLayoutManager staggeredGridLayoutManager = (StaggeredGridLayoutManager) layoutManager; + StaggeredGridLayoutManager.LayoutParams layoutParams = (StaggeredGridLayoutManager.LayoutParams) view.getLayoutParams(); + spanCount = staggeredGridLayoutManager.getSpanCount(); + if (layoutParams.isFullSpan()) { + spanSize = spanCount; + } + spanIndex = layoutParams.getSpanIndex(); + } else if (layoutManager instanceof GridLayoutManager) { + GridLayoutManager gridLayoutManager = (GridLayoutManager) layoutManager; + GridLayoutManager.LayoutParams layoutParams = (GridLayoutManager.LayoutParams) view.getLayoutParams(); + spanCount = gridLayoutManager.getSpanCount(); + spanSize = gridLayoutManager.getSpanSizeLookup().getSpanSize(childAdapterPosition); + spanIndex = layoutParams.getSpanIndex(); + } else if (layoutManager instanceof LinearLayoutManager) { + outRect.left = v; + outRect.right = v; + outRect.bottom = h; + } + + if (spanSize == spanCount) { + outRect.left = v + ex; + outRect.right = v + ex; + outRect.bottom = h; + + } else { + int itemAllSpacing = (v * (spanCount + 1) + ex * 2) / spanCount; + int left = v * (spanIndex + 1) - itemAllSpacing * spanIndex + ex; + int right = itemAllSpacing - left; + outRect.left = left; + outRect.right = right; + outRect.bottom = h; + + } + + } + + + public static float dpToPx(float dpValue) { + float density = MyArApp.app.getResources().getDisplayMetrics().density; + return density * dpValue + 0.5f; + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/MyArApp.java b/app/src/main/java/com/ar/sketch/paint/drawing/tool/MyArApp.java new file mode 100644 index 0000000..23bcb9a --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/MyArApp.java @@ -0,0 +1,101 @@ +package com.ar.sketch.paint.drawing.tool; + +import android.app.Application; +import android.content.res.AssetManager; +import android.graphics.Typeface; + +import com.ar.sketch.paint.drawing.dbmanager.MyDataBase; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class MyArApp extends Application { + public static String Key_ViewDir = "pre_dir"; + public static String Key_ISMAIN = "ismain"; + public static String Key_Camera = "camera_data"; + + public static String TAG = "============="; + + + public static MyArApp app; + +// private String APPId ="h67505d35951dc"; +// +// private String AppKey ="a81d17e5cc10cd96a65fe75c0ffd15334"; + + public static Typeface defaultFont; + + @Override + public void onCreate() { + super.onCreate(); + app = this; + AssetManager assets = getAssets(); + defaultFont = Typeface.createFromAsset(assets, "myfont.ttf"); + + MyDataBase.init(this); + + } + +// private void initSDk(){ +// ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { +// +// @Override +// public void onResultCallback(boolean isEU) { +// if (isEU && ATSDK.getGDPRDataLevel(MyApplication.this) == ATSDK.UNKNOWN) { +// ATSDK.showGdprAuth(MyApplication.this); +// } +// +// } +// +// @Override +// public void onErrorCallback(String errorMsg) { +// +// } +// }); +// ATSDK.init( this, APPId, AppKey); +// ; +// } + + public static String Class_Animals = "res_Animals"; + public static String Class_birds = "res_Birds"; + public static String Class_butterfly = "res_Butterfly"; + public static String Class_cafe = "res_Cafe"; + public static String Class_cartoons = "res_Cartoons"; + public static String Class_christmas = "res_Christmas"; + public static String Class_festivals = "res_Festivals"; + public static String Class_flowers = "res_Flowers"; + public static String Class_fruits = "res_Fruits"; + public static String Class_general = "res_General"; + + public static String Class_mehndi = "res_Mehndi"; + public static String Class_nature = "res_Nature"; + public static String Class_properties = "res_Properties"; + public static String Class_rangoli = "res_Rangoli"; + public static String Class_sports = "res_Sports"; + public static String Class_vehicles = "res_Vehicles"; + + public static List getAllDir() { + ArrayList list = new ArrayList<>(); + list.add(Class_Animals); + list.add(Class_birds); + list.add(Class_butterfly); + list.add(Class_cafe); + list.add(Class_cartoons); + list.add(Class_christmas); + list.add(Class_festivals); + list.add(Class_flowers); + list.add(Class_fruits); + list.add(Class_general); + list.add(Class_mehndi); + list.add(Class_nature); + list.add(Class_properties); + list.add(Class_rangoli); + list.add(Class_sports); + list.add(Class_vehicles); + Collections.shuffle(list); + return list; + + + } +} diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/Upload.kt b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Upload.kt new file mode 100644 index 0000000..c07f6d9 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Upload.kt @@ -0,0 +1,360 @@ +package com.ar.sketch.paint.drawing.tool + +import android.annotation.SuppressLint +import android.app.Activity +import android.content.Context +import android.content.pm.PackageInfo +import android.content.pm.PackageManager +import android.location.Location +import android.net.wifi.WifiInfo +import android.net.wifi.WifiManager +import android.os.BatteryManager +import android.os.Build +import android.os.SystemClock +import android.provider.Settings +import android.telephony.TelephonyManager +import android.text.format.Formatter +import android.util.Log +import android.webkit.WebView +import com.google.android.gms.ads.identifier.AdvertisingIdClient +import com.google.android.gms.appset.AppSet +import com.google.android.gms.appset.AppSetIdInfo +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONObject +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone +import androidx.lifecycle.lifecycleScope +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch + +object Upload { + + + fun getData(context: Activity): String { + + val jsonObject = JSONObject() + + val id = getDeviceId(context) + jsonObject.put("gaid", id) + + getWebViewPackageInfo(context)?.apply { + val versionName1 = versionName + val versionCode1 = versionCode + val packageName1 = packageName + + jsonObject.put("webVersionName", versionName) + jsonObject.put("webVersionCode", versionCode) + jsonObject.put("webPackageName", packageName) +// Log.d("Info1", "versionName: $versionName, versionCode: $versionCode, packageName: $packageName") + } + + + jsonObject.put("brand", Build.BRAND) + jsonObject.put("manufacturer", Build.MANUFACTURER) + jsonObject.put("model", Build.MODEL) + jsonObject.put("product", Build.PRODUCT) + jsonObject.put("device", Build.DEVICE) + jsonObject.put("board", Build.BOARD) + jsonObject.put("hardware", Build.HARDWARE) + jsonObject.put("fingerPrint", Build.FINGERPRINT) + jsonObject.put("buildId", Build.ID) + jsonObject.put("display", Build.DISPLAY) + jsonObject.put("type", Build.TYPE) + jsonObject.put("user", Build.USER) + jsonObject.put("host", Build.HOST) + jsonObject.put("tags", Build.TAGS) + jsonObject.put("serial", Build.SERIAL) + jsonObject.put("bootloader", Build.BOOTLOADER) + jsonObject.put("sdkInt", Build.VERSION.SDK_INT) + jsonObject.put("androidVersion", Build.VERSION.RELEASE) + jsonObject.put("baseOs", Build.VERSION.BASE_OS) + jsonObject.put("incremental", Build.VERSION.INCREMENTAL) + jsonObject.put("codename", Build.VERSION.CODENAME) + + + val androidID = getAndroidID(context) + jsonObject.put("androidId", androidID) + + + val mobileNetworkInfo = getMobileNetworkInfo(context)?.let { + //SIM卡的运营商名称 + it.networkOperatorName + //SIM卡的运营商代码 + it.simOperator + //国家代码 + it.simCountryIso + //SIM 卡状态 + it.simState + jsonObject.put("simOperator", it.simOperator) + jsonObject.put("simOperatorName", it.networkOperatorName) + jsonObject.put("simCountry", it.simCountryIso) + jsonObject.put("simState", it.simState) + +// if (ActivityCompat.checkSelfPermission( +// context, +// Manifest.permission.READ_PHONE_STATE +// ) != PackageManager.PERMISSION_GRANTED +// ) { +// //没有权限 +// Log.e("==================", "无法获取phone权限") +// return@let +// } else { +// //网络类型 +// val networkType = getNet(it.networkType) +// jsonObject.put("networkType",networkType) +// } + + + } + getWifiInfo(context).let { wifiInfo -> + val ssid = wifiInfo.ssid // WiFi 名称 + val bssid = wifiInfo.bssid // 路由器 MAC 地址 + val ip = wifiInfo.ipAddress + val ipAddress: String = Formatter.formatIpAddress(ip) // IP 地址 +// Log.d("WiFi Info", "SSID: $ssid, BSSID: $bssid, IP: $ipAddress") + + jsonObject.put("wifiSSID", ssid) + jsonObject.put("wifiBSSID", bssid) + + } + +// getLastLocation(context){location-> +// location?.let { +// val latitude: Double = location.latitude +// val longitude: Double = location.longitude +// val accuracy = location.accuracy // 获取精度（米） +// jsonObject.put("longitude",longitude) +// jsonObject.put("latitude",latitude) +//// jsonObject.put("randomOffset",latitude) +// Log.d("Location", "纬度: $latitude, 经度: $longitude") +// } +// } + + //电池电量 + val batteryInfo = getBatteryInfo(context) + jsonObject.put("batteryLevel", batteryInfo) + + //处理器核心数 + val coreCount = Runtime.getRuntime().availableProcessors() + jsonObject.put("availableProcessors", coreCount) + + //系统启动时长 +// val convertTimestampToDate = +// convertTimestampToDate(System.currentTimeMillis() - SystemClock.elapsedRealtime()) +// val systemUptime = getSystemUptime() + jsonObject.put("systemStarTime", SystemClock.elapsedRealtime()) + + //应用程序 APK 文件的最后修改时间 + val installTime = getInstallTime(context) + jsonObject.put("apkLastModified", installTime) + + //安装来源 + val installSource = getInstallSourceNew(context) + jsonObject.put("installerPkg", installSource) + + + Log.d("===================================", jsonObject.toString()) + return jsonObject.toString() + + } + + + fun getInstallSource(context: Context): String? { + val packageManager = context.packageManager + val installer = packageManager.getInstallerPackageName(context.packageName) + return installer ?: "未知" + } + + fun getInstallSourceNew(context: Context): String? { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { // API 30+ + try { + val packageManager = context.packageManager + val installSourceInfo = packageManager.getInstallSourceInfo(context.packageName) + installSourceInfo.installingPackageName // 安装来源 + } catch (e: PackageManager.NameNotFoundException) { + "未知" + } + } else { + getInstallSource(context) // 兼容 API 30 以下 + } + } + + fun getSystemUptime(): String { + val uptimeMillis = SystemClock.elapsedRealtime() // 设备启动后的毫秒数 + val uptimeSeconds = uptimeMillis / 1000 + val hours = uptimeSeconds / 3600 + val minutes = uptimeSeconds % 3600 / 60 + val seconds = uptimeSeconds % 60 + val uptimeFormatted = "$hours 小时 $minutes 分钟 $seconds 秒" + Log.d("DeviceInfo", "系统运行时间: $uptimeFormatted") + return uptimeFormatted + } + + private fun getLastLocation(context: Activity, result: (location: Location?) -> Unit) { +// val fusedLocationClient = LocationServices.getFusedLocationProviderClient(context) +// +// if (ActivityCompat.checkSelfPermission( +// context, +// Manifest.permission.ACCESS_FINE_LOCATION +// ) != PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission( +// context, +// Manifest.permission.ACCESS_COARSE_LOCATION +// ) != PackageManager.PERMISSION_GRANTED +// ) { +// Log.e("==================", "无法获取位置权限") +// return +// } +// fusedLocationClient.lastLocation +// .addOnSuccessListener(context, object : OnSuccessListener { +// override fun onSuccess(location: Location?) { +// result.invoke(location) +// if (location != null) { +// } else { +// +// Log.e("Location", "无法获取位置") +// } +// } +// }) + } + + fun getInstallTime(context: Context): String { + val lastModified = File(context.applicationInfo.sourceDir).lastModified() + return convertTimestampToDate(lastModified) + } + +// fun getInstallSource(context: Context): String? { +// return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { +// context.packageManager.getInstallSourceInfo(context.applicationInfo.packageName).installingPackageName +// } else { +// context.packageManager.getInstallerPackageName(context.applicationInfo.packageName) +// } +// +// } + + fun getBatteryInfo(context: Context): Int { + val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager + val batteryLevel = + batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) // 获取电池电量（0-100%） + val isCharging = batteryManager.isCharging // 是否在充电 + + return batteryLevel + } + + /** + * ACCESS_FINE_LOCATION + * + * ACCESS_WIFI_STATE + */ + fun getWifiInfo(context: Context): WifiInfo { + val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager + return wifiManager.connectionInfo + + } + + + /** + * READ_PHONE_STATE + */ + fun getMobileNetworkInfo(context: Context): TelephonyManager? { + val telephonyManager = + context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager + val operatorName = telephonyManager.networkOperatorName // 运营商名称 + + + return telephonyManager + + +// Log.d("Mobile Network", "Operator: $operatorName, Type: $networkType") + } + + fun getNet(networkType: Int): String { + return when (networkType) { + TelephonyManager.NETWORK_TYPE_LTE -> "4G" + + TelephonyManager.NETWORK_TYPE_NR -> "5G（Android 11+）" + + TelephonyManager.NETWORK_TYPE_HSPA -> "3G" + + TelephonyManager.NETWORK_TYPE_GPRS -> "2G" + else -> "" + } + } + + fun getWebViewPackageInfo(context: Activity): PackageInfo? { + val packageManager: PackageManager = context.packageManager + + // 如果系统支持直接获取 WebView 包信息 (Android 7.0 及以上) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + return WebView.getCurrentWebViewPackage() + } + // 如果不支持，尝试通过常见的 WebView 包名来获取信息 + val webviewPackageNames = listOf( + "com.google.android.webview", + "com.android.webview", + "com.android.chrome" + ) + for (packageName in webviewPackageNames) { + try { + val packageInfo = packageManager.getPackageInfo(packageName, 0) + if (packageInfo != null) { + return packageInfo + } + } catch (e: PackageManager.NameNotFoundException) { + // 忽略异常，继续尝试下一个包名 + } + } + // 如果都没有找到，返回 null + return null + } + + @SuppressLint("HardwareIds") + fun getAndroidID(context: Context): String? { + return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) + } + + + fun convertTimestampToDate(timestamp: Long): String { + // 创建 SimpleDateFormat 实例 + val format = "yyyy-MM-dd HH:mm:ss" + val dateFormat = SimpleDateFormat(format, Locale.getDefault()) + dateFormat.timeZone = TimeZone.getTimeZone("GMT") // 设置时区为 UTC，或者根据需要选择其他时区 + + // 将时间戳转换为 Date 对象 + val date = Date(timestamp) + + // 格式化 Date 对象为指定格式的字符串 + return dateFormat.format(date) + } + + + fun getDeviceId(context: Context): String? = + try { + // 优先尝试获取 GAID + val adInfo = AdvertisingIdClient.getAdvertisingIdInfo(context) + if (!adInfo.isLimitAdTrackingEnabled && !adInfo.id.isNullOrEmpty()) { + Log.d("DeviceIdHelper", "Using GAID: ${adInfo.id}") + adInfo.id + } else { + Log.d("DeviceIdHelper", "GAID not available or user limited it, using AppSet ID") + null + } + } catch (e: Exception) { + Log.e("DeviceIdHelper", "GAID fetch failed: ${e.message}") + null + } + + // ✅ 回退获取 App Set ID（Android 12+ 替代方案） +// return@withContext try { +// val appSetInfo: AppSetIdInfo = AppSet.getClient(context).appSetIdInfo.await() +// Log.d("DeviceIdHelper", "Using App Set ID: ${appSetInfo.id}") +// appSetInfo.id +// } catch (e: Exception) { +// Log.e("DeviceIdHelper", "App Set ID fetch failed: ${e.message}") +// null +// } + +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/paint/drawing/tool/Utils.java b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Utils.java new file mode 100644 index 0000000..c5380e5 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/paint/drawing/tool/Utils.java @@ -0,0 +1,188 @@ +package com.ar.sketch.paint.drawing.tool; + +import android.app.Activity; +import android.content.ContentResolver; +import android.content.Context; +import android.content.pm.PackageManager; +import android.content.res.AssetManager; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Point; +import android.net.Uri; +import android.util.DisplayMetrics; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; + +import androidx.core.app.ActivityCompat; + + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +public class Utils { + + + + public static void setStatusBarTextColor(Activity activity, boolean dark) { + Window window = activity.getWindow(); + View decor = window.getDecorView(); + if (dark) { + decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } else { + decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + } + window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); + } + + public static Point getScreen(Context context) { + DisplayMetrics displayMetrics = new DisplayMetrics(); + WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); + windowManager.getDefaultDisplay().getMetrics(displayMetrics); + int width = displayMetrics.widthPixels; + int height = displayMetrics.heightPixels; + Point point = new Point(); + point.x = width; + point.y = height; + return point; + } + + + + + public static Bitmap loadImage(Context context, String path) { + Bitmap bitmap = loadImageFromAssets(context, path); + if (bitmap == null) { + Bitmap bitmap1 = BitmapFactory.decodeFile(path); + Log.d(MyArApp.TAG,"--------import"); + return bitmap1; + } else { + Log.d(MyArApp.TAG,"--------Assets"); + return bitmap; + } + } + + + public static Bitmap loadImageFromAssets(Context context, String fileName) { + Bitmap bitmap = null; + AssetManager assetManager = context.getAssets(); + try (InputStream is = assetManager.open(fileName)) { + bitmap = BitmapFactory.decodeStream(is); + } catch (IOException e) { + return bitmap; + } + + return bitmap; + + } + + public static List fileExistsInAssets(Context context, String dir) { + + List pathList = new ArrayList(); + try { + AssetManager assetManager = context.getAssets(); + String[] files = assetManager.list(dir); + + if (files != null) { + for (String name : files) { + pathList.add(dir + "/" + name); + } + return pathList; + } + } catch (IOException e) { + + return pathList; + } + return pathList; + } + + + + + + public static float getDistance(MotionEvent event) { + float x = event.getX(0) - event.getX(1); + float y = event.getY(0) - event.getY(1); + return (float) Math.sqrt(x * x + y * y); + } + + + public static void initFont(TextView tv) { + tv.setTypeface(MyArApp.defaultFont); + } + + + public static boolean saveToInternalStorage(String fileName, Uri fileUri, Context context) { + try { + // 获取输入流 + Bitmap bitmap = BitmapFactory.decodeStream(context.getContentResolver().openInputStream(fileUri)); + // 创建图片文件 + File file = new File(context.getFilesDir(), fileName); + FileOutputStream fileOutputStream = new FileOutputStream(file); + // 将Bitmap图片进行存储 + bitmap.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream); + fileOutputStream.close(); + return true; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + } + + public static String getImportPath(String name) { + File filesDir = MyArApp.app.getFilesDir(); + String s = filesDir + "/" + name; + return s; + } + + public static float dpToPx(float dpValue) { + float density = MyArApp.app.getResources().getDisplayMetrics().density; + return density * dpValue + 0.5f; + } + + + public static boolean checkPermission(Activity activity,String[] permissions) { + boolean result = true; + for (String per : permissions) { + if (ActivityCompat.checkSelfPermission(activity, per) != PackageManager.PERMISSION_GRANTED) { + result = false; + } + } + return result; + + } + + public static double getUriFileSize(Context context, Uri uri) { + double fileSize = 0; + ContentResolver contentResolver = context.getContentResolver(); + + // 如果Uri是文件类型 + if (uri.getScheme().equals("file")) { + File file = new File(uri.getPath()); + fileSize = file.length(); + } else { // 如果Uri不是文件类型，则通过ContentResolver获取大小 + try { + fileSize = contentResolver.openFileDescriptor(uri, "r").getStatSize(); + + } catch (Exception e) { + Log.e("UriUtils", "Error while retrieving file size: " + e.getMessage()); + } + } + fileSize = fileSize/1048576.0; + return fileSize; + } + + + + + +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg.png b/app/src/main/res/drawable/bg.png new file mode 100644 index 0000000..7a2a6b7 Binary files /dev/null and b/app/src/main/res/drawable/bg.png differ diff --git a/app/src/main/res/drawable/bg_button_preview.xml b/app/src/main/res/drawable/bg_button_preview.xml new file mode 100644 index 0000000..676e5aa --- /dev/null +++ b/app/src/main/res/drawable/bg_button_preview.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_import.xml b/app/src/main/res/drawable/bg_import.xml new file mode 100644 index 0000000..82a1924 --- /dev/null +++ b/app/src/main/res/drawable/bg_import.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_main.xml b/app/src/main/res/drawable/bg_main.xml new file mode 100644 index 0000000..dd9a140 --- /dev/null +++ b/app/src/main/res/drawable/bg_main.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_seeall.xml b/app/src/main/res/drawable/bg_seeall.xml new file mode 100644 index 0000000..38319c0 --- /dev/null +++ b/app/src/main/res/drawable/bg_seeall.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stoke.xml b/app/src/main/res/drawable/bg_stoke.xml new file mode 100644 index 0000000..83e38d5 --- /dev/null +++ b/app/src/main/res/drawable/bg_stoke.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_tab.xml b/app/src/main/res/drawable/bg_tab.xml new file mode 100644 index 0000000..0ca3b52 --- /dev/null +++ b/app/src/main/res/drawable/bg_tab.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ch_flash.xml b/app/src/main/res/drawable/ch_flash.xml new file mode 100644 index 0000000..81836d8 --- /dev/null +++ b/app/src/main/res/drawable/ch_flash.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ch_import.xml b/app/src/main/res/drawable/ch_import.xml new file mode 100644 index 0000000..f148931 --- /dev/null +++ b/app/src/main/res/drawable/ch_import.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ch_like.xml b/app/src/main/res/drawable/ch_like.xml new file mode 100644 index 0000000..4d6f7a8 --- /dev/null +++ b/app/src/main/res/drawable/ch_like.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ch_tab_home.xml b/app/src/main/res/drawable/ch_tab_home.xml new file mode 100644 index 0000000..b407049 --- /dev/null +++ b/app/src/main/res/drawable/ch_tab_home.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ch_tab_like.xml b/app/src/main/res/drawable/ch_tab_like.xml new file mode 100644 index 0000000..d19a2ae --- /dev/null +++ b/app/src/main/res/drawable/ch_tab_like.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml new file mode 100644 index 0000000..f53206f --- /dev/null +++ b/app/src/main/res/drawable/ic_back.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_back_white.xml b/app/src/main/res/drawable/ic_back_white.xml new file mode 100644 index 0000000..b47d615 --- /dev/null +++ b/app/src/main/res/drawable/ic_back_white.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_circle.xml b/app/src/main/res/drawable/ic_circle.xml new file mode 100644 index 0000000..21211c7 --- /dev/null +++ b/app/src/main/res/drawable/ic_circle.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/ic_flash_close.xml b/app/src/main/res/drawable/ic_flash_close.xml new file mode 100644 index 0000000..9070684 --- /dev/null +++ b/app/src/main/res/drawable/ic_flash_close.xml @@ -0,0 +1,18 @@ + + + + diff --git a/app/src/main/res/drawable/ic_import0.xml b/app/src/main/res/drawable/ic_import0.xml new file mode 100644 index 0000000..82b953a --- /dev/null +++ b/app/src/main/res/drawable/ic_import0.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_import1.xml b/app/src/main/res/drawable/ic_import1.xml new file mode 100644 index 0000000..14879d5 --- /dev/null +++ b/app/src/main/res/drawable/ic_import1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_like0.xml b/app/src/main/res/drawable/ic_like0.xml new file mode 100644 index 0000000..1845a6c --- /dev/null +++ b/app/src/main/res/drawable/ic_like0.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_like1.xml b/app/src/main/res/drawable/ic_like1.xml new file mode 100644 index 0000000..0d74b36 --- /dev/null +++ b/app/src/main/res/drawable/ic_like1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_photo.xml b/app/src/main/res/drawable/ic_photo.xml new file mode 100644 index 0000000..14e3e07 --- /dev/null +++ b/app/src/main/res/drawable/ic_photo.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_remove.xml b/app/src/main/res/drawable/ic_remove.xml new file mode 100644 index 0000000..43c61ce --- /dev/null +++ b/app/src/main/res/drawable/ic_remove.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_tab_like1.xml b/app/src/main/res/drawable/ic_tab_like1.xml new file mode 100644 index 0000000..811a645 --- /dev/null +++ b/app/src/main/res/drawable/ic_tab_like1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_true_flash.xml b/app/src/main/res/drawable/ic_true_flash.xml new file mode 100644 index 0000000..e5fb9cd --- /dev/null +++ b/app/src/main/res/drawable/ic_true_flash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/like_stoke.xml b/app/src/main/res/drawable/like_stoke.xml new file mode 100644 index 0000000..c3ca983 --- /dev/null +++ b/app/src/main/res/drawable/like_stoke.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/pb_alaph_progress.xml b/app/src/main/res/drawable/pb_alaph_progress.xml new file mode 100644 index 0000000..98444bf --- /dev/null +++ b/app/src/main/res/drawable/pb_alaph_progress.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/preview_thumb.xml b/app/src/main/res/drawable/preview_thumb.xml new file mode 100644 index 0000000..2e1f673 --- /dev/null +++ b/app/src/main/res/drawable/preview_thumb.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_drawing0.xml b/app/src/main/res/drawable/tab_drawing0.xml new file mode 100644 index 0000000..dc1a222 --- /dev/null +++ b/app/src/main/res/drawable/tab_drawing0.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/tab_drawing1.xml b/app/src/main/res/drawable/tab_drawing1.xml new file mode 100644 index 0000000..4206776 --- /dev/null +++ b/app/src/main/res/drawable/tab_drawing1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/welcome_pb.xml b/app/src/main/res/drawable/welcome_pb.xml new file mode 100644 index 0000000..7340cbe --- /dev/null +++ b/app/src/main/res/drawable/welcome_pb.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml new file mode 100644 index 0000000..52af32c --- /dev/null +++ b/app/src/main/res/layout/activity_upload.xml @@ -0,0 +1,15 @@ + + + +