diff --git a/app/build.gradle b/app/build.gradle index d0bc67f..52bf463 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,9 +46,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0' - implementation 'org.tensorflow:tensorflow-lite-support:0.1.0' - implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' @@ -79,10 +76,9 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - //Room Library - def room_version = "2.5.1" - implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" - implementation "androidx.room:room-ktx:$room_version" + //TFLite + implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0' + implementation 'org.tensorflow:tensorflow-lite-support:0.1.0' + implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0' } \ No newline at end of file diff --git a/app/src/main/assets/label.txt b/app/src/main/assets/label.txt new file mode 100644 index 0000000..b17a4e8 --- /dev/null +++ b/app/src/main/assets/label.txt @@ -0,0 +1,26 @@ +A +B +C +D +E +F +G +H +I +J +K +L +M +N +O +P +Q +R +S +T +U +V +W +X +Y +Z \ No newline at end of file diff --git a/app/src/main/assets/labels.txt b/app/src/main/assets/labels.txt deleted file mode 100644 index 7f78e0d..0000000 --- a/app/src/main/assets/labels.txt +++ /dev/null @@ -1,1001 +0,0 @@ -c -tench -goldfish -great white shark -tiger shark -hammerhead -electric ray -stingray -cock -hen -ostrich -brambling -goldfinch -house finch -junco -indigo bunting -robin -bulbul -jay -magpie -chickadee -water ouzel -kite -bald eagle -vulture -great grey owl -European fire salamander -common newt -eft -spotted salamander -axolotl -bullfrog -tree frog -tailed frog -loggerhead -leatherback turtle -mud turtle -terrapin -box turtle -banded gecko -common iguana -American chameleon -whiptail -agama -frilled lizard -alligator lizard -Gila monster -green lizard -African chameleon -Komodo dragon -African crocodile -American alligator -triceratops -thunder snake -ringneck snake -hognose snake -green snake -king snake -garter snake -water snake -vine snake -night snake -boa constrictor -rock python -Indian cobra -green mamba -sea snake -horned viper -diamondback -sidewinder -trilobite -harvestman -scorpion -black and gold garden spider -barn spider -garden spider -black widow -tarantula -wolf spider -tick -centipede -black grouse -ptarmigan -ruffed grouse -prairie chicken -peacock -quail -partridge -African grey -macaw -sulphur-crested cockatoo -lorikeet -coucal -bee eater -hornbill -hummingbird -jacamar -toucan -drake -red-breasted merganser -goose -black swan -tusker -echidna -platypus -wallaby -koala -wombat -jellyfish -sea anemone -brain coral -flatworm -nematode -conch -snail -slug -sea slug -chiton -chambered nautilus -Dungeness crab -rock crab -fiddler crab -king crab -American lobster -spiny lobster -crayfish -hermit crab -isopod -white stork -black stork -spoonbill -flamingo -little blue heron -American egret -bittern -crane -limpkin -European gallinule -American coot -bustard -ruddy turnstone -red-backed sandpiper -redshank -dowitcher -oystercatcher -pelican -king penguin -albatross -grey whale -killer whale -dugong -sea lion -Chihuahua -Japanese spaniel -Maltese dog -Pekinese -Shih-Tzu -Blenheim spaniel -papillon -toy terrier -Rhodesian ridgeback -Afghan hound -basset -beagle -bloodhound -bluetick -black-and-tan coonhound -Walker hound -English foxhound -redbone -borzoi -Irish wolfhound -Italian greyhound -whippet -Ibizan hound -Norwegian elkhound -otterhound -Saluki -Scottish deerhound -Weimaraner -Staffordshire bullterrier -American Staffordshire terrier -Bedlington terrier -Border terrier -Kerry blue terrier -Irish terrier -Norfolk terrier -Norwich terrier -Yorkshire terrier -wire-haired fox terrier -Lakeland terrier -Sealyham terrier -Airedale -cairn -Australian terrier -Dandie Dinmont -Boston bull -miniature schnauzer -giant schnauzer -standard schnauzer -Scotch terrier -Tibetan terrier -silky terrier -soft-coated wheaten terrier -West Highland white terrier -Lhasa -flat-coated retriever -curly-coated retriever -golden retriever -Labrador retriever -Chesapeake Bay retriever -German short-haired pointer -vizsla -English setter -Irish setter -Gordon setter -Brittany spaniel -clumber -English springer -Welsh springer spaniel -cocker spaniel -Sussex spaniel -Irish water spaniel -kuvasz -schipperke -groenendael -malinois -briard -kelpie -komondor -Old English sheepdog -Shetland sheepdog -collie -Border collie -Bouvier des Flandres -Rottweiler -German shepherd -Doberman -miniature pinscher -Greater Swiss Mountain dog -Bernese mountain dog -Appenzeller -EntleBucher -boxer -bull mastiff -Tibetan mastiff -French bulldog -Great Dane -Saint Bernard -Eskimo dog -malamute -Siberian husky -dalmatian -affenpinscher -basenji -pug -Leonberg -Newfoundland -Great Pyrenees -Samoyed -Pomeranian -chow -keeshond -Brabancon griffon -Pembroke -Cardigan -toy poodle -miniature poodle -standard poodle -Mexican hairless -timber wolf -white wolf -red wolf -coyote -dingo -dhole -African hunting dog -hyena -red fox -kit fox -Arctic fox -grey fox -tabby -tiger cat -Persian cat -Siamese cat -Egyptian cat -cougar -lynx -leopard -snow leopard -jaguar -lion -tiger -cheetah -brown bear -American black bear -ice bear -sloth bear -mongoose -meerkat -tiger beetle -ladybug -ground beetle -long-horned beetle -leaf beetle -dung beetle -rhinoceros beetle -weevil -fly -bee -ant -grasshopper -cricket -walking stick -cockroach -mantis -cicada -leafhopper -lacewing -dragonfly -damselfly -admiral -ringlet -monarch -cabbage butterfly -sulphur butterfly -lycaenid -starfish -sea urchin -sea cucumber -wood rabbit -hare -Angora -hamster -porcupine -fox squirrel -marmot -beaver -guinea pig -sorrel -zebra -hog -wild boar -warthog -hippopotamus -ox -water buffalo -bison -ram -bighorn -ibex -hartebeest -impala -gazelle -Arabian camel -llama -weasel -mink -polecat -black-footed ferret -otter -skunk -badger -armadillo -three-toed sloth -orangutan -gorilla -chimpanzee -gibbon -siamang -guenon -patas -baboon -macaque -langur -colobus -proboscis monkey -marmoset -capuchin -howler monkey -titi -spider monkey -squirrel monkey -Madagascar cat -indri -Indian elephant -African elephant -lesser panda -giant panda -barracouta -eel -coho -rock beauty -anemone fish -sturgeon -gar -lionfish -puffer -abacus -abaya -academic gown -accordion -acoustic guitar -aircraft carrier -airliner -airship -altar -ambulance -amphibian -analog clock -apiary -apron -ashcan -assault rifle -backpack -bakery -balance beam -balloon -ballpoint -Band Aid -banjo -bannister -barbell -barber chair -barbershop -barn -barometer -barrel -barrow -baseball -basketball -bassinet -bassoon -bathing cap -bath towel -bathtub -beach wagon -beacon -beaker -bearskin -beer bottle -beer glass -bell cote -bib -bicycle-built-for-two -bikini -binder -binoculars -birdhouse -boathouse -bobsled -bolo tie -bonnet -bookcase -bookshop -bottlecap -bow -bow tie -brass -brassiere -breakwater -breastplate -broom -bucket -buckle -bulletproof vest -bullet train -butcher shop -cab -caldron -candle -cannon -canoe -can opener -cardigan -car mirror -carousel -carpenter's kit -carton -car wheel -cash machine -cassette -cassette player -castle -catamaran -CD player -cello -cellular telephone -chain -chainlink fence -chain mail -chain saw -chest -chiffonier -chime -china cabinet -Christmas stocking -church -cinema -cleaver -cliff dwelling -cloak -clog -cocktail shaker -coffee mug -coffeepot -coil -combination lock -computer keyboard -confectionery -container ship -convertible -corkscrew -cornet -cowboy boot -cowboy hat -cradle -crane -crash helmet -crate -crib -Crock Pot -croquet ball -crutch -cuirass -dam -desk -desktop computer -dial telephone -diaper -digital clock -digital watch -dining table -dishrag -dishwasher -disk brake -dock -dogsled -dome -doormat -drilling platform -drum -drumstick -dumbbell -Dutch oven -electric fan -electric guitar -electric locomotive -entertainment center -envelope -espresso maker -face powder -feather boa -file -fireboat -fire engine -fire screen -flagpole -flute -folding chair -football helmet -forklift -fountain -fountain pen -four-poster -freight car -French horn -frying pan -fur coat -garbage truck -gasmask -gas pump -goblet -go-kart -golf ball -golfcart -gondola -gong -gown -grand piano -greenhouse -grille -grocery store -guillotine -hair slide -hair spray -half track -hammer -hamper -hand blower -hand-held computer -handkerchief -hard disc -harmonica -harp -harvester -hatchet -holster -home theater -honeycomb -hook -hoopskirt -horizontal bar -horse cart -hourglass -iPod -iron -jack-o'-lantern -jean -jeep -jersey -jigsaw puzzle -jinrikisha -joystick -kimono -knee pad -knot -lab coat -ladle -lampshade -laptop -lawn mower -lens cap -letter opener -library -lifeboat -lighter -limousine -liner -lipstick -Loafer -lotion -loudspeaker -loupe -lumbermill -magnetic compass -mailbag -mailbox -maillot -maillot -manhole cover -maraca -marimba -mask -matchstick -maypole -maze -measuring cup -medicine chest -megalith -microphone -microwave -military uniform -milk can -minibus -miniskirt -minivan -missile -mitten -mixing bowl -mobile home -Model T -modem -monastery -monitor -moped -mortar -mortarboard -mosque -mosquito net -motor scooter -mountain bike -mountain tent -mouse -mousetrap -moving van -muzzle -nail -neck brace -necklace -nipple -notebook -obelisk -oboe -ocarina -odometer -oil filter -organ -oscilloscope -overskirt -oxcart -oxygen mask -packet -paddle -paddlewheel -padlock -paintbrush -pajama -palace -panpipe -paper towel -parachute -parallel bars -park bench -parking meter -passenger car -patio -pay-phone -pedestal -pencil box -pencil sharpener -perfume -Petri dish -photocopier -pick -pickelhaube -picket fence -pickup -pier -piggy bank -pill bottle -pillow -ping-pong ball -pinwheel -pirate -pitcher -plane -planetarium -plastic bag -plate rack -plow -plunger -Polaroid camera -pole -police van -poncho -pool table -pop bottle -pot -potter's wheel -power drill -prayer rug -printer -prison -projectile -projector -puck -punching bag -purse -quill -quilt -racer -racket -radiator -radio -radio telescope -rain barrel -recreational vehicle -reel -reflex camera -refrigerator -remote control -restaurant -revolver -rifle -rocking chair -rotisserie -rubber eraser -rugby ball -rule -running shoe -safe -safety pin -saltshaker -sandal -sarong -sax -scabbard -scale -school bus -schooner -scoreboard -screen -screw -screwdriver -seat belt -sewing machine -shield -shoe shop -shoji -shopping basket -shopping cart -shovel -shower cap -shower curtain -ski -ski mask -sleeping bag -slide rule -sliding door -slot -snorkel -snowmobile -snowplow -soap dispenser -soccer ball -sock -solar dish -sombrero -soup bowl -space bar -space heater -space shuttle -spatula -speedboat -spider web -spindle -sports car -spotlight -stage -steam locomotive -steel arch bridge -steel drum -stethoscope -stole -stone wall -stopwatch -stove -strainer -streetcar -stretcher -studio couch -stupa -submarine -suit -sundial -sunglass -sunglasses -sunscreen -suspension bridge -swab -sweatshirt -swimming trunks -swing -switch -syringe -table lamp -tank -tape player -teapot -teddy -television -tennis ball -thatch -theater curtain -thimble -thresher -throne -tile roof -toaster -tobacco shop -toilet seat -torch -totem pole -tow truck -toyshop -tractor -trailer truck -tray -trench coat -tricycle -trimaran -tripod -triumphal arch -trolleybus -trombone -tub -turnstile -typewriter keyboard -umbrella -unicycle -upright -vacuum -vase -vault -velvet -vending machine -vestment -viaduct -violin -volleyball -waffle iron -wall clock -wallet -wardrobe -warplane -washbasin -washer -water bottle -water jug -water tower -whiskey jug -whistle -wig -window screen -window shade -Windsor tie -wine bottle -wing -wok -wooden spoon -wool -worm fence -wreck -yawl -yurt -web site -comic book -crossword puzzle -street sign -traffic light -book jacket -menu -plate -guacamole -consomme -hot pot -trifle -ice cream -ice lolly -French loaf -bagel -pretzel -cheeseburger -hotdog -mashed potato -head cabbage -broccoli -cauliflower -zucchini -spaghetti squash -acorn squash -butternut squash -cucumber -artichoke -bell pepper -cardoon -mushroom -Granny Smith -strawberry -orange -lemon -fig -pineapple -banana -jackfruit -custard apple -pomegranate -hay -carbonara -chocolate sauce -dough -meat loaf -pizza -potpie -burrito -red wine -espresso -cup -eggnog -alp -bubble -cliff -coral reef -geyser -lakeside -promontory -sandbar -seashore -valley -volcano -ballplayer -groom -scuba diver -rapeseed -daisy -yellow lady's slipper -corn -acorn -hip -buckeye -coral fungus -agaric -gyromitra -stinkhorn -earthstar -hen-of-the-woods -bolete -ear -toilet tissue diff --git a/app/src/main/java/com/example/sabi/data/api/ApiService.kt b/app/src/main/java/com/example/sabi/data/api/ApiService.kt index 927432e..3b87549 100644 --- a/app/src/main/java/com/example/sabi/data/api/ApiService.kt +++ b/app/src/main/java/com/example/sabi/data/api/ApiService.kt @@ -1,11 +1,7 @@ package com.example.sabi.data.api import com.example.sabi.model.ResponseListItem -import retrofit2.Call -import retrofit2.http.FormUrlEncoded import retrofit2.http.GET - -import retrofit2.http.Headers import retrofit2.http.Query interface ApiService { diff --git a/app/src/main/java/com/example/sabi/data/repository/Repository.kt b/app/src/main/java/com/example/sabi/data/repository/Repository.kt index 2768d3f..7d8bcfc 100644 --- a/app/src/main/java/com/example/sabi/data/repository/Repository.kt +++ b/app/src/main/java/com/example/sabi/data/repository/Repository.kt @@ -7,7 +7,6 @@ import com.example.sabi.data.local.LocalDataStore import com.example.sabi.model.ResponseListItem import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.withContext class Repository(private val apiService: ApiService, private val localDataStore: LocalDataStore) { diff --git a/app/src/main/java/com/example/sabi/model/ResponseList.kt b/app/src/main/java/com/example/sabi/model/ResponseList.kt index ad6acd3..f4d266f 100644 --- a/app/src/main/java/com/example/sabi/model/ResponseList.kt +++ b/app/src/main/java/com/example/sabi/model/ResponseList.kt @@ -2,12 +2,6 @@ package com.example.sabi.model import com.google.gson.annotations.SerializedName -//data class ResponseList( -// -// @field:SerializedName("ResponseList") -// val responseList: List -//) - data class ResponseListItem( @field:SerializedName("word_id") diff --git a/app/src/main/java/com/example/sabi/ui/ViewModelFactory.kt b/app/src/main/java/com/example/sabi/ui/ViewModelFactory.kt index 09b0c8a..ca4988c 100644 --- a/app/src/main/java/com/example/sabi/ui/ViewModelFactory.kt +++ b/app/src/main/java/com/example/sabi/ui/ViewModelFactory.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.example.sabi.data.di.Injection import com.example.sabi.data.repository.Repository -import com.example.sabi.ui.camera.CameraViewModel import com.example.sabi.ui.dictonary.DictonaryViewModel import com.example.sabi.ui.home.HomeViewModel import com.example.sabi.ui.splash.SplashViewModel @@ -17,7 +16,6 @@ class ViewModelFactory private constructor(private val repository: Repository): modelClass.isAssignableFrom(HomeViewModel::class.java) -> return HomeViewModel(repository) as T modelClass.isAssignableFrom(SplashViewModel::class.java) -> return SplashViewModel(repository) as T modelClass.isAssignableFrom(DictonaryViewModel::class.java) -> return DictonaryViewModel(repository) as T - modelClass.isAssignableFrom(CameraViewModel::class.java) -> return CameraViewModel(repository) as T } throw IllegalArgumentException("Unknown ViewModel : " + modelClass.name) } diff --git a/app/src/main/java/com/example/sabi/ui/camera/CameraActivity.kt b/app/src/main/java/com/example/sabi/ui/camera/CameraActivity.kt index 3107d33..cd8c019 100644 --- a/app/src/main/java/com/example/sabi/ui/camera/CameraActivity.kt +++ b/app/src/main/java/com/example/sabi/ui/camera/CameraActivity.kt @@ -1,8 +1,6 @@ package com.example.sabi.ui.camera import android.Manifest -import android.annotation.SuppressLint -import android.content.AsyncQueryHandler import android.content.Context import android.content.Intent import android.content.pm.PackageManager @@ -13,27 +11,18 @@ import android.hardware.camera2.CameraManager import android.os.Build import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.os.FileUtils import android.os.Handler import android.os.HandlerThread import android.view.Surface import android.view.TextureView -import android.widget.ImageView import android.widget.Toast -import androidx.activity.viewModels import androidx.annotation.RequiresApi import androidx.core.app.ActivityCompat -import androidx.core.content.ContextCompat import com.example.sabi.R import com.example.sabi.databinding.ActivityCameraBinding -import com.example.sabi.databinding.ActivityDictonaryBinding -import com.example.sabi.ml.SsdMobilenetV11Metadata1 import com.example.sabi.ml.Sabimodel - -import com.example.sabi.ui.ViewModelFactory import com.example.sabi.ui.home.HomeActivity import org.tensorflow.lite.DataType -import org.tensorflow.lite.support.common.FileUtil import org.tensorflow.lite.support.image.ImageProcessor import org.tensorflow.lite.support.image.TensorImage import org.tensorflow.lite.support.image.ops.ResizeOp @@ -41,17 +30,11 @@ import org.tensorflow.lite.support.tensorbuffer.TensorBuffer class CameraActivity : AppCompatActivity() { - lateinit var labels:List -// val colors = listOf( -// Color.BLUE, Color.GREEN, Color.RED, Color.CYAN, Color.GRAY, Color.BLACK, -// Color.DKGRAY, Color.MAGENTA, Color.YELLOW, Color.RED -// ) val paint = Paint() lateinit var imageProcessor: ImageProcessor lateinit var model: Sabimodel lateinit var bitmap: Bitmap - lateinit var imageView: ImageView lateinit var handler: Handler lateinit var cameraDevice: CameraDevice @@ -66,9 +49,9 @@ class CameraActivity : AppCompatActivity() { binding = ActivityCameraBinding.inflate(layoutInflater) setContentView(binding.root) - labels = FileUtil.loadLabels(this,"labels.txt") + var labels = application.assets.open("label.txt").bufferedReader().readLines() + imageProcessor = ImageProcessor.Builder().add(ResizeOp(224,224,ResizeOp.ResizeMethod.BILINEAR)).build() -// model = SsdMobilenetV11Metadata1.newInstance(this) model = Sabimodel.newInstance(this) val handlerThread = HandlerThread("videoThread") handlerThread.start() @@ -81,7 +64,6 @@ class CameraActivity : AppCompatActivity() { } } - imageView = findViewById(R.id.iv_response) textureView = findViewById(R.id.textureView) paint.setColor(Color.MAGENTA) @@ -119,23 +101,13 @@ class CameraActivity : AppCompatActivity() { val outputs = model.process(inputFeature0) val outputFeature0 = outputs.outputFeature0AsTensorBuffer.floatArray - var mutable = bitmap.copy(Bitmap.Config.ARGB_8888,true) - var canvas = Canvas(mutable) - var h = bitmap.height - var w = bitmap.width - var x = 0 - - - - while (x <= 26){ - if (outputFeature0.get(x) > 0.45){ - Toast.makeText(getApplicationContext(),"output: "+outputFeature0.toString(),Toast.LENGTH_SHORT).show(); + var maxIdx = 0 + outputFeature0.forEachIndexed{index, fl -> + if(fl> 0.9){ + maxIdx = index } - - x+=3 } - - imageView.setImageBitmap(mutable) + Toast.makeText(getApplicationContext(),"output: "+labels[maxIdx],Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/example/sabi/ui/camera/CameraViewModel.kt b/app/src/main/java/com/example/sabi/ui/camera/CameraViewModel.kt deleted file mode 100644 index 47baedb..0000000 --- a/app/src/main/java/com/example/sabi/ui/camera/CameraViewModel.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.sabi.ui.camera - -import androidx.lifecycle.ViewModel -import com.example.sabi.data.repository.Repository - -class CameraViewModel(private val repository: Repository) : ViewModel() { - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/sabi/ui/dictonary/DictonaryActivity.kt b/app/src/main/java/com/example/sabi/ui/dictonary/DictonaryActivity.kt index ba135bc..3166d2c 100644 --- a/app/src/main/java/com/example/sabi/ui/dictonary/DictonaryActivity.kt +++ b/app/src/main/java/com/example/sabi/ui/dictonary/DictonaryActivity.kt @@ -4,17 +4,12 @@ import android.annotation.SuppressLint import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.util.Log import android.view.KeyEvent import android.view.View import android.widget.Toast import androidx.activity.viewModels import androidx.appcompat.app.AppCompatDelegate -import androidx.core.app.ActivityOptionsCompat -import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager -import com.example.sabi.R import com.example.sabi.ui.ViewModelFactory import com.example.sabi.ui.home.HomeActivity import com.example.sabi.data.repository.Result @@ -36,12 +31,9 @@ class DictonaryActivity : AppCompatActivity() { binding = ActivityDictonaryBinding.inflate(layoutInflater) val layoutManager = GridLayoutManager(this, 3) -// val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false) -// val itemDecoration = DividerItemDecoration(this, layoutManager.orientation) binding.apply { rvDictonary.layoutManager = layoutManager -// rvDictonary.addItemDecoration(itemDecoration) btnBack.setOnClickListener{ val intent = Intent(this@DictonaryActivity, HomeActivity::class.java) startActivity(intent) diff --git a/app/src/main/java/com/example/sabi/ui/home/HomeActivity.kt b/app/src/main/java/com/example/sabi/ui/home/HomeActivity.kt index e01a2c2..c23cc2e 100644 --- a/app/src/main/java/com/example/sabi/ui/home/HomeActivity.kt +++ b/app/src/main/java/com/example/sabi/ui/home/HomeActivity.kt @@ -9,7 +9,6 @@ import androidx.activity.viewModels import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.ContextCompat -import com.example.sabi.R import com.example.sabi.databinding.ActivityHomeBinding import com.example.sabi.ui.ViewModelFactory import com.example.sabi.ui.camera.CameraActivity diff --git a/app/src/main/java/com/example/sabi/ui/main/MainActivity.kt b/app/src/main/java/com/example/sabi/ui/main/MainActivity.kt index 4a6406e..9a01734 100644 --- a/app/src/main/java/com/example/sabi/ui/main/MainActivity.kt +++ b/app/src/main/java/com/example/sabi/ui/main/MainActivity.kt @@ -4,12 +4,9 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log -import androidx.activity.viewModels import androidx.appcompat.app.AppCompatDelegate import com.example.sabi.R -import com.example.sabi.databinding.ActivityHomeBinding import com.example.sabi.databinding.ActivityMainBinding -import com.example.sabi.ui.ViewModelFactory import com.example.sabi.ui.home.HomeActivity import com.example.sabi.ui.onboarding.screen.OnboardingFirstFragment diff --git a/app/src/main/java/com/example/sabi/ui/splash/SplashScreen.kt b/app/src/main/java/com/example/sabi/ui/splash/SplashScreen.kt index e06acba..85a5fae 100644 --- a/app/src/main/java/com/example/sabi/ui/splash/SplashScreen.kt +++ b/app/src/main/java/com/example/sabi/ui/splash/SplashScreen.kt @@ -11,7 +11,6 @@ import com.example.sabi.R import com.example.sabi.databinding.ActivitySplashScreenBinding import com.example.sabi.ui.ViewModelFactory import com.example.sabi.ui.home.HomeActivity -import com.example.sabi.ui.home.HomeViewModel import com.example.sabi.ui.main.MainActivity class SplashScreen : AppCompatActivity() { diff --git a/app/src/main/ml/ssd_mobilenet_v1_1_metadata_1.tflite b/app/src/main/ml/ssd_mobilenet_v1_1_metadata_1.tflite deleted file mode 100644 index 80d1fe5..0000000 Binary files a/app/src/main/ml/ssd_mobilenet_v1_1_metadata_1.tflite and /dev/null differ diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml index 1b7001c..19bed79 100644 --- a/app/src/main/res/layout/activity_camera.xml +++ b/app/src/main/res/layout/activity_camera.xml @@ -54,20 +54,20 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ll_apptitle" /> - + + + + + + + + + + + + + +