commit b2aa777639f956fb4a7720ac5f976e4e8f48db10 Author: litingting Date: Wed Apr 23 10:10:58 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/ARSketchDrawing.jks b/app/ARSketchDrawing.jks new file mode 100644 index 0000000..234d0bb Binary files /dev/null and b/app/ARSketchDrawing.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..61dbd5d --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +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.drawing" + compileSdk = 34 + + defaultConfig { + //com.ar.sketch.drawing + applicationId = "com.ar.sketch.drawing" + minSdk = 23 + targetSdk = 34 + versionCode = 1 + versionName = "1.0.0" + setProperty( + "archivesBaseName", + "AR Sketch Drawing_V" + versionName + "(${versionCode})_$timestamp" + ) + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + 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") + 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}") + +} \ 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..2bdfce6 --- /dev/null +++ b/app/objectbox-models/default.json @@ -0,0 +1,74 @@ +{ + "_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": "6:7538851138417121743", + "lastPropertyId": "2:9141214615690805226", + "name": "DataLocal", + "properties": [ + { + "id": "1:3359943781002877658", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:9141214615690805226", + "name": "path", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "7:463965928465774918", + "lastPropertyId": "2:5181380632390917246", + "name": "BeanImport", + "properties": [ + { + "id": "1:6460664315532313231", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:5181380632390917246", + "name": "uri", + "type": 9 + } + ], + "relations": [] + } + ], + "lastEntityId": "7:463965928465774918", + "lastIndexId": "0:0", + "lastRelationId": "0:0", + "lastSequenceId": "0:0", + "modelVersion": 5, + "modelVersionParserMinimum": 5, + "retiredEntityUids": [ + 4752690921563405782, + 3683195988363348208, + 3825568787982449740, + 6657683755955689878, + 407850772463518772 + ], + "retiredIndexUids": [], + "retiredPropertyUids": [ + 8935738795063358965, + 6634881448055585465, + 5221624129603754986, + 5984527578734576412, + 804363456560139643, + 1837531769919373488, + 5348030114980625145, + 243415540686520025, + 7391488554923755890, + 481535799621363836, + 8358790201098602109 + ], + "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..0d0d472 --- /dev/null +++ b/app/src/androidTest/java/com/paint/ar/drawing/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.ar.sketch.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..11b1704 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/Animals/1.jpg b/app/src/main/assets/Animals/1.jpg new file mode 100644 index 0000000..9488c65 Binary files /dev/null and b/app/src/main/assets/Animals/1.jpg differ diff --git a/app/src/main/assets/Animals/10.jpg b/app/src/main/assets/Animals/10.jpg new file mode 100644 index 0000000..78382a4 Binary files /dev/null and b/app/src/main/assets/Animals/10.jpg differ diff --git a/app/src/main/assets/Animals/11.jpg b/app/src/main/assets/Animals/11.jpg new file mode 100644 index 0000000..a4f7512 Binary files /dev/null and b/app/src/main/assets/Animals/11.jpg differ diff --git a/app/src/main/assets/Animals/12.jpg b/app/src/main/assets/Animals/12.jpg new file mode 100644 index 0000000..bab3cff Binary files /dev/null and b/app/src/main/assets/Animals/12.jpg differ diff --git a/app/src/main/assets/Animals/13.jpg b/app/src/main/assets/Animals/13.jpg new file mode 100644 index 0000000..5c3ef19 Binary files /dev/null and b/app/src/main/assets/Animals/13.jpg differ diff --git a/app/src/main/assets/Animals/14.jpg b/app/src/main/assets/Animals/14.jpg new file mode 100644 index 0000000..8b446f2 Binary files /dev/null and b/app/src/main/assets/Animals/14.jpg differ diff --git a/app/src/main/assets/Animals/15.jpg b/app/src/main/assets/Animals/15.jpg new file mode 100644 index 0000000..2f9dc4e Binary files /dev/null and b/app/src/main/assets/Animals/15.jpg differ diff --git a/app/src/main/assets/Animals/16.jpg b/app/src/main/assets/Animals/16.jpg new file mode 100644 index 0000000..aad9788 Binary files /dev/null and b/app/src/main/assets/Animals/16.jpg differ diff --git a/app/src/main/assets/Animals/17.jpg b/app/src/main/assets/Animals/17.jpg new file mode 100644 index 0000000..17c6f07 Binary files /dev/null and b/app/src/main/assets/Animals/17.jpg differ diff --git a/app/src/main/assets/Animals/18.jpg b/app/src/main/assets/Animals/18.jpg new file mode 100644 index 0000000..2ce93a7 Binary files /dev/null and b/app/src/main/assets/Animals/18.jpg differ diff --git a/app/src/main/assets/Animals/19.jpg b/app/src/main/assets/Animals/19.jpg new file mode 100644 index 0000000..2b24f31 Binary files /dev/null and b/app/src/main/assets/Animals/19.jpg differ diff --git a/app/src/main/assets/Animals/2.jpg b/app/src/main/assets/Animals/2.jpg new file mode 100644 index 0000000..0a0c2e7 Binary files /dev/null and b/app/src/main/assets/Animals/2.jpg differ diff --git a/app/src/main/assets/Animals/20.jpg b/app/src/main/assets/Animals/20.jpg new file mode 100644 index 0000000..347cddc Binary files /dev/null and b/app/src/main/assets/Animals/20.jpg differ diff --git a/app/src/main/assets/Animals/21.jpg b/app/src/main/assets/Animals/21.jpg new file mode 100644 index 0000000..5a04764 Binary files /dev/null and b/app/src/main/assets/Animals/21.jpg differ diff --git a/app/src/main/assets/Animals/22.jpg b/app/src/main/assets/Animals/22.jpg new file mode 100644 index 0000000..c18d8ad Binary files /dev/null and b/app/src/main/assets/Animals/22.jpg differ diff --git a/app/src/main/assets/Animals/23.jpg b/app/src/main/assets/Animals/23.jpg new file mode 100644 index 0000000..4270d19 Binary files /dev/null and b/app/src/main/assets/Animals/23.jpg differ diff --git a/app/src/main/assets/Animals/24.jpg b/app/src/main/assets/Animals/24.jpg new file mode 100644 index 0000000..355a944 Binary files /dev/null and b/app/src/main/assets/Animals/24.jpg differ diff --git a/app/src/main/assets/Animals/25.jpg b/app/src/main/assets/Animals/25.jpg new file mode 100644 index 0000000..c670943 Binary files /dev/null and b/app/src/main/assets/Animals/25.jpg differ diff --git a/app/src/main/assets/Animals/26.jpg b/app/src/main/assets/Animals/26.jpg new file mode 100644 index 0000000..4b95b01 Binary files /dev/null and b/app/src/main/assets/Animals/26.jpg differ diff --git a/app/src/main/assets/Animals/27.jpg b/app/src/main/assets/Animals/27.jpg new file mode 100644 index 0000000..87a8c12 Binary files /dev/null and b/app/src/main/assets/Animals/27.jpg differ diff --git a/app/src/main/assets/Animals/28.jpg b/app/src/main/assets/Animals/28.jpg new file mode 100644 index 0000000..770686a Binary files /dev/null and b/app/src/main/assets/Animals/28.jpg differ diff --git a/app/src/main/assets/Animals/29.jpg b/app/src/main/assets/Animals/29.jpg new file mode 100644 index 0000000..7127a11 Binary files /dev/null and b/app/src/main/assets/Animals/29.jpg differ diff --git a/app/src/main/assets/Animals/3.jpg b/app/src/main/assets/Animals/3.jpg new file mode 100644 index 0000000..4bf4897 Binary files /dev/null and b/app/src/main/assets/Animals/3.jpg differ diff --git a/app/src/main/assets/Animals/30.jpg b/app/src/main/assets/Animals/30.jpg new file mode 100644 index 0000000..f1d2047 Binary files /dev/null and b/app/src/main/assets/Animals/30.jpg differ diff --git a/app/src/main/assets/Animals/31.jpg b/app/src/main/assets/Animals/31.jpg new file mode 100644 index 0000000..0d08aa8 Binary files /dev/null and b/app/src/main/assets/Animals/31.jpg differ diff --git a/app/src/main/assets/Animals/4.jpg b/app/src/main/assets/Animals/4.jpg new file mode 100644 index 0000000..838c582 Binary files /dev/null and b/app/src/main/assets/Animals/4.jpg differ diff --git a/app/src/main/assets/Animals/5.jpg b/app/src/main/assets/Animals/5.jpg new file mode 100644 index 0000000..36bd2bf Binary files /dev/null and b/app/src/main/assets/Animals/5.jpg differ diff --git a/app/src/main/assets/Animals/6.jpg b/app/src/main/assets/Animals/6.jpg new file mode 100644 index 0000000..dceb49b Binary files /dev/null and b/app/src/main/assets/Animals/6.jpg differ diff --git a/app/src/main/assets/Animals/7.jpg b/app/src/main/assets/Animals/7.jpg new file mode 100644 index 0000000..ebd4694 Binary files /dev/null and b/app/src/main/assets/Animals/7.jpg differ diff --git a/app/src/main/assets/Animals/8.jpg b/app/src/main/assets/Animals/8.jpg new file mode 100644 index 0000000..e5e3c63 Binary files /dev/null and b/app/src/main/assets/Animals/8.jpg differ diff --git a/app/src/main/assets/Animals/9.jpg b/app/src/main/assets/Animals/9.jpg new file mode 100644 index 0000000..e7a1862 Binary files /dev/null and b/app/src/main/assets/Animals/9.jpg differ diff --git a/app/src/main/assets/Birds/1.jpg b/app/src/main/assets/Birds/1.jpg new file mode 100644 index 0000000..d235225 Binary files /dev/null and b/app/src/main/assets/Birds/1.jpg differ diff --git a/app/src/main/assets/Birds/10.jpg b/app/src/main/assets/Birds/10.jpg new file mode 100644 index 0000000..e348ffe Binary files /dev/null and b/app/src/main/assets/Birds/10.jpg differ diff --git a/app/src/main/assets/Birds/11.jpg b/app/src/main/assets/Birds/11.jpg new file mode 100644 index 0000000..921b5b9 Binary files /dev/null and b/app/src/main/assets/Birds/11.jpg differ diff --git a/app/src/main/assets/Birds/12.jpg b/app/src/main/assets/Birds/12.jpg new file mode 100644 index 0000000..7b4055b Binary files /dev/null and b/app/src/main/assets/Birds/12.jpg differ diff --git a/app/src/main/assets/Birds/13.jpg b/app/src/main/assets/Birds/13.jpg new file mode 100644 index 0000000..021b7a4 Binary files /dev/null and b/app/src/main/assets/Birds/13.jpg differ diff --git a/app/src/main/assets/Birds/14.jpg b/app/src/main/assets/Birds/14.jpg new file mode 100644 index 0000000..2074c6f Binary files /dev/null and b/app/src/main/assets/Birds/14.jpg differ diff --git a/app/src/main/assets/Birds/15.jpg b/app/src/main/assets/Birds/15.jpg new file mode 100644 index 0000000..59b0e47 Binary files /dev/null and b/app/src/main/assets/Birds/15.jpg differ diff --git a/app/src/main/assets/Birds/16.jpg b/app/src/main/assets/Birds/16.jpg new file mode 100644 index 0000000..fe950d1 Binary files /dev/null and b/app/src/main/assets/Birds/16.jpg differ diff --git a/app/src/main/assets/Birds/17.jpg b/app/src/main/assets/Birds/17.jpg new file mode 100644 index 0000000..484f39a Binary files /dev/null and b/app/src/main/assets/Birds/17.jpg differ diff --git a/app/src/main/assets/Birds/18.jpg b/app/src/main/assets/Birds/18.jpg new file mode 100644 index 0000000..2792ed1 Binary files /dev/null and b/app/src/main/assets/Birds/18.jpg differ diff --git a/app/src/main/assets/Birds/19.jpg b/app/src/main/assets/Birds/19.jpg new file mode 100644 index 0000000..9e9bb27 Binary files /dev/null and b/app/src/main/assets/Birds/19.jpg differ diff --git a/app/src/main/assets/Birds/2.jpg b/app/src/main/assets/Birds/2.jpg new file mode 100644 index 0000000..0929272 Binary files /dev/null and b/app/src/main/assets/Birds/2.jpg differ diff --git a/app/src/main/assets/Birds/3.jpg b/app/src/main/assets/Birds/3.jpg new file mode 100644 index 0000000..1376a50 Binary files /dev/null and b/app/src/main/assets/Birds/3.jpg differ diff --git a/app/src/main/assets/Birds/4.jpg b/app/src/main/assets/Birds/4.jpg new file mode 100644 index 0000000..1cd8f9c Binary files /dev/null and b/app/src/main/assets/Birds/4.jpg differ diff --git a/app/src/main/assets/Birds/5.jpg b/app/src/main/assets/Birds/5.jpg new file mode 100644 index 0000000..7637589 Binary files /dev/null and b/app/src/main/assets/Birds/5.jpg differ diff --git a/app/src/main/assets/Birds/6.jpg b/app/src/main/assets/Birds/6.jpg new file mode 100644 index 0000000..3bf16b6 Binary files /dev/null and b/app/src/main/assets/Birds/6.jpg differ diff --git a/app/src/main/assets/Birds/7.jpg b/app/src/main/assets/Birds/7.jpg new file mode 100644 index 0000000..076e51d Binary files /dev/null and b/app/src/main/assets/Birds/7.jpg differ diff --git a/app/src/main/assets/Birds/8.jpg b/app/src/main/assets/Birds/8.jpg new file mode 100644 index 0000000..71f5cf7 Binary files /dev/null and b/app/src/main/assets/Birds/8.jpg differ diff --git a/app/src/main/assets/Birds/9.jpg b/app/src/main/assets/Birds/9.jpg new file mode 100644 index 0000000..8767032 Binary files /dev/null and b/app/src/main/assets/Birds/9.jpg differ diff --git a/app/src/main/assets/Butterfly/1.jpg b/app/src/main/assets/Butterfly/1.jpg new file mode 100644 index 0000000..0d713b7 Binary files /dev/null and b/app/src/main/assets/Butterfly/1.jpg differ diff --git a/app/src/main/assets/Butterfly/10.jpg b/app/src/main/assets/Butterfly/10.jpg new file mode 100644 index 0000000..ae497c8 Binary files /dev/null and b/app/src/main/assets/Butterfly/10.jpg differ diff --git a/app/src/main/assets/Butterfly/11.jpg b/app/src/main/assets/Butterfly/11.jpg new file mode 100644 index 0000000..d2e39ef Binary files /dev/null and b/app/src/main/assets/Butterfly/11.jpg differ diff --git a/app/src/main/assets/Butterfly/12.jpg b/app/src/main/assets/Butterfly/12.jpg new file mode 100644 index 0000000..410af7c Binary files /dev/null and b/app/src/main/assets/Butterfly/12.jpg differ diff --git a/app/src/main/assets/Butterfly/13.jpg b/app/src/main/assets/Butterfly/13.jpg new file mode 100644 index 0000000..233a998 Binary files /dev/null and b/app/src/main/assets/Butterfly/13.jpg differ diff --git a/app/src/main/assets/Butterfly/14.jpg b/app/src/main/assets/Butterfly/14.jpg new file mode 100644 index 0000000..9545c0f Binary files /dev/null and b/app/src/main/assets/Butterfly/14.jpg differ diff --git a/app/src/main/assets/Butterfly/15.jpg b/app/src/main/assets/Butterfly/15.jpg new file mode 100644 index 0000000..aa0da5b Binary files /dev/null and b/app/src/main/assets/Butterfly/15.jpg differ diff --git a/app/src/main/assets/Butterfly/16.jpg b/app/src/main/assets/Butterfly/16.jpg new file mode 100644 index 0000000..4b118cf Binary files /dev/null and b/app/src/main/assets/Butterfly/16.jpg differ diff --git a/app/src/main/assets/Butterfly/17.jpg b/app/src/main/assets/Butterfly/17.jpg new file mode 100644 index 0000000..ebfdc2e Binary files /dev/null and b/app/src/main/assets/Butterfly/17.jpg differ diff --git a/app/src/main/assets/Butterfly/18.jpg b/app/src/main/assets/Butterfly/18.jpg new file mode 100644 index 0000000..7b81ca1 Binary files /dev/null and b/app/src/main/assets/Butterfly/18.jpg differ diff --git a/app/src/main/assets/Butterfly/19.jpg b/app/src/main/assets/Butterfly/19.jpg new file mode 100644 index 0000000..903fd82 Binary files /dev/null and b/app/src/main/assets/Butterfly/19.jpg differ diff --git a/app/src/main/assets/Butterfly/2.jpg b/app/src/main/assets/Butterfly/2.jpg new file mode 100644 index 0000000..f92c438 Binary files /dev/null and b/app/src/main/assets/Butterfly/2.jpg differ diff --git a/app/src/main/assets/Butterfly/20.jpg b/app/src/main/assets/Butterfly/20.jpg new file mode 100644 index 0000000..7d0dc2e Binary files /dev/null and b/app/src/main/assets/Butterfly/20.jpg differ diff --git a/app/src/main/assets/Butterfly/21.jpg b/app/src/main/assets/Butterfly/21.jpg new file mode 100644 index 0000000..ff82d93 Binary files /dev/null and b/app/src/main/assets/Butterfly/21.jpg differ diff --git a/app/src/main/assets/Butterfly/3.jpg b/app/src/main/assets/Butterfly/3.jpg new file mode 100644 index 0000000..5251134 Binary files /dev/null and b/app/src/main/assets/Butterfly/3.jpg differ diff --git a/app/src/main/assets/Butterfly/4.jpg b/app/src/main/assets/Butterfly/4.jpg new file mode 100644 index 0000000..01d5932 Binary files /dev/null and b/app/src/main/assets/Butterfly/4.jpg differ diff --git a/app/src/main/assets/Butterfly/5.jpg b/app/src/main/assets/Butterfly/5.jpg new file mode 100644 index 0000000..cc99ed5 Binary files /dev/null and b/app/src/main/assets/Butterfly/5.jpg differ diff --git a/app/src/main/assets/Butterfly/6.jpg b/app/src/main/assets/Butterfly/6.jpg new file mode 100644 index 0000000..6d02805 Binary files /dev/null and b/app/src/main/assets/Butterfly/6.jpg differ diff --git a/app/src/main/assets/Butterfly/7.jpg b/app/src/main/assets/Butterfly/7.jpg new file mode 100644 index 0000000..dd52dbd Binary files /dev/null and b/app/src/main/assets/Butterfly/7.jpg differ diff --git a/app/src/main/assets/Butterfly/8.jpg b/app/src/main/assets/Butterfly/8.jpg new file mode 100644 index 0000000..d519ca7 Binary files /dev/null and b/app/src/main/assets/Butterfly/8.jpg differ diff --git a/app/src/main/assets/Butterfly/9.jpg b/app/src/main/assets/Butterfly/9.jpg new file mode 100644 index 0000000..0cedb47 Binary files /dev/null and b/app/src/main/assets/Butterfly/9.jpg differ diff --git a/app/src/main/assets/Cafe/1.jpg b/app/src/main/assets/Cafe/1.jpg new file mode 100644 index 0000000..b347b44 Binary files /dev/null and b/app/src/main/assets/Cafe/1.jpg differ diff --git a/app/src/main/assets/Cafe/10.jpg b/app/src/main/assets/Cafe/10.jpg new file mode 100644 index 0000000..3728490 Binary files /dev/null and b/app/src/main/assets/Cafe/10.jpg differ diff --git a/app/src/main/assets/Cafe/11.jpg b/app/src/main/assets/Cafe/11.jpg new file mode 100644 index 0000000..bff21e1 Binary files /dev/null and b/app/src/main/assets/Cafe/11.jpg differ diff --git a/app/src/main/assets/Cafe/12.jpg b/app/src/main/assets/Cafe/12.jpg new file mode 100644 index 0000000..3966d4a Binary files /dev/null and b/app/src/main/assets/Cafe/12.jpg differ diff --git a/app/src/main/assets/Cafe/13.jpg b/app/src/main/assets/Cafe/13.jpg new file mode 100644 index 0000000..8200e12 Binary files /dev/null and b/app/src/main/assets/Cafe/13.jpg differ diff --git a/app/src/main/assets/Cafe/14.jpg b/app/src/main/assets/Cafe/14.jpg new file mode 100644 index 0000000..65ee383 Binary files /dev/null and b/app/src/main/assets/Cafe/14.jpg differ diff --git a/app/src/main/assets/Cafe/15.jpg b/app/src/main/assets/Cafe/15.jpg new file mode 100644 index 0000000..01df5e5 Binary files /dev/null and b/app/src/main/assets/Cafe/15.jpg differ diff --git a/app/src/main/assets/Cafe/16.jpg b/app/src/main/assets/Cafe/16.jpg new file mode 100644 index 0000000..ff679c1 Binary files /dev/null and b/app/src/main/assets/Cafe/16.jpg differ diff --git a/app/src/main/assets/Cafe/17.jpg b/app/src/main/assets/Cafe/17.jpg new file mode 100644 index 0000000..42fdf87 Binary files /dev/null and b/app/src/main/assets/Cafe/17.jpg differ diff --git a/app/src/main/assets/Cafe/18.jpg b/app/src/main/assets/Cafe/18.jpg new file mode 100644 index 0000000..06d300e Binary files /dev/null and b/app/src/main/assets/Cafe/18.jpg differ diff --git a/app/src/main/assets/Cafe/19.jpg b/app/src/main/assets/Cafe/19.jpg new file mode 100644 index 0000000..42aaa2c Binary files /dev/null and b/app/src/main/assets/Cafe/19.jpg differ diff --git a/app/src/main/assets/Cafe/2.jpg b/app/src/main/assets/Cafe/2.jpg new file mode 100644 index 0000000..14d9b25 Binary files /dev/null and b/app/src/main/assets/Cafe/2.jpg differ diff --git a/app/src/main/assets/Cafe/20.jpg b/app/src/main/assets/Cafe/20.jpg new file mode 100644 index 0000000..5dad84c Binary files /dev/null and b/app/src/main/assets/Cafe/20.jpg differ diff --git a/app/src/main/assets/Cafe/21.jpg b/app/src/main/assets/Cafe/21.jpg new file mode 100644 index 0000000..c019faa Binary files /dev/null and b/app/src/main/assets/Cafe/21.jpg differ diff --git a/app/src/main/assets/Cafe/22.jpg b/app/src/main/assets/Cafe/22.jpg new file mode 100644 index 0000000..28cdc4e Binary files /dev/null and b/app/src/main/assets/Cafe/22.jpg differ diff --git a/app/src/main/assets/Cafe/23.jpg b/app/src/main/assets/Cafe/23.jpg new file mode 100644 index 0000000..973a5c2 Binary files /dev/null and b/app/src/main/assets/Cafe/23.jpg differ diff --git a/app/src/main/assets/Cafe/24.jpg b/app/src/main/assets/Cafe/24.jpg new file mode 100644 index 0000000..3c36d8a Binary files /dev/null and b/app/src/main/assets/Cafe/24.jpg differ diff --git a/app/src/main/assets/Cafe/25.jpg b/app/src/main/assets/Cafe/25.jpg new file mode 100644 index 0000000..c7be496 Binary files /dev/null and b/app/src/main/assets/Cafe/25.jpg differ diff --git a/app/src/main/assets/Cafe/26.jpg b/app/src/main/assets/Cafe/26.jpg new file mode 100644 index 0000000..7229696 Binary files /dev/null and b/app/src/main/assets/Cafe/26.jpg differ diff --git a/app/src/main/assets/Cafe/27.jpg b/app/src/main/assets/Cafe/27.jpg new file mode 100644 index 0000000..f857542 Binary files /dev/null and b/app/src/main/assets/Cafe/27.jpg differ diff --git a/app/src/main/assets/Cafe/28.jpg b/app/src/main/assets/Cafe/28.jpg new file mode 100644 index 0000000..8cde6de Binary files /dev/null and b/app/src/main/assets/Cafe/28.jpg differ diff --git a/app/src/main/assets/Cafe/29.jpg b/app/src/main/assets/Cafe/29.jpg new file mode 100644 index 0000000..8affd30 Binary files /dev/null and b/app/src/main/assets/Cafe/29.jpg differ diff --git a/app/src/main/assets/Cafe/3.jpg b/app/src/main/assets/Cafe/3.jpg new file mode 100644 index 0000000..b1c3cfa Binary files /dev/null and b/app/src/main/assets/Cafe/3.jpg differ diff --git a/app/src/main/assets/Cafe/30.jpg b/app/src/main/assets/Cafe/30.jpg new file mode 100644 index 0000000..f71ce84 Binary files /dev/null and b/app/src/main/assets/Cafe/30.jpg differ diff --git a/app/src/main/assets/Cafe/31.jpg b/app/src/main/assets/Cafe/31.jpg new file mode 100644 index 0000000..a5d22ca Binary files /dev/null and b/app/src/main/assets/Cafe/31.jpg differ diff --git a/app/src/main/assets/Cafe/32.jpg b/app/src/main/assets/Cafe/32.jpg new file mode 100644 index 0000000..8513a5e Binary files /dev/null and b/app/src/main/assets/Cafe/32.jpg differ diff --git a/app/src/main/assets/Cafe/33.jpg b/app/src/main/assets/Cafe/33.jpg new file mode 100644 index 0000000..fcdcbcc Binary files /dev/null and b/app/src/main/assets/Cafe/33.jpg differ diff --git a/app/src/main/assets/Cafe/34.jpg b/app/src/main/assets/Cafe/34.jpg new file mode 100644 index 0000000..51bbf4b Binary files /dev/null and b/app/src/main/assets/Cafe/34.jpg differ diff --git a/app/src/main/assets/Cafe/35.jpg b/app/src/main/assets/Cafe/35.jpg new file mode 100644 index 0000000..e1067da Binary files /dev/null and b/app/src/main/assets/Cafe/35.jpg differ diff --git a/app/src/main/assets/Cafe/36.jpg b/app/src/main/assets/Cafe/36.jpg new file mode 100644 index 0000000..181a84a Binary files /dev/null and b/app/src/main/assets/Cafe/36.jpg differ diff --git a/app/src/main/assets/Cafe/37.jpg b/app/src/main/assets/Cafe/37.jpg new file mode 100644 index 0000000..d8ffb00 Binary files /dev/null and b/app/src/main/assets/Cafe/37.jpg differ diff --git a/app/src/main/assets/Cafe/38.jpg b/app/src/main/assets/Cafe/38.jpg new file mode 100644 index 0000000..abdba50 Binary files /dev/null and b/app/src/main/assets/Cafe/38.jpg differ diff --git a/app/src/main/assets/Cafe/4.jpg b/app/src/main/assets/Cafe/4.jpg new file mode 100644 index 0000000..8792f16 Binary files /dev/null and b/app/src/main/assets/Cafe/4.jpg differ diff --git a/app/src/main/assets/Cafe/5.jpg b/app/src/main/assets/Cafe/5.jpg new file mode 100644 index 0000000..89630aa Binary files /dev/null and b/app/src/main/assets/Cafe/5.jpg differ diff --git a/app/src/main/assets/Cafe/6.jpg b/app/src/main/assets/Cafe/6.jpg new file mode 100644 index 0000000..7e6832e Binary files /dev/null and b/app/src/main/assets/Cafe/6.jpg differ diff --git a/app/src/main/assets/Cafe/7.jpg b/app/src/main/assets/Cafe/7.jpg new file mode 100644 index 0000000..f4d2afb Binary files /dev/null and b/app/src/main/assets/Cafe/7.jpg differ diff --git a/app/src/main/assets/Cafe/8.jpg b/app/src/main/assets/Cafe/8.jpg new file mode 100644 index 0000000..78f5ccf Binary files /dev/null and b/app/src/main/assets/Cafe/8.jpg differ diff --git a/app/src/main/assets/Cafe/9.jpg b/app/src/main/assets/Cafe/9.jpg new file mode 100644 index 0000000..4038bb5 Binary files /dev/null and b/app/src/main/assets/Cafe/9.jpg differ diff --git a/app/src/main/assets/Cartoons/1.jpg b/app/src/main/assets/Cartoons/1.jpg new file mode 100644 index 0000000..74bf123 Binary files /dev/null and b/app/src/main/assets/Cartoons/1.jpg differ diff --git a/app/src/main/assets/Cartoons/10.jpg b/app/src/main/assets/Cartoons/10.jpg new file mode 100644 index 0000000..450fa6e Binary files /dev/null and b/app/src/main/assets/Cartoons/10.jpg differ diff --git a/app/src/main/assets/Cartoons/11.jpg b/app/src/main/assets/Cartoons/11.jpg new file mode 100644 index 0000000..1f2a904 Binary files /dev/null and b/app/src/main/assets/Cartoons/11.jpg differ diff --git a/app/src/main/assets/Cartoons/12.jpg b/app/src/main/assets/Cartoons/12.jpg new file mode 100644 index 0000000..86ef206 Binary files /dev/null and b/app/src/main/assets/Cartoons/12.jpg differ diff --git a/app/src/main/assets/Cartoons/13.jpg b/app/src/main/assets/Cartoons/13.jpg new file mode 100644 index 0000000..92e1d75 Binary files /dev/null and b/app/src/main/assets/Cartoons/13.jpg differ diff --git a/app/src/main/assets/Cartoons/14.jpg b/app/src/main/assets/Cartoons/14.jpg new file mode 100644 index 0000000..c82e897 Binary files /dev/null and b/app/src/main/assets/Cartoons/14.jpg differ diff --git a/app/src/main/assets/Cartoons/15.jpg b/app/src/main/assets/Cartoons/15.jpg new file mode 100644 index 0000000..bcd8678 Binary files /dev/null and b/app/src/main/assets/Cartoons/15.jpg differ diff --git a/app/src/main/assets/Cartoons/16.jpg b/app/src/main/assets/Cartoons/16.jpg new file mode 100644 index 0000000..18377bd Binary files /dev/null and b/app/src/main/assets/Cartoons/16.jpg differ diff --git a/app/src/main/assets/Cartoons/17.jpg b/app/src/main/assets/Cartoons/17.jpg new file mode 100644 index 0000000..45aafbb Binary files /dev/null and b/app/src/main/assets/Cartoons/17.jpg differ diff --git a/app/src/main/assets/Cartoons/18.jpg b/app/src/main/assets/Cartoons/18.jpg new file mode 100644 index 0000000..048d253 Binary files /dev/null and b/app/src/main/assets/Cartoons/18.jpg differ diff --git a/app/src/main/assets/Cartoons/19.jpg b/app/src/main/assets/Cartoons/19.jpg new file mode 100644 index 0000000..c2501b2 Binary files /dev/null and b/app/src/main/assets/Cartoons/19.jpg differ diff --git a/app/src/main/assets/Cartoons/2.jpg b/app/src/main/assets/Cartoons/2.jpg new file mode 100644 index 0000000..8baf95b Binary files /dev/null and b/app/src/main/assets/Cartoons/2.jpg differ diff --git a/app/src/main/assets/Cartoons/20.jpg b/app/src/main/assets/Cartoons/20.jpg new file mode 100644 index 0000000..fb7901c Binary files /dev/null and b/app/src/main/assets/Cartoons/20.jpg differ diff --git a/app/src/main/assets/Cartoons/21.jpg b/app/src/main/assets/Cartoons/21.jpg new file mode 100644 index 0000000..ed7104e Binary files /dev/null and b/app/src/main/assets/Cartoons/21.jpg differ diff --git a/app/src/main/assets/Cartoons/22.jpg b/app/src/main/assets/Cartoons/22.jpg new file mode 100644 index 0000000..cd003eb Binary files /dev/null and b/app/src/main/assets/Cartoons/22.jpg differ diff --git a/app/src/main/assets/Cartoons/23.jpg b/app/src/main/assets/Cartoons/23.jpg new file mode 100644 index 0000000..77b49a4 Binary files /dev/null and b/app/src/main/assets/Cartoons/23.jpg differ diff --git a/app/src/main/assets/Cartoons/24.jpg b/app/src/main/assets/Cartoons/24.jpg new file mode 100644 index 0000000..1c7dc65 Binary files /dev/null and b/app/src/main/assets/Cartoons/24.jpg differ diff --git a/app/src/main/assets/Cartoons/25.jpg b/app/src/main/assets/Cartoons/25.jpg new file mode 100644 index 0000000..442aec2 Binary files /dev/null and b/app/src/main/assets/Cartoons/25.jpg differ diff --git a/app/src/main/assets/Cartoons/26.jpg b/app/src/main/assets/Cartoons/26.jpg new file mode 100644 index 0000000..ec4a2ff Binary files /dev/null and b/app/src/main/assets/Cartoons/26.jpg differ diff --git a/app/src/main/assets/Cartoons/3.jpg b/app/src/main/assets/Cartoons/3.jpg new file mode 100644 index 0000000..e099902 Binary files /dev/null and b/app/src/main/assets/Cartoons/3.jpg differ diff --git a/app/src/main/assets/Cartoons/4.jpg b/app/src/main/assets/Cartoons/4.jpg new file mode 100644 index 0000000..a4c69ba Binary files /dev/null and b/app/src/main/assets/Cartoons/4.jpg differ diff --git a/app/src/main/assets/Cartoons/5.jpg b/app/src/main/assets/Cartoons/5.jpg new file mode 100644 index 0000000..b32485d Binary files /dev/null and b/app/src/main/assets/Cartoons/5.jpg differ diff --git a/app/src/main/assets/Cartoons/6.jpg b/app/src/main/assets/Cartoons/6.jpg new file mode 100644 index 0000000..0e0a7ef Binary files /dev/null and b/app/src/main/assets/Cartoons/6.jpg differ diff --git a/app/src/main/assets/Cartoons/7.jpg b/app/src/main/assets/Cartoons/7.jpg new file mode 100644 index 0000000..ecd8dc0 Binary files /dev/null and b/app/src/main/assets/Cartoons/7.jpg differ diff --git a/app/src/main/assets/Cartoons/8.jpg b/app/src/main/assets/Cartoons/8.jpg new file mode 100644 index 0000000..f6ea587 Binary files /dev/null and b/app/src/main/assets/Cartoons/8.jpg differ diff --git a/app/src/main/assets/Cartoons/9.jpg b/app/src/main/assets/Cartoons/9.jpg new file mode 100644 index 0000000..da4c151 Binary files /dev/null and b/app/src/main/assets/Cartoons/9.jpg differ diff --git a/app/src/main/assets/Christmas/1.jpg b/app/src/main/assets/Christmas/1.jpg new file mode 100644 index 0000000..cc1fafb Binary files /dev/null and b/app/src/main/assets/Christmas/1.jpg differ diff --git a/app/src/main/assets/Christmas/10.jpg b/app/src/main/assets/Christmas/10.jpg new file mode 100644 index 0000000..e5e63d6 Binary files /dev/null and b/app/src/main/assets/Christmas/10.jpg differ diff --git a/app/src/main/assets/Christmas/11.jpg b/app/src/main/assets/Christmas/11.jpg new file mode 100644 index 0000000..cae5d66 Binary files /dev/null and b/app/src/main/assets/Christmas/11.jpg differ diff --git a/app/src/main/assets/Christmas/12.jpg b/app/src/main/assets/Christmas/12.jpg new file mode 100644 index 0000000..13fd21f Binary files /dev/null and b/app/src/main/assets/Christmas/12.jpg differ diff --git a/app/src/main/assets/Christmas/13.jpg b/app/src/main/assets/Christmas/13.jpg new file mode 100644 index 0000000..1fa30fe Binary files /dev/null and b/app/src/main/assets/Christmas/13.jpg differ diff --git a/app/src/main/assets/Christmas/14.jpg b/app/src/main/assets/Christmas/14.jpg new file mode 100644 index 0000000..aec6dcf Binary files /dev/null and b/app/src/main/assets/Christmas/14.jpg differ diff --git a/app/src/main/assets/Christmas/15.jpg b/app/src/main/assets/Christmas/15.jpg new file mode 100644 index 0000000..647c8b6 Binary files /dev/null and b/app/src/main/assets/Christmas/15.jpg differ diff --git a/app/src/main/assets/Christmas/16.jpg b/app/src/main/assets/Christmas/16.jpg new file mode 100644 index 0000000..b36a79c Binary files /dev/null and b/app/src/main/assets/Christmas/16.jpg differ diff --git a/app/src/main/assets/Christmas/17.jpg b/app/src/main/assets/Christmas/17.jpg new file mode 100644 index 0000000..2655af2 Binary files /dev/null and b/app/src/main/assets/Christmas/17.jpg differ diff --git a/app/src/main/assets/Christmas/18.jpg b/app/src/main/assets/Christmas/18.jpg new file mode 100644 index 0000000..e784d64 Binary files /dev/null and b/app/src/main/assets/Christmas/18.jpg differ diff --git a/app/src/main/assets/Christmas/19.jpg b/app/src/main/assets/Christmas/19.jpg new file mode 100644 index 0000000..fcf2085 Binary files /dev/null and b/app/src/main/assets/Christmas/19.jpg differ diff --git a/app/src/main/assets/Christmas/2.jpg b/app/src/main/assets/Christmas/2.jpg new file mode 100644 index 0000000..326e86b Binary files /dev/null and b/app/src/main/assets/Christmas/2.jpg differ diff --git a/app/src/main/assets/Christmas/20.jpg b/app/src/main/assets/Christmas/20.jpg new file mode 100644 index 0000000..a9e3c89 Binary files /dev/null and b/app/src/main/assets/Christmas/20.jpg differ diff --git a/app/src/main/assets/Christmas/21.jpg b/app/src/main/assets/Christmas/21.jpg new file mode 100644 index 0000000..71b4150 Binary files /dev/null and b/app/src/main/assets/Christmas/21.jpg differ diff --git a/app/src/main/assets/Christmas/22.jpg b/app/src/main/assets/Christmas/22.jpg new file mode 100644 index 0000000..3c99d0d Binary files /dev/null and b/app/src/main/assets/Christmas/22.jpg differ diff --git a/app/src/main/assets/Christmas/23.jpg b/app/src/main/assets/Christmas/23.jpg new file mode 100644 index 0000000..32c3b03 Binary files /dev/null and b/app/src/main/assets/Christmas/23.jpg differ diff --git a/app/src/main/assets/Christmas/24.jpg b/app/src/main/assets/Christmas/24.jpg new file mode 100644 index 0000000..80fd836 Binary files /dev/null and b/app/src/main/assets/Christmas/24.jpg differ diff --git a/app/src/main/assets/Christmas/25.jpg b/app/src/main/assets/Christmas/25.jpg new file mode 100644 index 0000000..8e2bef6 Binary files /dev/null and b/app/src/main/assets/Christmas/25.jpg differ diff --git a/app/src/main/assets/Christmas/3.jpg b/app/src/main/assets/Christmas/3.jpg new file mode 100644 index 0000000..4c24cd2 Binary files /dev/null and b/app/src/main/assets/Christmas/3.jpg differ diff --git a/app/src/main/assets/Christmas/4.jpg b/app/src/main/assets/Christmas/4.jpg new file mode 100644 index 0000000..28fb1b0 Binary files /dev/null and b/app/src/main/assets/Christmas/4.jpg differ diff --git a/app/src/main/assets/Christmas/5.jpg b/app/src/main/assets/Christmas/5.jpg new file mode 100644 index 0000000..93ad555 Binary files /dev/null and b/app/src/main/assets/Christmas/5.jpg differ diff --git a/app/src/main/assets/Christmas/6.jpg b/app/src/main/assets/Christmas/6.jpg new file mode 100644 index 0000000..02fe302 Binary files /dev/null and b/app/src/main/assets/Christmas/6.jpg differ diff --git a/app/src/main/assets/Christmas/7.jpg b/app/src/main/assets/Christmas/7.jpg new file mode 100644 index 0000000..dc41982 Binary files /dev/null and b/app/src/main/assets/Christmas/7.jpg differ diff --git a/app/src/main/assets/Christmas/8.jpg b/app/src/main/assets/Christmas/8.jpg new file mode 100644 index 0000000..5f13019 Binary files /dev/null and b/app/src/main/assets/Christmas/8.jpg differ diff --git a/app/src/main/assets/Christmas/9.jpg b/app/src/main/assets/Christmas/9.jpg new file mode 100644 index 0000000..e556980 Binary files /dev/null and b/app/src/main/assets/Christmas/9.jpg differ diff --git a/app/src/main/assets/Festivals/1.jpg b/app/src/main/assets/Festivals/1.jpg new file mode 100644 index 0000000..125d632 Binary files /dev/null and b/app/src/main/assets/Festivals/1.jpg differ diff --git a/app/src/main/assets/Festivals/10.jpg b/app/src/main/assets/Festivals/10.jpg new file mode 100644 index 0000000..d17b9f1 Binary files /dev/null and b/app/src/main/assets/Festivals/10.jpg differ diff --git a/app/src/main/assets/Festivals/11.jpg b/app/src/main/assets/Festivals/11.jpg new file mode 100644 index 0000000..702f052 Binary files /dev/null and b/app/src/main/assets/Festivals/11.jpg differ diff --git a/app/src/main/assets/Festivals/12.jpg b/app/src/main/assets/Festivals/12.jpg new file mode 100644 index 0000000..6f231e1 Binary files /dev/null and b/app/src/main/assets/Festivals/12.jpg differ diff --git a/app/src/main/assets/Festivals/13.jpg b/app/src/main/assets/Festivals/13.jpg new file mode 100644 index 0000000..20556a1 Binary files /dev/null and b/app/src/main/assets/Festivals/13.jpg differ diff --git a/app/src/main/assets/Festivals/14.jpg b/app/src/main/assets/Festivals/14.jpg new file mode 100644 index 0000000..fb78127 Binary files /dev/null and b/app/src/main/assets/Festivals/14.jpg differ diff --git a/app/src/main/assets/Festivals/15.jpg b/app/src/main/assets/Festivals/15.jpg new file mode 100644 index 0000000..e74f47e Binary files /dev/null and b/app/src/main/assets/Festivals/15.jpg differ diff --git a/app/src/main/assets/Festivals/16.jpg b/app/src/main/assets/Festivals/16.jpg new file mode 100644 index 0000000..136f6e8 Binary files /dev/null and b/app/src/main/assets/Festivals/16.jpg differ diff --git a/app/src/main/assets/Festivals/17.jpg b/app/src/main/assets/Festivals/17.jpg new file mode 100644 index 0000000..fd50e67 Binary files /dev/null and b/app/src/main/assets/Festivals/17.jpg differ diff --git a/app/src/main/assets/Festivals/18.jpg b/app/src/main/assets/Festivals/18.jpg new file mode 100644 index 0000000..d3f7936 Binary files /dev/null and b/app/src/main/assets/Festivals/18.jpg differ diff --git a/app/src/main/assets/Festivals/19.jpg b/app/src/main/assets/Festivals/19.jpg new file mode 100644 index 0000000..9a4f1b8 Binary files /dev/null and b/app/src/main/assets/Festivals/19.jpg differ diff --git a/app/src/main/assets/Festivals/2.jpg b/app/src/main/assets/Festivals/2.jpg new file mode 100644 index 0000000..84aa31a Binary files /dev/null and b/app/src/main/assets/Festivals/2.jpg differ diff --git a/app/src/main/assets/Festivals/20.jpg b/app/src/main/assets/Festivals/20.jpg new file mode 100644 index 0000000..268c943 Binary files /dev/null and b/app/src/main/assets/Festivals/20.jpg differ diff --git a/app/src/main/assets/Festivals/21.jpg b/app/src/main/assets/Festivals/21.jpg new file mode 100644 index 0000000..614bffd Binary files /dev/null and b/app/src/main/assets/Festivals/21.jpg differ diff --git a/app/src/main/assets/Festivals/22.jpg b/app/src/main/assets/Festivals/22.jpg new file mode 100644 index 0000000..f81eb8d Binary files /dev/null and b/app/src/main/assets/Festivals/22.jpg differ diff --git a/app/src/main/assets/Festivals/3.jpg b/app/src/main/assets/Festivals/3.jpg new file mode 100644 index 0000000..5ca2b11 Binary files /dev/null and b/app/src/main/assets/Festivals/3.jpg differ diff --git a/app/src/main/assets/Festivals/4.jpg b/app/src/main/assets/Festivals/4.jpg new file mode 100644 index 0000000..1f8cc81 Binary files /dev/null and b/app/src/main/assets/Festivals/4.jpg differ diff --git a/app/src/main/assets/Festivals/5.jpg b/app/src/main/assets/Festivals/5.jpg new file mode 100644 index 0000000..7f1bd1a Binary files /dev/null and b/app/src/main/assets/Festivals/5.jpg differ diff --git a/app/src/main/assets/Festivals/6.jpg b/app/src/main/assets/Festivals/6.jpg new file mode 100644 index 0000000..9cf832a Binary files /dev/null and b/app/src/main/assets/Festivals/6.jpg differ diff --git a/app/src/main/assets/Festivals/7.jpg b/app/src/main/assets/Festivals/7.jpg new file mode 100644 index 0000000..dcd83f3 Binary files /dev/null and b/app/src/main/assets/Festivals/7.jpg differ diff --git a/app/src/main/assets/Festivals/8.jpg b/app/src/main/assets/Festivals/8.jpg new file mode 100644 index 0000000..1117f09 Binary files /dev/null and b/app/src/main/assets/Festivals/8.jpg differ diff --git a/app/src/main/assets/Festivals/9.jpg b/app/src/main/assets/Festivals/9.jpg new file mode 100644 index 0000000..39d8467 Binary files /dev/null and b/app/src/main/assets/Festivals/9.jpg differ diff --git a/app/src/main/assets/Flowers/1.jpg b/app/src/main/assets/Flowers/1.jpg new file mode 100644 index 0000000..217d9c8 Binary files /dev/null and b/app/src/main/assets/Flowers/1.jpg differ diff --git a/app/src/main/assets/Flowers/10.jpg b/app/src/main/assets/Flowers/10.jpg new file mode 100644 index 0000000..ba84e61 Binary files /dev/null and b/app/src/main/assets/Flowers/10.jpg differ diff --git a/app/src/main/assets/Flowers/11.jpg b/app/src/main/assets/Flowers/11.jpg new file mode 100644 index 0000000..e579753 Binary files /dev/null and b/app/src/main/assets/Flowers/11.jpg differ diff --git a/app/src/main/assets/Flowers/12.jpg b/app/src/main/assets/Flowers/12.jpg new file mode 100644 index 0000000..26092f9 Binary files /dev/null and b/app/src/main/assets/Flowers/12.jpg differ diff --git a/app/src/main/assets/Flowers/13.jpg b/app/src/main/assets/Flowers/13.jpg new file mode 100644 index 0000000..41d2df3 Binary files /dev/null and b/app/src/main/assets/Flowers/13.jpg differ diff --git a/app/src/main/assets/Flowers/14.jpg b/app/src/main/assets/Flowers/14.jpg new file mode 100644 index 0000000..c44df66 Binary files /dev/null and b/app/src/main/assets/Flowers/14.jpg differ diff --git a/app/src/main/assets/Flowers/15.jpg b/app/src/main/assets/Flowers/15.jpg new file mode 100644 index 0000000..ea34d36 Binary files /dev/null and b/app/src/main/assets/Flowers/15.jpg differ diff --git a/app/src/main/assets/Flowers/16.jpg b/app/src/main/assets/Flowers/16.jpg new file mode 100644 index 0000000..506beb1 Binary files /dev/null and b/app/src/main/assets/Flowers/16.jpg differ diff --git a/app/src/main/assets/Flowers/17.jpg b/app/src/main/assets/Flowers/17.jpg new file mode 100644 index 0000000..3764b21 Binary files /dev/null and b/app/src/main/assets/Flowers/17.jpg differ diff --git a/app/src/main/assets/Flowers/18.jpg b/app/src/main/assets/Flowers/18.jpg new file mode 100644 index 0000000..a759ab6 Binary files /dev/null and b/app/src/main/assets/Flowers/18.jpg differ diff --git a/app/src/main/assets/Flowers/19.jpg b/app/src/main/assets/Flowers/19.jpg new file mode 100644 index 0000000..e8c2a84 Binary files /dev/null and b/app/src/main/assets/Flowers/19.jpg differ diff --git a/app/src/main/assets/Flowers/2.jpg b/app/src/main/assets/Flowers/2.jpg new file mode 100644 index 0000000..fb7e56f Binary files /dev/null and b/app/src/main/assets/Flowers/2.jpg differ diff --git a/app/src/main/assets/Flowers/20.jpg b/app/src/main/assets/Flowers/20.jpg new file mode 100644 index 0000000..93e5408 Binary files /dev/null and b/app/src/main/assets/Flowers/20.jpg differ diff --git a/app/src/main/assets/Flowers/21.jpg b/app/src/main/assets/Flowers/21.jpg new file mode 100644 index 0000000..4fa3a77 Binary files /dev/null and b/app/src/main/assets/Flowers/21.jpg differ diff --git a/app/src/main/assets/Flowers/22.jpg b/app/src/main/assets/Flowers/22.jpg new file mode 100644 index 0000000..6f45df7 Binary files /dev/null and b/app/src/main/assets/Flowers/22.jpg differ diff --git a/app/src/main/assets/Flowers/23.jpg b/app/src/main/assets/Flowers/23.jpg new file mode 100644 index 0000000..46e806d Binary files /dev/null and b/app/src/main/assets/Flowers/23.jpg differ diff --git a/app/src/main/assets/Flowers/3.jpg b/app/src/main/assets/Flowers/3.jpg new file mode 100644 index 0000000..22a741c Binary files /dev/null and b/app/src/main/assets/Flowers/3.jpg differ diff --git a/app/src/main/assets/Flowers/4.jpg b/app/src/main/assets/Flowers/4.jpg new file mode 100644 index 0000000..dd0a30f Binary files /dev/null and b/app/src/main/assets/Flowers/4.jpg differ diff --git a/app/src/main/assets/Flowers/5.jpg b/app/src/main/assets/Flowers/5.jpg new file mode 100644 index 0000000..9dcb4f5 Binary files /dev/null and b/app/src/main/assets/Flowers/5.jpg differ diff --git a/app/src/main/assets/Flowers/6.jpg b/app/src/main/assets/Flowers/6.jpg new file mode 100644 index 0000000..cdf1f65 Binary files /dev/null and b/app/src/main/assets/Flowers/6.jpg differ diff --git a/app/src/main/assets/Flowers/7.jpg b/app/src/main/assets/Flowers/7.jpg new file mode 100644 index 0000000..caab990 Binary files /dev/null and b/app/src/main/assets/Flowers/7.jpg differ diff --git a/app/src/main/assets/Flowers/8.jpg b/app/src/main/assets/Flowers/8.jpg new file mode 100644 index 0000000..c43832b Binary files /dev/null and b/app/src/main/assets/Flowers/8.jpg differ diff --git a/app/src/main/assets/Flowers/9.jpg b/app/src/main/assets/Flowers/9.jpg new file mode 100644 index 0000000..5b78ee1 Binary files /dev/null and b/app/src/main/assets/Flowers/9.jpg differ diff --git a/app/src/main/assets/Fruits/1.jpg b/app/src/main/assets/Fruits/1.jpg new file mode 100644 index 0000000..767c0b4 Binary files /dev/null and b/app/src/main/assets/Fruits/1.jpg differ diff --git a/app/src/main/assets/Fruits/10.jpg b/app/src/main/assets/Fruits/10.jpg new file mode 100644 index 0000000..95bdbca Binary files /dev/null and b/app/src/main/assets/Fruits/10.jpg differ diff --git a/app/src/main/assets/Fruits/11.jpg b/app/src/main/assets/Fruits/11.jpg new file mode 100644 index 0000000..b0bb89a Binary files /dev/null and b/app/src/main/assets/Fruits/11.jpg differ diff --git a/app/src/main/assets/Fruits/12.jpg b/app/src/main/assets/Fruits/12.jpg new file mode 100644 index 0000000..c1d9bad Binary files /dev/null and b/app/src/main/assets/Fruits/12.jpg differ diff --git a/app/src/main/assets/Fruits/13.jpg b/app/src/main/assets/Fruits/13.jpg new file mode 100644 index 0000000..f44fb86 Binary files /dev/null and b/app/src/main/assets/Fruits/13.jpg differ diff --git a/app/src/main/assets/Fruits/14.jpg b/app/src/main/assets/Fruits/14.jpg new file mode 100644 index 0000000..459a60c Binary files /dev/null and b/app/src/main/assets/Fruits/14.jpg differ diff --git a/app/src/main/assets/Fruits/15.jpg b/app/src/main/assets/Fruits/15.jpg new file mode 100644 index 0000000..a4e4abe Binary files /dev/null and b/app/src/main/assets/Fruits/15.jpg differ diff --git a/app/src/main/assets/Fruits/16.jpg b/app/src/main/assets/Fruits/16.jpg new file mode 100644 index 0000000..33a7a9a Binary files /dev/null and b/app/src/main/assets/Fruits/16.jpg differ diff --git a/app/src/main/assets/Fruits/17.jpg b/app/src/main/assets/Fruits/17.jpg new file mode 100644 index 0000000..c193b1e Binary files /dev/null and b/app/src/main/assets/Fruits/17.jpg differ diff --git a/app/src/main/assets/Fruits/18.jpg b/app/src/main/assets/Fruits/18.jpg new file mode 100644 index 0000000..f0ca248 Binary files /dev/null and b/app/src/main/assets/Fruits/18.jpg differ diff --git a/app/src/main/assets/Fruits/19.jpg b/app/src/main/assets/Fruits/19.jpg new file mode 100644 index 0000000..d93dfde Binary files /dev/null and b/app/src/main/assets/Fruits/19.jpg differ diff --git a/app/src/main/assets/Fruits/2.jpg b/app/src/main/assets/Fruits/2.jpg new file mode 100644 index 0000000..b32f9f5 Binary files /dev/null and b/app/src/main/assets/Fruits/2.jpg differ diff --git a/app/src/main/assets/Fruits/20.jpg b/app/src/main/assets/Fruits/20.jpg new file mode 100644 index 0000000..cc3fe93 Binary files /dev/null and b/app/src/main/assets/Fruits/20.jpg differ diff --git a/app/src/main/assets/Fruits/21.jpg b/app/src/main/assets/Fruits/21.jpg new file mode 100644 index 0000000..c1813eb Binary files /dev/null and b/app/src/main/assets/Fruits/21.jpg differ diff --git a/app/src/main/assets/Fruits/22.jpg b/app/src/main/assets/Fruits/22.jpg new file mode 100644 index 0000000..47387e1 Binary files /dev/null and b/app/src/main/assets/Fruits/22.jpg differ diff --git a/app/src/main/assets/Fruits/23.jpg b/app/src/main/assets/Fruits/23.jpg new file mode 100644 index 0000000..7f173ec Binary files /dev/null and b/app/src/main/assets/Fruits/23.jpg differ diff --git a/app/src/main/assets/Fruits/24.jpg b/app/src/main/assets/Fruits/24.jpg new file mode 100644 index 0000000..a7ae235 Binary files /dev/null and b/app/src/main/assets/Fruits/24.jpg differ diff --git a/app/src/main/assets/Fruits/25.jpg b/app/src/main/assets/Fruits/25.jpg new file mode 100644 index 0000000..dd664bb Binary files /dev/null and b/app/src/main/assets/Fruits/25.jpg differ diff --git a/app/src/main/assets/Fruits/26.jpg b/app/src/main/assets/Fruits/26.jpg new file mode 100644 index 0000000..c8e4723 Binary files /dev/null and b/app/src/main/assets/Fruits/26.jpg differ diff --git a/app/src/main/assets/Fruits/27.jpg b/app/src/main/assets/Fruits/27.jpg new file mode 100644 index 0000000..816337d Binary files /dev/null and b/app/src/main/assets/Fruits/27.jpg differ diff --git a/app/src/main/assets/Fruits/28.jpg b/app/src/main/assets/Fruits/28.jpg new file mode 100644 index 0000000..29973d5 Binary files /dev/null and b/app/src/main/assets/Fruits/28.jpg differ diff --git a/app/src/main/assets/Fruits/29.jpg b/app/src/main/assets/Fruits/29.jpg new file mode 100644 index 0000000..4f0750f Binary files /dev/null and b/app/src/main/assets/Fruits/29.jpg differ diff --git a/app/src/main/assets/Fruits/3.jpg b/app/src/main/assets/Fruits/3.jpg new file mode 100644 index 0000000..f57893b Binary files /dev/null and b/app/src/main/assets/Fruits/3.jpg differ diff --git a/app/src/main/assets/Fruits/30.jpg b/app/src/main/assets/Fruits/30.jpg new file mode 100644 index 0000000..cfd117a Binary files /dev/null and b/app/src/main/assets/Fruits/30.jpg differ diff --git a/app/src/main/assets/Fruits/31.jpg b/app/src/main/assets/Fruits/31.jpg new file mode 100644 index 0000000..b59a7c5 Binary files /dev/null and b/app/src/main/assets/Fruits/31.jpg differ diff --git a/app/src/main/assets/Fruits/32.jpg b/app/src/main/assets/Fruits/32.jpg new file mode 100644 index 0000000..8f70790 Binary files /dev/null and b/app/src/main/assets/Fruits/32.jpg differ diff --git a/app/src/main/assets/Fruits/33.jpg b/app/src/main/assets/Fruits/33.jpg new file mode 100644 index 0000000..373b142 Binary files /dev/null and b/app/src/main/assets/Fruits/33.jpg differ diff --git a/app/src/main/assets/Fruits/34.jpg b/app/src/main/assets/Fruits/34.jpg new file mode 100644 index 0000000..c5beb91 Binary files /dev/null and b/app/src/main/assets/Fruits/34.jpg differ diff --git a/app/src/main/assets/Fruits/35.jpg b/app/src/main/assets/Fruits/35.jpg new file mode 100644 index 0000000..79cd667 Binary files /dev/null and b/app/src/main/assets/Fruits/35.jpg differ diff --git a/app/src/main/assets/Fruits/36.jpg b/app/src/main/assets/Fruits/36.jpg new file mode 100644 index 0000000..c0cb185 Binary files /dev/null and b/app/src/main/assets/Fruits/36.jpg differ diff --git a/app/src/main/assets/Fruits/37.jpg b/app/src/main/assets/Fruits/37.jpg new file mode 100644 index 0000000..ba1b245 Binary files /dev/null and b/app/src/main/assets/Fruits/37.jpg differ diff --git a/app/src/main/assets/Fruits/38.jpg b/app/src/main/assets/Fruits/38.jpg new file mode 100644 index 0000000..c7eccb8 Binary files /dev/null and b/app/src/main/assets/Fruits/38.jpg differ diff --git a/app/src/main/assets/Fruits/39.jpg b/app/src/main/assets/Fruits/39.jpg new file mode 100644 index 0000000..bc95aaa Binary files /dev/null and b/app/src/main/assets/Fruits/39.jpg differ diff --git a/app/src/main/assets/Fruits/4.jpg b/app/src/main/assets/Fruits/4.jpg new file mode 100644 index 0000000..2d7465d Binary files /dev/null and b/app/src/main/assets/Fruits/4.jpg differ diff --git a/app/src/main/assets/Fruits/5.jpg b/app/src/main/assets/Fruits/5.jpg new file mode 100644 index 0000000..8ed633f Binary files /dev/null and b/app/src/main/assets/Fruits/5.jpg differ diff --git a/app/src/main/assets/Fruits/6.jpg b/app/src/main/assets/Fruits/6.jpg new file mode 100644 index 0000000..06ce330 Binary files /dev/null and b/app/src/main/assets/Fruits/6.jpg differ diff --git a/app/src/main/assets/Fruits/7.jpg b/app/src/main/assets/Fruits/7.jpg new file mode 100644 index 0000000..6153618 Binary files /dev/null and b/app/src/main/assets/Fruits/7.jpg differ diff --git a/app/src/main/assets/Fruits/8.jpg b/app/src/main/assets/Fruits/8.jpg new file mode 100644 index 0000000..e333f0f Binary files /dev/null and b/app/src/main/assets/Fruits/8.jpg differ diff --git a/app/src/main/assets/Fruits/9.jpg b/app/src/main/assets/Fruits/9.jpg new file mode 100644 index 0000000..d549d15 Binary files /dev/null and b/app/src/main/assets/Fruits/9.jpg differ diff --git a/app/src/main/assets/General/1.jpg b/app/src/main/assets/General/1.jpg new file mode 100644 index 0000000..eb7c14b Binary files /dev/null and b/app/src/main/assets/General/1.jpg differ diff --git a/app/src/main/assets/General/10.jpg b/app/src/main/assets/General/10.jpg new file mode 100644 index 0000000..eacd298 Binary files /dev/null and b/app/src/main/assets/General/10.jpg differ diff --git a/app/src/main/assets/General/11.jpg b/app/src/main/assets/General/11.jpg new file mode 100644 index 0000000..273a876 Binary files /dev/null and b/app/src/main/assets/General/11.jpg differ diff --git a/app/src/main/assets/General/12.jpg b/app/src/main/assets/General/12.jpg new file mode 100644 index 0000000..5d786c5 Binary files /dev/null and b/app/src/main/assets/General/12.jpg differ diff --git a/app/src/main/assets/General/13.jpg b/app/src/main/assets/General/13.jpg new file mode 100644 index 0000000..486441a Binary files /dev/null and b/app/src/main/assets/General/13.jpg differ diff --git a/app/src/main/assets/General/14.jpg b/app/src/main/assets/General/14.jpg new file mode 100644 index 0000000..c36516b Binary files /dev/null and b/app/src/main/assets/General/14.jpg differ diff --git a/app/src/main/assets/General/15.jpg b/app/src/main/assets/General/15.jpg new file mode 100644 index 0000000..9d19fdf Binary files /dev/null and b/app/src/main/assets/General/15.jpg differ diff --git a/app/src/main/assets/General/2.jpg b/app/src/main/assets/General/2.jpg new file mode 100644 index 0000000..090d5d5 Binary files /dev/null and b/app/src/main/assets/General/2.jpg differ diff --git a/app/src/main/assets/General/3.jpg b/app/src/main/assets/General/3.jpg new file mode 100644 index 0000000..a17f1b2 Binary files /dev/null and b/app/src/main/assets/General/3.jpg differ diff --git a/app/src/main/assets/General/4.jpg b/app/src/main/assets/General/4.jpg new file mode 100644 index 0000000..2f4d8a2 Binary files /dev/null and b/app/src/main/assets/General/4.jpg differ diff --git a/app/src/main/assets/General/5.jpg b/app/src/main/assets/General/5.jpg new file mode 100644 index 0000000..8ac1cdb Binary files /dev/null and b/app/src/main/assets/General/5.jpg differ diff --git a/app/src/main/assets/General/6.jpg b/app/src/main/assets/General/6.jpg new file mode 100644 index 0000000..95cc582 Binary files /dev/null and b/app/src/main/assets/General/6.jpg differ diff --git a/app/src/main/assets/General/7.jpg b/app/src/main/assets/General/7.jpg new file mode 100644 index 0000000..91cbcfd Binary files /dev/null and b/app/src/main/assets/General/7.jpg differ diff --git a/app/src/main/assets/General/8.jpg b/app/src/main/assets/General/8.jpg new file mode 100644 index 0000000..af8da73 Binary files /dev/null and b/app/src/main/assets/General/8.jpg differ diff --git a/app/src/main/assets/General/9.jpg b/app/src/main/assets/General/9.jpg new file mode 100644 index 0000000..d5cfb72 Binary files /dev/null and b/app/src/main/assets/General/9.jpg differ diff --git a/app/src/main/assets/Mehndi/1.jpg b/app/src/main/assets/Mehndi/1.jpg new file mode 100644 index 0000000..8dd8843 Binary files /dev/null and b/app/src/main/assets/Mehndi/1.jpg differ diff --git a/app/src/main/assets/Mehndi/10.jpg b/app/src/main/assets/Mehndi/10.jpg new file mode 100644 index 0000000..2432a79 Binary files /dev/null and b/app/src/main/assets/Mehndi/10.jpg differ diff --git a/app/src/main/assets/Mehndi/11.jpg b/app/src/main/assets/Mehndi/11.jpg new file mode 100644 index 0000000..aba85bf Binary files /dev/null and b/app/src/main/assets/Mehndi/11.jpg differ diff --git a/app/src/main/assets/Mehndi/12.jpg b/app/src/main/assets/Mehndi/12.jpg new file mode 100644 index 0000000..f71ae22 Binary files /dev/null and b/app/src/main/assets/Mehndi/12.jpg differ diff --git a/app/src/main/assets/Mehndi/2.jpg b/app/src/main/assets/Mehndi/2.jpg new file mode 100644 index 0000000..0f56bf7 Binary files /dev/null and b/app/src/main/assets/Mehndi/2.jpg differ diff --git a/app/src/main/assets/Mehndi/3.jpg b/app/src/main/assets/Mehndi/3.jpg new file mode 100644 index 0000000..2bc7b69 Binary files /dev/null and b/app/src/main/assets/Mehndi/3.jpg differ diff --git a/app/src/main/assets/Mehndi/4.jpg b/app/src/main/assets/Mehndi/4.jpg new file mode 100644 index 0000000..6fc3f70 Binary files /dev/null and b/app/src/main/assets/Mehndi/4.jpg differ diff --git a/app/src/main/assets/Mehndi/5.jpg b/app/src/main/assets/Mehndi/5.jpg new file mode 100644 index 0000000..dccb5cf Binary files /dev/null and b/app/src/main/assets/Mehndi/5.jpg differ diff --git a/app/src/main/assets/Mehndi/6.jpg b/app/src/main/assets/Mehndi/6.jpg new file mode 100644 index 0000000..4e052dd Binary files /dev/null and b/app/src/main/assets/Mehndi/6.jpg differ diff --git a/app/src/main/assets/Mehndi/7.jpg b/app/src/main/assets/Mehndi/7.jpg new file mode 100644 index 0000000..021e789 Binary files /dev/null and b/app/src/main/assets/Mehndi/7.jpg differ diff --git a/app/src/main/assets/Mehndi/8.jpg b/app/src/main/assets/Mehndi/8.jpg new file mode 100644 index 0000000..dd45b50 Binary files /dev/null and b/app/src/main/assets/Mehndi/8.jpg differ diff --git a/app/src/main/assets/Mehndi/9.jpg b/app/src/main/assets/Mehndi/9.jpg new file mode 100644 index 0000000..6ff2300 Binary files /dev/null and b/app/src/main/assets/Mehndi/9.jpg differ diff --git a/app/src/main/assets/Nature/1.jpg b/app/src/main/assets/Nature/1.jpg new file mode 100644 index 0000000..22c00e3 Binary files /dev/null and b/app/src/main/assets/Nature/1.jpg differ diff --git a/app/src/main/assets/Nature/10.jpg b/app/src/main/assets/Nature/10.jpg new file mode 100644 index 0000000..65aab09 Binary files /dev/null and b/app/src/main/assets/Nature/10.jpg differ diff --git a/app/src/main/assets/Nature/11.jpg b/app/src/main/assets/Nature/11.jpg new file mode 100644 index 0000000..23c6653 Binary files /dev/null and b/app/src/main/assets/Nature/11.jpg differ diff --git a/app/src/main/assets/Nature/12.jpg b/app/src/main/assets/Nature/12.jpg new file mode 100644 index 0000000..36e1835 Binary files /dev/null and b/app/src/main/assets/Nature/12.jpg differ diff --git a/app/src/main/assets/Nature/13.jpg b/app/src/main/assets/Nature/13.jpg new file mode 100644 index 0000000..5816b61 Binary files /dev/null and b/app/src/main/assets/Nature/13.jpg differ diff --git a/app/src/main/assets/Nature/14.jpg b/app/src/main/assets/Nature/14.jpg new file mode 100644 index 0000000..b4e5dc6 Binary files /dev/null and b/app/src/main/assets/Nature/14.jpg differ diff --git a/app/src/main/assets/Nature/15.jpg b/app/src/main/assets/Nature/15.jpg new file mode 100644 index 0000000..5424ac4 Binary files /dev/null and b/app/src/main/assets/Nature/15.jpg differ diff --git a/app/src/main/assets/Nature/16.jpg b/app/src/main/assets/Nature/16.jpg new file mode 100644 index 0000000..fd00791 Binary files /dev/null and b/app/src/main/assets/Nature/16.jpg differ diff --git a/app/src/main/assets/Nature/17.jpg b/app/src/main/assets/Nature/17.jpg new file mode 100644 index 0000000..38410e8 Binary files /dev/null and b/app/src/main/assets/Nature/17.jpg differ diff --git a/app/src/main/assets/Nature/18.jpg b/app/src/main/assets/Nature/18.jpg new file mode 100644 index 0000000..5ae5028 Binary files /dev/null and b/app/src/main/assets/Nature/18.jpg differ diff --git a/app/src/main/assets/Nature/19.jpg b/app/src/main/assets/Nature/19.jpg new file mode 100644 index 0000000..e49b4f1 Binary files /dev/null and b/app/src/main/assets/Nature/19.jpg differ diff --git a/app/src/main/assets/Nature/2.jpg b/app/src/main/assets/Nature/2.jpg new file mode 100644 index 0000000..3b5ec4c Binary files /dev/null and b/app/src/main/assets/Nature/2.jpg differ diff --git a/app/src/main/assets/Nature/20.jpg b/app/src/main/assets/Nature/20.jpg new file mode 100644 index 0000000..cc94724 Binary files /dev/null and b/app/src/main/assets/Nature/20.jpg differ diff --git a/app/src/main/assets/Nature/21.jpg b/app/src/main/assets/Nature/21.jpg new file mode 100644 index 0000000..dfa6c09 Binary files /dev/null and b/app/src/main/assets/Nature/21.jpg differ diff --git a/app/src/main/assets/Nature/22.jpg b/app/src/main/assets/Nature/22.jpg new file mode 100644 index 0000000..c05e638 Binary files /dev/null and b/app/src/main/assets/Nature/22.jpg differ diff --git a/app/src/main/assets/Nature/23.jpg b/app/src/main/assets/Nature/23.jpg new file mode 100644 index 0000000..6f932ec Binary files /dev/null and b/app/src/main/assets/Nature/23.jpg differ diff --git a/app/src/main/assets/Nature/3.jpg b/app/src/main/assets/Nature/3.jpg new file mode 100644 index 0000000..1423546 Binary files /dev/null and b/app/src/main/assets/Nature/3.jpg differ diff --git a/app/src/main/assets/Nature/4.jpg b/app/src/main/assets/Nature/4.jpg new file mode 100644 index 0000000..5499510 Binary files /dev/null and b/app/src/main/assets/Nature/4.jpg differ diff --git a/app/src/main/assets/Nature/5.jpg b/app/src/main/assets/Nature/5.jpg new file mode 100644 index 0000000..434261a Binary files /dev/null and b/app/src/main/assets/Nature/5.jpg differ diff --git a/app/src/main/assets/Nature/6.jpg b/app/src/main/assets/Nature/6.jpg new file mode 100644 index 0000000..f50166b Binary files /dev/null and b/app/src/main/assets/Nature/6.jpg differ diff --git a/app/src/main/assets/Nature/7.jpg b/app/src/main/assets/Nature/7.jpg new file mode 100644 index 0000000..96e178c Binary files /dev/null and b/app/src/main/assets/Nature/7.jpg differ diff --git a/app/src/main/assets/Nature/8.jpg b/app/src/main/assets/Nature/8.jpg new file mode 100644 index 0000000..c68f4f1 Binary files /dev/null and b/app/src/main/assets/Nature/8.jpg differ diff --git a/app/src/main/assets/Nature/9.jpg b/app/src/main/assets/Nature/9.jpg new file mode 100644 index 0000000..6b8ccb4 Binary files /dev/null and b/app/src/main/assets/Nature/9.jpg differ diff --git a/app/src/main/assets/Properties/1.jpg b/app/src/main/assets/Properties/1.jpg new file mode 100644 index 0000000..3289a38 Binary files /dev/null and b/app/src/main/assets/Properties/1.jpg differ diff --git a/app/src/main/assets/Properties/10.jpg b/app/src/main/assets/Properties/10.jpg new file mode 100644 index 0000000..b065539 Binary files /dev/null and b/app/src/main/assets/Properties/10.jpg differ diff --git a/app/src/main/assets/Properties/11.jpg b/app/src/main/assets/Properties/11.jpg new file mode 100644 index 0000000..12d28b1 Binary files /dev/null and b/app/src/main/assets/Properties/11.jpg differ diff --git a/app/src/main/assets/Properties/12.jpg b/app/src/main/assets/Properties/12.jpg new file mode 100644 index 0000000..182879f Binary files /dev/null and b/app/src/main/assets/Properties/12.jpg differ diff --git a/app/src/main/assets/Properties/13.jpg b/app/src/main/assets/Properties/13.jpg new file mode 100644 index 0000000..4263530 Binary files /dev/null and b/app/src/main/assets/Properties/13.jpg differ diff --git a/app/src/main/assets/Properties/14.jpg b/app/src/main/assets/Properties/14.jpg new file mode 100644 index 0000000..42e4ab3 Binary files /dev/null and b/app/src/main/assets/Properties/14.jpg differ diff --git a/app/src/main/assets/Properties/15.jpg b/app/src/main/assets/Properties/15.jpg new file mode 100644 index 0000000..b529436 Binary files /dev/null and b/app/src/main/assets/Properties/15.jpg differ diff --git a/app/src/main/assets/Properties/16.jpg b/app/src/main/assets/Properties/16.jpg new file mode 100644 index 0000000..85caef0 Binary files /dev/null and b/app/src/main/assets/Properties/16.jpg differ diff --git a/app/src/main/assets/Properties/17.jpg b/app/src/main/assets/Properties/17.jpg new file mode 100644 index 0000000..6295f58 Binary files /dev/null and b/app/src/main/assets/Properties/17.jpg differ diff --git a/app/src/main/assets/Properties/18.jpg b/app/src/main/assets/Properties/18.jpg new file mode 100644 index 0000000..f8e4e87 Binary files /dev/null and b/app/src/main/assets/Properties/18.jpg differ diff --git a/app/src/main/assets/Properties/19.jpg b/app/src/main/assets/Properties/19.jpg new file mode 100644 index 0000000..c476493 Binary files /dev/null and b/app/src/main/assets/Properties/19.jpg differ diff --git a/app/src/main/assets/Properties/2.jpg b/app/src/main/assets/Properties/2.jpg new file mode 100644 index 0000000..084fa51 Binary files /dev/null and b/app/src/main/assets/Properties/2.jpg differ diff --git a/app/src/main/assets/Properties/3.jpg b/app/src/main/assets/Properties/3.jpg new file mode 100644 index 0000000..4ee71c4 Binary files /dev/null and b/app/src/main/assets/Properties/3.jpg differ diff --git a/app/src/main/assets/Properties/4.jpg b/app/src/main/assets/Properties/4.jpg new file mode 100644 index 0000000..25912f1 Binary files /dev/null and b/app/src/main/assets/Properties/4.jpg differ diff --git a/app/src/main/assets/Properties/5.jpg b/app/src/main/assets/Properties/5.jpg new file mode 100644 index 0000000..77c2aa8 Binary files /dev/null and b/app/src/main/assets/Properties/5.jpg differ diff --git a/app/src/main/assets/Properties/6.jpg b/app/src/main/assets/Properties/6.jpg new file mode 100644 index 0000000..75b1e32 Binary files /dev/null and b/app/src/main/assets/Properties/6.jpg differ diff --git a/app/src/main/assets/Properties/7.jpg b/app/src/main/assets/Properties/7.jpg new file mode 100644 index 0000000..f059989 Binary files /dev/null and b/app/src/main/assets/Properties/7.jpg differ diff --git a/app/src/main/assets/Properties/8.jpg b/app/src/main/assets/Properties/8.jpg new file mode 100644 index 0000000..6be97eb Binary files /dev/null and b/app/src/main/assets/Properties/8.jpg differ diff --git a/app/src/main/assets/Properties/9.jpg b/app/src/main/assets/Properties/9.jpg new file mode 100644 index 0000000..626cab9 Binary files /dev/null and b/app/src/main/assets/Properties/9.jpg differ diff --git a/app/src/main/assets/Rangoli/1.jpg b/app/src/main/assets/Rangoli/1.jpg new file mode 100644 index 0000000..e628714 Binary files /dev/null and b/app/src/main/assets/Rangoli/1.jpg differ diff --git a/app/src/main/assets/Rangoli/10.jpg b/app/src/main/assets/Rangoli/10.jpg new file mode 100644 index 0000000..f6e9d09 Binary files /dev/null and b/app/src/main/assets/Rangoli/10.jpg differ diff --git a/app/src/main/assets/Rangoli/13.jpg b/app/src/main/assets/Rangoli/13.jpg new file mode 100644 index 0000000..9741d57 Binary files /dev/null and b/app/src/main/assets/Rangoli/13.jpg differ diff --git a/app/src/main/assets/Rangoli/14.jpg b/app/src/main/assets/Rangoli/14.jpg new file mode 100644 index 0000000..3ca4970 Binary files /dev/null and b/app/src/main/assets/Rangoli/14.jpg differ diff --git a/app/src/main/assets/Rangoli/15.jpg b/app/src/main/assets/Rangoli/15.jpg new file mode 100644 index 0000000..98abac3 Binary files /dev/null and b/app/src/main/assets/Rangoli/15.jpg differ diff --git a/app/src/main/assets/Rangoli/16.jpg b/app/src/main/assets/Rangoli/16.jpg new file mode 100644 index 0000000..150dfdc Binary files /dev/null and b/app/src/main/assets/Rangoli/16.jpg differ diff --git a/app/src/main/assets/Rangoli/17.jpg b/app/src/main/assets/Rangoli/17.jpg new file mode 100644 index 0000000..4127115 Binary files /dev/null and b/app/src/main/assets/Rangoli/17.jpg differ diff --git a/app/src/main/assets/Rangoli/18.jpg b/app/src/main/assets/Rangoli/18.jpg new file mode 100644 index 0000000..6ae96e9 Binary files /dev/null and b/app/src/main/assets/Rangoli/18.jpg differ diff --git a/app/src/main/assets/Rangoli/19.jpg b/app/src/main/assets/Rangoli/19.jpg new file mode 100644 index 0000000..ffcbd6a Binary files /dev/null and b/app/src/main/assets/Rangoli/19.jpg differ diff --git a/app/src/main/assets/Rangoli/2.jpg b/app/src/main/assets/Rangoli/2.jpg new file mode 100644 index 0000000..7329109 Binary files /dev/null and b/app/src/main/assets/Rangoli/2.jpg differ diff --git a/app/src/main/assets/Rangoli/20.jpg b/app/src/main/assets/Rangoli/20.jpg new file mode 100644 index 0000000..b7be138 Binary files /dev/null and b/app/src/main/assets/Rangoli/20.jpg differ diff --git a/app/src/main/assets/Rangoli/21.jpg b/app/src/main/assets/Rangoli/21.jpg new file mode 100644 index 0000000..eaa5fdf Binary files /dev/null and b/app/src/main/assets/Rangoli/21.jpg differ diff --git a/app/src/main/assets/Rangoli/22.jpg b/app/src/main/assets/Rangoli/22.jpg new file mode 100644 index 0000000..28aca48 Binary files /dev/null and b/app/src/main/assets/Rangoli/22.jpg differ diff --git a/app/src/main/assets/Rangoli/23.jpg b/app/src/main/assets/Rangoli/23.jpg new file mode 100644 index 0000000..057d2d4 Binary files /dev/null and b/app/src/main/assets/Rangoli/23.jpg differ diff --git a/app/src/main/assets/Rangoli/24.jpg b/app/src/main/assets/Rangoli/24.jpg new file mode 100644 index 0000000..e933061 Binary files /dev/null and b/app/src/main/assets/Rangoli/24.jpg differ diff --git a/app/src/main/assets/Rangoli/25.jpg b/app/src/main/assets/Rangoli/25.jpg new file mode 100644 index 0000000..569a74c Binary files /dev/null and b/app/src/main/assets/Rangoli/25.jpg differ diff --git a/app/src/main/assets/Rangoli/3.jpg b/app/src/main/assets/Rangoli/3.jpg new file mode 100644 index 0000000..569342c Binary files /dev/null and b/app/src/main/assets/Rangoli/3.jpg differ diff --git a/app/src/main/assets/Rangoli/4.jpg b/app/src/main/assets/Rangoli/4.jpg new file mode 100644 index 0000000..7c5d0de Binary files /dev/null and b/app/src/main/assets/Rangoli/4.jpg differ diff --git a/app/src/main/assets/Rangoli/5.jpg b/app/src/main/assets/Rangoli/5.jpg new file mode 100644 index 0000000..5a3228f Binary files /dev/null and b/app/src/main/assets/Rangoli/5.jpg differ diff --git a/app/src/main/assets/Rangoli/6.jpg b/app/src/main/assets/Rangoli/6.jpg new file mode 100644 index 0000000..270f078 Binary files /dev/null and b/app/src/main/assets/Rangoli/6.jpg differ diff --git a/app/src/main/assets/Rangoli/7.jpg b/app/src/main/assets/Rangoli/7.jpg new file mode 100644 index 0000000..241beac Binary files /dev/null and b/app/src/main/assets/Rangoli/7.jpg differ diff --git a/app/src/main/assets/Rangoli/8.jpg b/app/src/main/assets/Rangoli/8.jpg new file mode 100644 index 0000000..c62e0d7 Binary files /dev/null and b/app/src/main/assets/Rangoli/8.jpg differ diff --git a/app/src/main/assets/Rangoli/9.jpg b/app/src/main/assets/Rangoli/9.jpg new file mode 100644 index 0000000..bcd14a7 Binary files /dev/null and b/app/src/main/assets/Rangoli/9.jpg differ diff --git a/app/src/main/assets/Sports/1.jpg b/app/src/main/assets/Sports/1.jpg new file mode 100644 index 0000000..cd1cb09 Binary files /dev/null and b/app/src/main/assets/Sports/1.jpg differ diff --git a/app/src/main/assets/Sports/10.jpg b/app/src/main/assets/Sports/10.jpg new file mode 100644 index 0000000..2ec81a5 Binary files /dev/null and b/app/src/main/assets/Sports/10.jpg differ diff --git a/app/src/main/assets/Sports/11.jpg b/app/src/main/assets/Sports/11.jpg new file mode 100644 index 0000000..f00ecb5 Binary files /dev/null and b/app/src/main/assets/Sports/11.jpg differ diff --git a/app/src/main/assets/Sports/12.jpg b/app/src/main/assets/Sports/12.jpg new file mode 100644 index 0000000..b004929 Binary files /dev/null and b/app/src/main/assets/Sports/12.jpg differ diff --git a/app/src/main/assets/Sports/13.jpg b/app/src/main/assets/Sports/13.jpg new file mode 100644 index 0000000..73fa886 Binary files /dev/null and b/app/src/main/assets/Sports/13.jpg differ diff --git a/app/src/main/assets/Sports/14.jpg b/app/src/main/assets/Sports/14.jpg new file mode 100644 index 0000000..3d9069e Binary files /dev/null and b/app/src/main/assets/Sports/14.jpg differ diff --git a/app/src/main/assets/Sports/15.jpg b/app/src/main/assets/Sports/15.jpg new file mode 100644 index 0000000..a090c83 Binary files /dev/null and b/app/src/main/assets/Sports/15.jpg differ diff --git a/app/src/main/assets/Sports/16.jpg b/app/src/main/assets/Sports/16.jpg new file mode 100644 index 0000000..185d6e3 Binary files /dev/null and b/app/src/main/assets/Sports/16.jpg differ diff --git a/app/src/main/assets/Sports/17.jpg b/app/src/main/assets/Sports/17.jpg new file mode 100644 index 0000000..b8193fa Binary files /dev/null and b/app/src/main/assets/Sports/17.jpg differ diff --git a/app/src/main/assets/Sports/18.jpg b/app/src/main/assets/Sports/18.jpg new file mode 100644 index 0000000..ba4fcea Binary files /dev/null and b/app/src/main/assets/Sports/18.jpg differ diff --git a/app/src/main/assets/Sports/19.jpg b/app/src/main/assets/Sports/19.jpg new file mode 100644 index 0000000..617c2af Binary files /dev/null and b/app/src/main/assets/Sports/19.jpg differ diff --git a/app/src/main/assets/Sports/2.jpg b/app/src/main/assets/Sports/2.jpg new file mode 100644 index 0000000..59890e5 Binary files /dev/null and b/app/src/main/assets/Sports/2.jpg differ diff --git a/app/src/main/assets/Sports/20.jpg b/app/src/main/assets/Sports/20.jpg new file mode 100644 index 0000000..4032ff4 Binary files /dev/null and b/app/src/main/assets/Sports/20.jpg differ diff --git a/app/src/main/assets/Sports/21.jpg b/app/src/main/assets/Sports/21.jpg new file mode 100644 index 0000000..23979ba Binary files /dev/null and b/app/src/main/assets/Sports/21.jpg differ diff --git a/app/src/main/assets/Sports/22.jpg b/app/src/main/assets/Sports/22.jpg new file mode 100644 index 0000000..c61e91e Binary files /dev/null and b/app/src/main/assets/Sports/22.jpg differ diff --git a/app/src/main/assets/Sports/23.jpg b/app/src/main/assets/Sports/23.jpg new file mode 100644 index 0000000..7bf0806 Binary files /dev/null and b/app/src/main/assets/Sports/23.jpg differ diff --git a/app/src/main/assets/Sports/24.jpg b/app/src/main/assets/Sports/24.jpg new file mode 100644 index 0000000..23cbc17 Binary files /dev/null and b/app/src/main/assets/Sports/24.jpg differ diff --git a/app/src/main/assets/Sports/25.jpg b/app/src/main/assets/Sports/25.jpg new file mode 100644 index 0000000..06d992e Binary files /dev/null and b/app/src/main/assets/Sports/25.jpg differ diff --git a/app/src/main/assets/Sports/26.jpg b/app/src/main/assets/Sports/26.jpg new file mode 100644 index 0000000..26af61e Binary files /dev/null and b/app/src/main/assets/Sports/26.jpg differ diff --git a/app/src/main/assets/Sports/27.jpg b/app/src/main/assets/Sports/27.jpg new file mode 100644 index 0000000..91bf104 Binary files /dev/null and b/app/src/main/assets/Sports/27.jpg differ diff --git a/app/src/main/assets/Sports/28.jpg b/app/src/main/assets/Sports/28.jpg new file mode 100644 index 0000000..8c790e7 Binary files /dev/null and b/app/src/main/assets/Sports/28.jpg differ diff --git a/app/src/main/assets/Sports/3.jpg b/app/src/main/assets/Sports/3.jpg new file mode 100644 index 0000000..8315af5 Binary files /dev/null and b/app/src/main/assets/Sports/3.jpg differ diff --git a/app/src/main/assets/Sports/4.jpg b/app/src/main/assets/Sports/4.jpg new file mode 100644 index 0000000..8070e68 Binary files /dev/null and b/app/src/main/assets/Sports/4.jpg differ diff --git a/app/src/main/assets/Sports/5.jpg b/app/src/main/assets/Sports/5.jpg new file mode 100644 index 0000000..5bcb837 Binary files /dev/null and b/app/src/main/assets/Sports/5.jpg differ diff --git a/app/src/main/assets/Sports/6.jpg b/app/src/main/assets/Sports/6.jpg new file mode 100644 index 0000000..038521f Binary files /dev/null and b/app/src/main/assets/Sports/6.jpg differ diff --git a/app/src/main/assets/Sports/7.jpg b/app/src/main/assets/Sports/7.jpg new file mode 100644 index 0000000..73bf0de Binary files /dev/null and b/app/src/main/assets/Sports/7.jpg differ diff --git a/app/src/main/assets/Sports/8.jpg b/app/src/main/assets/Sports/8.jpg new file mode 100644 index 0000000..6c565f8 Binary files /dev/null and b/app/src/main/assets/Sports/8.jpg differ diff --git a/app/src/main/assets/Sports/9.jpg b/app/src/main/assets/Sports/9.jpg new file mode 100644 index 0000000..130cd94 Binary files /dev/null and b/app/src/main/assets/Sports/9.jpg differ diff --git a/app/src/main/assets/Vehicles/1.jpg b/app/src/main/assets/Vehicles/1.jpg new file mode 100644 index 0000000..da449f7 Binary files /dev/null and b/app/src/main/assets/Vehicles/1.jpg differ diff --git a/app/src/main/assets/Vehicles/10.jpg b/app/src/main/assets/Vehicles/10.jpg new file mode 100644 index 0000000..0084613 Binary files /dev/null and b/app/src/main/assets/Vehicles/10.jpg differ diff --git a/app/src/main/assets/Vehicles/11.jpg b/app/src/main/assets/Vehicles/11.jpg new file mode 100644 index 0000000..ba5f4d4 Binary files /dev/null and b/app/src/main/assets/Vehicles/11.jpg differ diff --git a/app/src/main/assets/Vehicles/12.jpg b/app/src/main/assets/Vehicles/12.jpg new file mode 100644 index 0000000..32c7908 Binary files /dev/null and b/app/src/main/assets/Vehicles/12.jpg differ diff --git a/app/src/main/assets/Vehicles/13.jpg b/app/src/main/assets/Vehicles/13.jpg new file mode 100644 index 0000000..dd47e76 Binary files /dev/null and b/app/src/main/assets/Vehicles/13.jpg differ diff --git a/app/src/main/assets/Vehicles/14.jpg b/app/src/main/assets/Vehicles/14.jpg new file mode 100644 index 0000000..8b886e6 Binary files /dev/null and b/app/src/main/assets/Vehicles/14.jpg differ diff --git a/app/src/main/assets/Vehicles/15.jpg b/app/src/main/assets/Vehicles/15.jpg new file mode 100644 index 0000000..cf78752 Binary files /dev/null and b/app/src/main/assets/Vehicles/15.jpg differ diff --git a/app/src/main/assets/Vehicles/16.jpg b/app/src/main/assets/Vehicles/16.jpg new file mode 100644 index 0000000..87f8a19 Binary files /dev/null and b/app/src/main/assets/Vehicles/16.jpg differ diff --git a/app/src/main/assets/Vehicles/17.jpg b/app/src/main/assets/Vehicles/17.jpg new file mode 100644 index 0000000..011b53b Binary files /dev/null and b/app/src/main/assets/Vehicles/17.jpg differ diff --git a/app/src/main/assets/Vehicles/18.jpg b/app/src/main/assets/Vehicles/18.jpg new file mode 100644 index 0000000..c4433c8 Binary files /dev/null and b/app/src/main/assets/Vehicles/18.jpg differ diff --git a/app/src/main/assets/Vehicles/19.jpg b/app/src/main/assets/Vehicles/19.jpg new file mode 100644 index 0000000..b9361f1 Binary files /dev/null and b/app/src/main/assets/Vehicles/19.jpg differ diff --git a/app/src/main/assets/Vehicles/2.jpg b/app/src/main/assets/Vehicles/2.jpg new file mode 100644 index 0000000..ff06675 Binary files /dev/null and b/app/src/main/assets/Vehicles/2.jpg differ diff --git a/app/src/main/assets/Vehicles/20.jpg b/app/src/main/assets/Vehicles/20.jpg new file mode 100644 index 0000000..3e22c5c Binary files /dev/null and b/app/src/main/assets/Vehicles/20.jpg differ diff --git a/app/src/main/assets/Vehicles/21.jpg b/app/src/main/assets/Vehicles/21.jpg new file mode 100644 index 0000000..f93b99a Binary files /dev/null and b/app/src/main/assets/Vehicles/21.jpg differ diff --git a/app/src/main/assets/Vehicles/22.jpg b/app/src/main/assets/Vehicles/22.jpg new file mode 100644 index 0000000..952afa9 Binary files /dev/null and b/app/src/main/assets/Vehicles/22.jpg differ diff --git a/app/src/main/assets/Vehicles/23.jpg b/app/src/main/assets/Vehicles/23.jpg new file mode 100644 index 0000000..a6e1c25 Binary files /dev/null and b/app/src/main/assets/Vehicles/23.jpg differ diff --git a/app/src/main/assets/Vehicles/24.jpg b/app/src/main/assets/Vehicles/24.jpg new file mode 100644 index 0000000..83c706a Binary files /dev/null and b/app/src/main/assets/Vehicles/24.jpg differ diff --git a/app/src/main/assets/Vehicles/25.jpg b/app/src/main/assets/Vehicles/25.jpg new file mode 100644 index 0000000..6ebdbf7 Binary files /dev/null and b/app/src/main/assets/Vehicles/25.jpg differ diff --git a/app/src/main/assets/Vehicles/26.jpg b/app/src/main/assets/Vehicles/26.jpg new file mode 100644 index 0000000..3805357 Binary files /dev/null and b/app/src/main/assets/Vehicles/26.jpg differ diff --git a/app/src/main/assets/Vehicles/27.jpg b/app/src/main/assets/Vehicles/27.jpg new file mode 100644 index 0000000..0849027 Binary files /dev/null and b/app/src/main/assets/Vehicles/27.jpg differ diff --git a/app/src/main/assets/Vehicles/28.jpg b/app/src/main/assets/Vehicles/28.jpg new file mode 100644 index 0000000..019baa9 Binary files /dev/null and b/app/src/main/assets/Vehicles/28.jpg differ diff --git a/app/src/main/assets/Vehicles/29.jpg b/app/src/main/assets/Vehicles/29.jpg new file mode 100644 index 0000000..c7e0d3a Binary files /dev/null and b/app/src/main/assets/Vehicles/29.jpg differ diff --git a/app/src/main/assets/Vehicles/3.jpg b/app/src/main/assets/Vehicles/3.jpg new file mode 100644 index 0000000..eb33365 Binary files /dev/null and b/app/src/main/assets/Vehicles/3.jpg differ diff --git a/app/src/main/assets/Vehicles/30.jpg b/app/src/main/assets/Vehicles/30.jpg new file mode 100644 index 0000000..3820102 Binary files /dev/null and b/app/src/main/assets/Vehicles/30.jpg differ diff --git a/app/src/main/assets/Vehicles/31.jpg b/app/src/main/assets/Vehicles/31.jpg new file mode 100644 index 0000000..bba9999 Binary files /dev/null and b/app/src/main/assets/Vehicles/31.jpg differ diff --git a/app/src/main/assets/Vehicles/32.jpg b/app/src/main/assets/Vehicles/32.jpg new file mode 100644 index 0000000..6d64a3f Binary files /dev/null and b/app/src/main/assets/Vehicles/32.jpg differ diff --git a/app/src/main/assets/Vehicles/4.jpg b/app/src/main/assets/Vehicles/4.jpg new file mode 100644 index 0000000..968f0ad Binary files /dev/null and b/app/src/main/assets/Vehicles/4.jpg differ diff --git a/app/src/main/assets/Vehicles/5.jpg b/app/src/main/assets/Vehicles/5.jpg new file mode 100644 index 0000000..abdd96c Binary files /dev/null and b/app/src/main/assets/Vehicles/5.jpg differ diff --git a/app/src/main/assets/Vehicles/6.jpg b/app/src/main/assets/Vehicles/6.jpg new file mode 100644 index 0000000..7eeb870 Binary files /dev/null and b/app/src/main/assets/Vehicles/6.jpg differ diff --git a/app/src/main/assets/Vehicles/7.jpg b/app/src/main/assets/Vehicles/7.jpg new file mode 100644 index 0000000..c5e6294 Binary files /dev/null and b/app/src/main/assets/Vehicles/7.jpg differ diff --git a/app/src/main/assets/Vehicles/8.jpg b/app/src/main/assets/Vehicles/8.jpg new file mode 100644 index 0000000..6628782 Binary files /dev/null and b/app/src/main/assets/Vehicles/8.jpg differ diff --git a/app/src/main/assets/Vehicles/9.jpg b/app/src/main/assets/Vehicles/9.jpg new file mode 100644 index 0000000..367b772 Binary files /dev/null and b/app/src/main/assets/Vehicles/9.jpg differ diff --git a/app/src/main/assets/font.ttf b/app/src/main/assets/font.ttf new file mode 100644 index 0000000..23e4502 Binary files /dev/null and b/app/src/main/assets/font.ttf differ diff --git a/app/src/main/java/com/ar/sketch/drawing/MyApp.java b/app/src/main/java/com/ar/sketch/drawing/MyApp.java new file mode 100644 index 0000000..12402fd --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/MyApp.java @@ -0,0 +1,101 @@ +package com.ar.sketch.drawing; + +import android.app.Application; +import android.content.res.AssetManager; +import android.graphics.Typeface; + +import com.ar.sketch.drawing.dbManager.MyDb; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class MyApp 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 MyApp 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, "font.ttf"); + + MyDb.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 = "Animals"; + public static String Class_birds = "Birds"; + public static String Class_butterfly = "Butterfly"; + public static String Class_cafe = "Cafe"; + public static String Class_cartoons = "Cartoons"; + public static String Class_christmas = "Christmas"; + public static String Class_festivals = "Festivals"; + public static String Class_flowers = "Flowers"; + public static String Class_fruits = "Fruits"; + public static String Class_general = "General"; + + public static String Class_mehndi = "Mehndi"; + public static String Class_nature = "Nature"; + public static String Class_properties = "Properties"; + public static String Class_rangoli = "Rangoli"; + public static String Class_sports = "Sports"; + public static String Class_vehicles = "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/drawing/activity/ActivityList.java b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityList.java new file mode 100644 index 0000000..900779b --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityList.java @@ -0,0 +1,60 @@ +package com.ar.sketch.drawing.activity; + +import android.os.Bundle; +import android.view.View; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.ar.sketch.drawing.MyApp; +import com.ar.sketch.drawing.myadapter.AdapterList; +import com.ar.sketch.drawing.databinding.ActivityItemBinding; +import com.ar.sketch.drawing.utils.MyUtils; + +import java.util.List; + +public class ActivityList extends AppCompatActivity { + + private ActivityItemBinding preViewBinding; + + private String dirStr; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + preViewBinding = ActivityItemBinding.inflate(getLayoutInflater()); + setContentView(preViewBinding.getRoot()); + MyUtils.setStatusBarTextColor(this, true); + dirStr = getIntent().getStringExtra(MyApp.Key_ViewDir); + preViewBinding.categoryName.setText(dirStr.substring(dirStr.lastIndexOf("_") + 1)); + + + + onInitList(); + onInitClick(); + } + + private void onInitList() { + + List list = MyUtils.fileExistsInAssets(this, dirStr); + + AdapterList adapterList = new AdapterList(this, list); + preViewBinding.recyclerview.setAdapter(adapterList); + preViewBinding.recyclerview.setLayoutManager(new GridLayoutManager(this, 3)); + } + + 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/drawing/activity/ActivityMain.java b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityMain.java new file mode 100644 index 0000000..d21d90d --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityMain.java @@ -0,0 +1,146 @@ +package com.ar.sketch.drawing.activity; + +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.drawing.R; +import com.ar.sketch.drawing.databinding.ActivityHomeBinding; +import com.ar.sketch.drawing.utils.MyUtils; +import com.ar.sketch.drawing.frag.FragmentFavorite; +import com.ar.sketch.drawing.frag.FragmentHome; +import com.ar.sketch.drawing.frag.FragmentImport; +import com.google.android.material.tabs.TabLayout; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class ActivityMain extends AppCompatActivity { + + private ActivityHomeBinding binding; + + private List listFragment = new ArrayList<>(); + + + private String[] permissions; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + MyUtils.setStatusBarTextColor(this, true); + binding = ActivityHomeBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); +// fragmentAlbum = FragmentAlbum.newInstance(); + listFragment.add(FragmentHome.newInstance()); + listFragment.add(FragmentImport.newInstance()); + listFragment.add(FragmentFavorite.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.item_tab, null, false); + ImageView icon = inflate.findViewById(R.id.im_icon); + if (i == 0) { + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_tab_home)); + } else if (i == 1){ + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_import)); + }else { + icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.selector_tab_collection)); + } + tab.setCustomView(inflate); + binding.tab.addTab(tab); + } + + } + +// +// @Override +// public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { +// super.onRequestPermissionsResult(requestCode, permissions, grantResults); +// if (requestCode == 0) { +// if (MyUtils.checkPermission(HomeActivity.this, permissions)) { +// startImport(); +// } else { +// +// } +// +// } +// } + +// public 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 (!MyUtils.checkPermission(HomeActivity.this, permissions)) { +// +// ActivityCompat.requestPermissions(HomeActivity.this, permissions, 0); +// } else { +// +// startImport(); +// } +// } +// +// private void startImport() { +// Intent intent = new Intent(HomeActivity.this, LocalActivity.class); +// startActivity(intent); +// +// } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/drawing/activity/ActivityPreview.java b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityPreview.java new file mode 100644 index 0000000..426748c --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityPreview.java @@ -0,0 +1,340 @@ +package com.ar.sketch.drawing.activity; + +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.drawing.dbManager.MyDb; +import com.ar.sketch.drawing.utils.MyUtils; +import com.google.common.util.concurrent.ListenableFuture; +import com.ar.sketch.drawing.MyApp; +import com.ar.sketch.drawing.R; + +public class ActivityPreview 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.activity_pre); + MyUtils.setStatusBarTextColor(this, true); + Intent intent = getIntent(); + isMain = intent.getBooleanExtra(MyApp.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(MyApp.Key_Camera); + + boolean b = MyDb.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 = MyUtils.getUriFileSize(ActivityPreview.this, imageUri); + Log.d(MyApp.TAG, "------uriFileSize-----" + uriFileSize+"--Mb"); + if(uriFileSize>=5){ + Toast.makeText(ActivityPreview.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 = MyUtils.saveToInternalStorage(name, imageUri, ActivityPreview.this); + if(b){ + String importPath = MyUtils.getImportPath(name); + MyDb.insertImport(importPath); + } + } + }).start(); + + + } + + } + + }); + + init(); + initClick(); + } + + + + private void onInitIm(float imW, float imH) { + Point screen = MyUtils.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 = MyUtils.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 = MyUtils.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){ + MyDb.insertOrUpdateLike(curBitmapPath); + }else { + MyDb.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 (!MyUtils.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 = MyUtils.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 (MyUtils.checkPermission(ActivityPreview.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/drawing/activity/ActivityWelcome.java b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityWelcome.java new file mode 100644 index 0000000..c857d6e --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/activity/ActivityWelcome.java @@ -0,0 +1,57 @@ +package com.ar.sketch.drawing.activity; + +import android.content.Intent; +import android.os.Bundle; +import android.os.CountDownTimer; + +import androidx.appcompat.app.AppCompatActivity; + +import com.ar.sketch.drawing.databinding.ActivityWelBinding; +import com.ar.sketch.drawing.utils.MyUtils; + +public class ActivityWelcome extends AppCompatActivity { + + private ActivityWelBinding binding; + private long time = 1000; + private CountDownTimer countDownTimer; + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = ActivityWelBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + MyUtils.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(ActivityWelcome.this, ActivityMain.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/drawing/dbManager/BeanImport.java b/app/src/main/java/com/ar/sketch/drawing/dbManager/BeanImport.java new file mode 100644 index 0000000..44d9206 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/dbManager/BeanImport.java @@ -0,0 +1,32 @@ +package com.ar.sketch.drawing.dbManager; + + +import io.objectbox.annotation.Entity; +import io.objectbox.annotation.Id; + +@Entity +public class BeanImport { + + @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/drawing/dbManager/DataLocal.java b/app/src/main/java/com/ar/sketch/drawing/dbManager/DataLocal.java new file mode 100644 index 0000000..ef30be1 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/dbManager/DataLocal.java @@ -0,0 +1,32 @@ +package com.ar.sketch.drawing.dbManager; + + +import io.objectbox.annotation.Entity; +import io.objectbox.annotation.Id; + +@Entity +public class DataLocal { + + @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/drawing/dbManager/MyDb.java b/app/src/main/java/com/ar/sketch/drawing/dbManager/MyDb.java new file mode 100644 index 0000000..a5d3fa6 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/dbManager/MyDb.java @@ -0,0 +1,148 @@ +package com.ar.sketch.drawing.dbManager; + +import android.content.Context; +import android.util.Log; + +import com.ar.sketch.drawing.mycallback.OnFavoriteListener; +import com.ar.sketch.drawing.MyApp; + +import java.util.ArrayList; +import java.util.List; + +import io.objectbox.Box; +import io.objectbox.BoxStore; +import io.objectbox.query.QueryBuilder; + +public class MyDb { + + private static BoxStore boxStore; + + private static Box LikeBox; + + private static Box ImportBox; + + private static List list = new ArrayList<>(); + + public static void addListener(OnFavoriteListener 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(DataLocal.class); + } + + return LikeBox; + } + private static Box getObjectBoxImport() { + if (ImportBox == null) { + ImportBox = boxStore.boxFor(BeanImport.class); + } + + return ImportBox; + } + + public static void insertOrUpdateLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + DataLocal first = objectBoxLike.query() + .equal(DataLocal_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first == null) { + DataLocal dataLocal = new DataLocal(); + dataLocal.setPath(mPath); + objectBoxLike.put(dataLocal); + for(OnFavoriteListener listener:list){ + listener.onAddLike(); + } + } else { + + } + } + public static void insertImport(String muri) { + Box objectBoxImport = getObjectBoxImport(); + BeanImport first = objectBoxImport.query() + .equal(BeanImport_.uri, muri, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first == null) { + + BeanImport beanImport = new BeanImport(); + beanImport.setUri(muri); + objectBoxImport.put(beanImport); + } else { + + } + + } + + public static void deleteImport(String mPath) { + Box objectBoxImport = getObjectBoxImport(); + BeanImport first = objectBoxImport.query() + .equal(BeanImport_.uri, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (first != null) { + objectBoxImport.remove(first); + for(OnFavoriteListener listener:list){ +// listener.onDeleteLike(); + } + Log.d(MyApp.TAG, "--------deleteImport imId=" + mPath); + } + + + } + + public static void deleteLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + DataLocal boxLike = objectBoxLike.query() + .equal(DataLocal_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + if (boxLike != null) { + objectBoxLike.remove(boxLike); + for(OnFavoriteListener listener:list){ + listener.onDeleteLike(); + } + Log.d(MyApp.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(); + BeanImport first = objectBoxImport.query() + .equal(BeanImport_.uri, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + return first != null; + + } + + + public static boolean queryIsLike(String mPath) { + Box objectBoxLike = getObjectBoxLike(); + DataLocal first = objectBoxLike.query() + .equal(DataLocal_.path, mPath, QueryBuilder.StringOrder.CASE_SENSITIVE) + .build() + .findFirst(); + return first != null; + + } +} diff --git a/app/src/main/java/com/ar/sketch/drawing/frag/FragmentFavorite.java b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentFavorite.java new file mode 100644 index 0000000..9090891 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentFavorite.java @@ -0,0 +1,77 @@ +package com.ar.sketch.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.drawing.myadapter.AdapterFavorite; +import com.ar.sketch.drawing.mycallback.OnFavoriteListener; +import com.ar.sketch.drawing.dbManager.DataLocal; +import com.ar.sketch.drawing.dbManager.MyDb; +import com.ar.sketch.drawing.databinding.FragmentFavoriteBinding; + +import java.util.List; + +public class FragmentFavorite extends Fragment { + private FragmentFavoriteBinding binding; + + public FragmentFavorite() { + + } + public static FragmentFavorite newInstance() { + return new FragmentFavorite(); + } + + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + binding = FragmentFavoriteBinding.inflate(getLayoutInflater()); + onInit(); + + return binding.getRoot(); + } + + private void onInit(){ + List datumLocals = MyDb.queryAllLike(); + AdapterFavorite adapterFavorite = new AdapterFavorite(requireActivity()); + adapterFavorite.setData(datumLocals); + updateUi(datumLocals); + + binding.recyclerview.setAdapter(adapterFavorite); + binding.recyclerview.setLayoutManager(new GridLayoutManager(requireContext(), 3)); + + + MyDb.addListener(new OnFavoriteListener() { + @Override + public void onAddLike() { + List datumLocals = MyDb.queryAllLike(); + adapterFavorite.setData(datumLocals); + updateUi(datumLocals); + } + + @Override + public void onDeleteLike() { + List datumLocals = MyDb.queryAllLike(); + adapterFavorite.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/drawing/frag/FragmentHome.java b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentHome.java new file mode 100644 index 0000000..51e820f --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentHome.java @@ -0,0 +1,70 @@ +package com.ar.sketch.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.drawing.MyApp; +import com.ar.sketch.drawing.activity.ActivityPreview; +import com.ar.sketch.drawing.myadapter.AdapterMain; +import com.ar.sketch.drawing.mycallback.OnClickListener; +import com.ar.sketch.drawing.databinding.FragmentHomeBinding; +import com.ar.sketch.drawing.activity.ActivityList; + +public class FragmentHome extends Fragment implements OnClickListener { + + private FragmentHomeBinding binding; + + public FragmentHome() { + + } + + public static FragmentHome newInstance() { + FragmentHome fragment = new FragmentHome(); + 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() { + AdapterMain adapterMain = new AdapterMain(requireContext()); + adapterMain.setListener(this::onClickItem); + binding.recyclerview.setAdapter(adapterMain); + binding.recyclerview.setLayoutManager(new GridLayoutManager(requireContext(), 1)); + } + + + @Override + public void onClickItem(int type, String dir) { + switch (type) { + case 0: + Intent intent = new Intent(requireContext(), ActivityList.class); + intent.putExtra(MyApp.Key_ViewDir, dir); + startActivity(intent); + break; + case 1: + Intent intent1 = new Intent(requireContext(), ActivityPreview.class); + intent1.putExtra(MyApp.Key_Camera, dir); + startActivity(intent1); + break; + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ar/sketch/drawing/frag/FragmentImport.java b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentImport.java new file mode 100644 index 0000000..43807d9 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/frag/FragmentImport.java @@ -0,0 +1,212 @@ +package com.ar.sketch.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.drawing.MyApp; +import com.ar.sketch.drawing.R; +import com.ar.sketch.drawing.myadapter.AdapterImport; +import com.ar.sketch.drawing.databinding.FragmentImportBinding; +import com.ar.sketch.drawing.dbManager.BeanImport; +import com.ar.sketch.drawing.dbManager.MyDb; +import com.ar.sketch.drawing.utils.MyUtils; + +import java.io.File; +import java.util.List; +import java.util.Map; + +public class FragmentImport extends Fragment { + + private FragmentImportBinding binding; + + + private String[] permissions; + + private AdapterImport adapterImport; + private ActivityResultLauncher intentActivityResultLauncher; + private ActivityResultLauncher permissionsLauncher; + public FragmentImport() { + + } + + public static FragmentImport newInstance() { + FragmentImport fragment = new FragmentImport(); + 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 = MyUtils.getUriFileSize(requireContext(), imageUri); + Log.d(MyApp.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 = MyUtils.getImportPath(name); + new Thread(new Runnable() { + @Override + public void run() { + File file = new File(importPath); + boolean isimport = MyDb.queryIsImport(importPath); + if (file.exists()) { + if (!isimport) { + MyDb.insertImport(importPath); + } + requireActivity().runOnUiThread(() -> { + binding.loading.setVisibility(View.GONE); + if (isimport) { + Toast.makeText(requireContext(), getString(R.string.import_already), Toast.LENGTH_SHORT).show(); + } else { + BeanImport beanImport = new BeanImport(); + beanImport.setUri(importPath); + adapterImport.addData(beanImport); + updateUi(true); + } + }); + } else { + boolean b = MyUtils.saveToInternalStorage(name, imageUri, requireContext()); + if (b) { + MyDb.insertImport(importPath); + } + requireActivity().runOnUiThread(() -> { + binding.loading.setVisibility(View.GONE); + if (b) { + BeanImport beanImport = new BeanImport(); + beanImport.setUri(importPath); + adapterImport.addData(beanImport); + 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 (!MyUtils.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() { + adapterImport = new AdapterImport(requireActivity()); + new Thread(new Runnable() { + @Override + public void run() { + List importUrises = MyDb.queryAllImport(); + requireActivity().runOnUiThread(() -> { + adapterImport.setData(importUrises); + updateUi(importUrises.size() > 0); + binding.loading.setVisibility(View.GONE); + }); + } + }).start(); + binding.recyclerview.setAdapter(adapterImport); + 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/drawing/myadapter/AdapterChild.java b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterChild.java new file mode 100644 index 0000000..9aeeb4a --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterChild.java @@ -0,0 +1,101 @@ +package com.ar.sketch.drawing.myadapter; + +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.drawing.MyApp; +import com.ar.sketch.drawing.databinding.ItemChildBinding; +import com.ar.sketch.drawing.mycallback.OnClickListener; +import com.ar.sketch.drawing.utils.MyUtils; +import com.ar.sketch.drawing.activity.ActivityList; +import com.ar.sketch.drawing.activity.ActivityPreview; + +import java.util.List; + +public class AdapterChild extends RecyclerView.Adapter { + + + private Context mCon; + private List data; + private String mDir; + private OnClickListener listener; + + + public void setListener(OnClickListener listener) { + this.listener = listener; + } + + public AdapterChild(Context mCon, List bitmapList, String dir) { + this.mCon = mCon; + data = bitmapList; + mDir = dir; + } + + + @NonNull + @Override + public ChildVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + + ItemChildBinding inflate = ItemChildBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false); + return new ChildVH(inflate); + } + + @Override + public void onBindViewHolder(@NonNull ChildVH holder, int position) { + + String name = data.get(position); + Bitmap bitmap = MyUtils.loadImageFromAssets(mCon, name); + holder.binding.imPreview.setImageBitmap(bitmap); + + if (position == data.size() - 1) { + holder.binding.tvMore.setVisibility(View.VISIBLE); + holder.binding.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + listener.onClickItem(0, mDir); + } + + } + }); + } else { + holder.binding.tvMore.setVisibility(View.GONE); + 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 ItemChildBinding binding; + + + public ChildVH(@NonNull ItemChildBinding itemView) { + super(itemView.getRoot()); + binding = itemView; + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterFavorite.java b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterFavorite.java new file mode 100644 index 0000000..2a4e361 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterFavorite.java @@ -0,0 +1,93 @@ +package com.ar.sketch.drawing.myadapter; + +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.drawing.MyApp; +import com.ar.sketch.drawing.activity.ActivityPreview; +import com.ar.sketch.drawing.dbManager.DataLocal; +import com.ar.sketch.drawing.utils.MyUtils; +import com.ar.sketch.drawing.R; + +import java.util.List; + +public class AdapterFavorite extends RecyclerView.Adapter { + + + private Activity mCon; + private List data; + + + public void setData(List data) { + this.data = data; + notifyDataSetChanged(); + } + public AdapterFavorite(Activity mCon) { + this.mCon = mCon; + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_list, parent, false); + return new HomeVH(view); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + DataLocal dataLocal = data.get(position); + String name = dataLocal.getPath(); + new Thread(new Runnable() { + @Override + public void run() { + Bitmap bitmap = MyUtils.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, ActivityPreview.class); + intent.putExtra(MyApp.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/drawing/myadapter/AdapterImport.java b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterImport.java new file mode 100644 index 0000000..6fbceb2 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterImport.java @@ -0,0 +1,119 @@ +package com.ar.sketch.drawing.myadapter; + +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.drawing.activity.ActivityPreview; +import com.ar.sketch.drawing.dbManager.BeanImport; +import com.ar.sketch.drawing.dbManager.MyDb; +import com.ar.sketch.drawing.R; +import com.ar.sketch.drawing.MyApp; + +import java.util.ArrayList; +import java.util.List; + +public class AdapterImport extends RecyclerView.Adapter { + + + private Activity mCon; + private List data = new ArrayList<>(); + + + public void setData(List data) { + this.data = data; + notifyDataSetChanged(); + } + public AdapterImport(Activity mCon) { + this.mCon = mCon; + } + + public void addData(BeanImport newData){ + data.add(newData); + int i = data.size() - 1; + Log.d(MyApp.TAG, "---------addData i="+i); + notifyItemInserted(i); + notifyItemChanged(i); + + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_import, parent, false); + return new HomeVH(view); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + BeanImport beanImport = data.get(position); + String path = beanImport.getUri(); + Log.d(MyApp.TAG, "---------ImportAdapter position="+position+"------" + path); + new Thread(new Runnable() { + @Override + public void run() { + Bitmap bitmap = BitmapFactory.decodeFile(path); + mCon.runOnUiThread(()->{ + holder.previewIm.setImageBitmap(bitmap); + }); + + } + }).start(); + + + + holder.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mCon, ActivityPreview.class); + intent.putExtra(MyApp.Key_Camera, path); + mCon.startActivity(intent); + } + }); + holder.imDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + int adapterPosition = holder.getAdapterPosition(); + MyDb.deleteImport(path); + data.remove(adapterPosition); + notifyItemRemoved(adapterPosition); + Log.d(MyApp.TAG,"-------adapterPosition="+adapterPosition); + } + }); + + + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ImageView previewIm, imDelete; + + private CardView cardView; + + + public HomeVH(@NonNull View itemView) { + super(itemView); + previewIm = itemView.findViewById(R.id.imPreview); + cardView = itemView.findViewById(R.id.card_view); + imDelete = itemView.findViewById(R.id.delete); + + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterList.java b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterList.java new file mode 100644 index 0000000..437552f --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterList.java @@ -0,0 +1,82 @@ +package com.ar.sketch.drawing.myadapter; + +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 android.widget.ImageView; + +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.drawing.MyApp; +import com.ar.sketch.drawing.activity.ActivityPreview; +import com.ar.sketch.drawing.utils.MyUtils; +import com.ar.sketch.drawing.R; + +import java.util.List; + +public class AdapterList extends RecyclerView.Adapter { + + + private Context mCon; + private List data; + + + + public AdapterList(Context mCon, List bitmapList) { + this.mCon = mCon; + data = bitmapList; + } + + + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_list, parent, false); + return new HomeVH(view); + } + + @Override + public void onBindViewHolder(@NonNull HomeVH holder, int position) { + + String name = data.get(position); + Bitmap bitmap = MyUtils.loadImageFromAssets(mCon, name); + holder.previewIm.setImageBitmap(bitmap); + + holder.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mCon, ActivityPreview.class); + intent.putExtra(MyApp.Key_Camera, name); + mCon.startActivity(intent); + } + }); + + + } + + @Override + public int getItemCount() { + return data.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ImageView previewIm; + + private CardView cardView; + + + public HomeVH(@NonNull View itemView) { + super(itemView); + previewIm = itemView.findViewById(R.id.imPreview); + cardView = itemView.findViewById(R.id.card_view); + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterMain.java b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterMain.java new file mode 100644 index 0000000..8a3114d --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/myadapter/AdapterMain.java @@ -0,0 +1,92 @@ +package com.ar.sketch.drawing.myadapter; + +import android.content.Context; +import android.graphics.Bitmap; +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.ar.sketch.drawing.MyApp; +import com.ar.sketch.drawing.databinding.ItemHomeBinding; +import com.ar.sketch.drawing.mycallback.OnClickListener; +import com.ar.sketch.drawing.utils.MyUtils; + +import java.util.ArrayList; +import java.util.List; + +public class AdapterMain extends RecyclerView.Adapter { + private List nameList = MyApp.getAllDir(); + + private Context mCon; + + private OnClickListener listener; + public AdapterMain(Context mCon) { + this.mCon = mCon; + } + + public void setListener(OnClickListener listener) { + this.listener = listener; + } + + @NonNull + @Override + public HomeVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ItemHomeBinding inflate = ItemHomeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false); + return new HomeVH(inflate); + } + + @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 = MyUtils.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); + AdapterChild listAdapter = new AdapterChild(mCon, data,dir); + listAdapter.setListener(listener); + holder.itemBinding.childRecycler.setAdapter(listAdapter); + holder.itemBinding.childRecycler.setLayoutManager(new LinearLayoutManager(mCon,LinearLayoutManager.HORIZONTAL, false)); + +// holder.cardView.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// if(listener!= null){ +// listener.onClickItem(dir); +// } +// +// } +// }); + + + } + + + + @Override + public int getItemCount() { + return nameList.size(); + } + + public static class HomeVH extends RecyclerView.ViewHolder { + private ItemHomeBinding itemBinding; + + public HomeVH(@NonNull ItemHomeBinding itemHomeBinding) { + super(itemHomeBinding.getRoot()); + itemBinding = itemHomeBinding; + } + + + } +} diff --git a/app/src/main/java/com/ar/sketch/drawing/mycallback/OnClickListener.java b/app/src/main/java/com/ar/sketch/drawing/mycallback/OnClickListener.java new file mode 100644 index 0000000..51b75e8 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/mycallback/OnClickListener.java @@ -0,0 +1,6 @@ +package com.ar.sketch.drawing.mycallback; + +public interface OnClickListener { + + void onClickItem(int type,String dir); +} diff --git a/app/src/main/java/com/ar/sketch/drawing/mycallback/OnFavoriteListener.java b/app/src/main/java/com/ar/sketch/drawing/mycallback/OnFavoriteListener.java new file mode 100644 index 0000000..f133cc5 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/mycallback/OnFavoriteListener.java @@ -0,0 +1,7 @@ +package com.ar.sketch.drawing.mycallback; + +public interface OnFavoriteListener { + + void onAddLike(); + void onDeleteLike(); +} diff --git a/app/src/main/java/com/ar/sketch/drawing/utils/MyTextView.java b/app/src/main/java/com/ar/sketch/drawing/utils/MyTextView.java new file mode 100644 index 0000000..60d6af8 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/utils/MyTextView.java @@ -0,0 +1,32 @@ +package com.ar.sketch.drawing.utils; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; + +import androidx.annotation.Nullable; + +import com.ar.sketch.drawing.R; + +public class MyTextView extends androidx.appcompat.widget.AppCompatTextView { + + + public MyTextView(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){ + MyUtils.initFont(this); + } + + typedArray.recycle(); + } + + + +} diff --git a/app/src/main/java/com/ar/sketch/drawing/utils/MyUtils.java b/app/src/main/java/com/ar/sketch/drawing/utils/MyUtils.java new file mode 100644 index 0000000..c131e93 --- /dev/null +++ b/app/src/main/java/com/ar/sketch/drawing/utils/MyUtils.java @@ -0,0 +1,190 @@ +package com.ar.sketch.drawing.utils; + +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 com.ar.sketch.drawing.MyApp; + +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 MyUtils { + + + + 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(MyApp.TAG,"--------import"); + return bitmap1; + } else { + Log.d(MyApp.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(MyApp.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 = MyApp.app.getFilesDir(); + String s = filesDir + "/" + name; + return s; + } + + public static float dpToPx(float dpValue) { + float density = MyApp.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_import.xml b/app/src/main/res/drawable/bg_import.xml new file mode 100644 index 0000000..a79bde2 --- /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_tab.xml b/app/src/main/res/drawable/bg_tab.xml new file mode 100644 index 0000000..4c40dd7 --- /dev/null +++ b/app/src/main/res/drawable/bg_tab.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/collction_stoke.xml b/app/src/main/res/drawable/collction_stoke.xml new file mode 100644 index 0000000..c3ca983 --- /dev/null +++ b/app/src/main/res/drawable/collction_stoke.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/flash_close.xml b/app/src/main/res/drawable/flash_close.xml new file mode 100644 index 0000000..1decf30 --- /dev/null +++ b/app/src/main/res/drawable/flash_close.xml @@ -0,0 +1,19 @@ + + + + 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/im_alaph.xml b/app/src/main/res/drawable/im_alaph.xml new file mode 100644 index 0000000..5eeb303 --- /dev/null +++ b/app/src/main/res/drawable/im_alaph.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/im_back.xml b/app/src/main/res/drawable/im_back.xml new file mode 100644 index 0000000..b47d615 --- /dev/null +++ b/app/src/main/res/drawable/im_back.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_collection.xml b/app/src/main/res/drawable/im_collection.xml new file mode 100644 index 0000000..660a09b --- /dev/null +++ b/app/src/main/res/drawable/im_collection.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_collection_light.xml b/app/src/main/res/drawable/im_collection_light.xml new file mode 100644 index 0000000..31926a2 --- /dev/null +++ b/app/src/main/res/drawable/im_collection_light.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_delete.xml b/app/src/main/res/drawable/im_delete.xml new file mode 100644 index 0000000..43c61ce --- /dev/null +++ b/app/src/main/res/drawable/im_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_home.xml b/app/src/main/res/drawable/im_home.xml new file mode 100644 index 0000000..0180f41 --- /dev/null +++ b/app/src/main/res/drawable/im_home.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_home1.xml b/app/src/main/res/drawable/im_home1.xml new file mode 100644 index 0000000..60ed55a --- /dev/null +++ b/app/src/main/res/drawable/im_home1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_import.xml b/app/src/main/res/drawable/im_import.xml new file mode 100644 index 0000000..b42dd9e --- /dev/null +++ b/app/src/main/res/drawable/im_import.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_import_gray.xml b/app/src/main/res/drawable/im_import_gray.xml new file mode 100644 index 0000000..817e67a --- /dev/null +++ b/app/src/main/res/drawable/im_import_gray.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_photo.xml b/app/src/main/res/drawable/im_photo.xml new file mode 100644 index 0000000..aab4239 --- /dev/null +++ b/app/src/main/res/drawable/im_photo.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/im_preview_progress.xml b/app/src/main/res/drawable/im_preview_progress.xml new file mode 100644 index 0000000..6fa9601 --- /dev/null +++ b/app/src/main/res/drawable/im_preview_progress.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/im_preview_thumb.xml b/app/src/main/res/drawable/im_preview_thumb.xml new file mode 100644 index 0000000..0531d51 --- /dev/null +++ b/app/src/main/res/drawable/im_preview_thumb.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/im_true_flash.xml b/app/src/main/res/drawable/im_true_flash.xml new file mode 100644 index 0000000..f8ed9e3 --- /dev/null +++ b/app/src/main/res/drawable/im_true_flash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/im_true_like.xml b/app/src/main/res/drawable/im_true_like.xml new file mode 100644 index 0000000..0d74b36 --- /dev/null +++ b/app/src/main/res/drawable/im_true_like.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/mian_bg.xml b/app/src/main/res/drawable/mian_bg.xml new file mode 100644 index 0000000..346060c --- /dev/null +++ b/app/src/main/res/drawable/mian_bg.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_collection.xml b/app/src/main/res/drawable/selector_collection.xml new file mode 100644 index 0000000..a4e4281 --- /dev/null +++ b/app/src/main/res/drawable/selector_collection.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_import.xml b/app/src/main/res/drawable/selector_import.xml new file mode 100644 index 0000000..641e27b --- /dev/null +++ b/app/src/main/res/drawable/selector_import.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_pre_flash.xml b/app/src/main/res/drawable/selector_pre_flash.xml new file mode 100644 index 0000000..b008ac5 --- /dev/null +++ b/app/src/main/res/drawable/selector_pre_flash.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_tab_collection.xml b/app/src/main/res/drawable/selector_tab_collection.xml new file mode 100644 index 0000000..a086b12 --- /dev/null +++ b/app/src/main/res/drawable/selector_tab_collection.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_tab_home.xml b/app/src/main/res/drawable/selector_tab_home.xml new file mode 100644 index 0000000..22fd650 --- /dev/null +++ b/app/src/main/res/drawable/selector_tab_home.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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..2dc6add --- /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_home.xml b/app/src/main/res/layout/activity_home.xml new file mode 100644 index 0000000..1552d97 --- /dev/null +++ b/app/src/main/res/layout/activity_home.xml @@ -0,0 +1,29 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_item.xml b/app/src/main/res/layout/activity_item.xml new file mode 100644 index 0000000..6ada2f8 --- /dev/null +++ b/app/src/main/res/layout/activity_item.xml @@ -0,0 +1,38 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pre.xml b/app/src/main/res/layout/activity_pre.xml new file mode 100644 index 0000000..78d5482 --- /dev/null +++ b/app/src/main/res/layout/activity_pre.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_wel.xml b/app/src/main/res/layout/activity_wel.xml new file mode 100644 index 0000000..241343c --- /dev/null +++ b/app/src/main/res/layout/activity_wel.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml new file mode 100644 index 0000000..c220359 --- /dev/null +++ b/app/src/main/res/layout/fragment_favorite.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml new file mode 100644 index 0000000..a6949af --- /dev/null +++ b/app/src/main/res/layout/fragment_home.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_import.xml b/app/src/main/res/layout/fragment_import.xml new file mode 100644 index 0000000..c0c676b --- /dev/null +++ b/app/src/main/res/layout/fragment_import.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_child.xml b/app/src/main/res/layout/item_child.xml new file mode 100644 index 0000000..1b31e92 --- /dev/null +++ b/app/src/main/res/layout/item_child.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home.xml b/app/src/main/res/layout/item_home.xml new file mode 100644 index 0000000..fc30f32 --- /dev/null +++ b/app/src/main/res/layout/item_home.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_import.xml b/app/src/main/res/layout/item_import.xml new file mode 100644 index 0000000..cf21e7f --- /dev/null +++ b/app/src/main/res/layout/item_import.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml new file mode 100644 index 0000000..ee326e5 --- /dev/null +++ b/app/src/main/res/layout/item_list.xml @@ -0,0 +1,24 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml new file mode 100644 index 0000000..88bc0ed --- /dev/null +++ b/app/src/main/res/layout/item_tab.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/im_logo.png b/app/src/main/res/mipmap-xxxhdpi/im_logo.png new file mode 100644 index 0000000..fd67c38 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/im_logo.png differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..71efee4 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..3e55230 --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3055ed0 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,30 @@ + + + #FF000000 + #FFFFFFFF + #F7F5F4 + + #E84646 + #cccccc + #6F6C6C + #80ffffff + #D8C8AF + + + #BDC97C + + + + + + + + #F67186 + #FE988B + #F3B5AD + #3A3A55 + #00000000 + #cccccc + #D8D7D7 + #33000000 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..bcea114 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,15 @@ + + AR Sketch Drawing + + Favorite + Please grant the relevant permissions and try again. + No Favorites + Gallery + You haven\'t uploaded any pictures yet + Import pictures + Import failed, please try again + Too big, the image should not be larger than 5M + Already imported + Category + More + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..2b36a94 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,10 @@ + + + + +