From 6c859e9892f48db5453565703157078f64d4c51e Mon Sep 17 00:00:00 2001 From: udayraj123 Date: Thu, 20 Jun 2019 16:46:31 +0530 Subject: [PATCH] starting o filtered --- Readme.md | 39 +++++++----------- Rough.md | 2 + .../udayraj/vehicleinfolive/MainActivity.java | 14 ++++--- .../TextRecognitionProcessor.java | 14 +++++-- .../{drawable => drawable-nodpi}/circle.xml | 0 .../{drawable => drawable-nodpi}/drawer.xml | 0 .../{drawable => drawable-nodpi}/easter1.jpg | Bin .../{drawable => drawable-nodpi}/easter2.jpeg | Bin .../{drawable => drawable-nodpi}/easter4.webp | Bin .../{drawable => drawable-nodpi}/easter5.webp | Bin .../{drawable => drawable-nodpi}/easter6.jpeg | Bin .../{drawable => drawable-nodpi}/easter7.jpeg | Bin .../{drawable => drawable-nodpi}/easter8.jpeg | Bin .../flash_off.png | Bin .../{drawable => drawable-nodpi}/flash_on.png | Bin .../{drawable => drawable-nodpi}/github.png | Bin .../ic_content_copy_black_24dp.xml | 0 .../ic_launcher_background.xml | 0 .../res/{drawable => drawable-nodpi}/icon.png | Bin .../loading_captcha.png | Bin .../rounded_edittext.xml | 0 .../search_off.png | Bin .../search_on.png | Bin .../splash_guide.jpg | Bin .../throttler1.png} | Bin .../throttler2.png} | Bin .../throttler3.png} | Bin .../throttler4.png} | Bin .../throttler5.png} | Bin .../throttler6.png} | Bin .../{drawable => drawable-nodpi}/wheel.png | Bin .../wheel_off.png | Bin app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/easter.xml | 24 ++--------- 34 files changed, 40 insertions(+), 55 deletions(-) rename app/src/main/res/{drawable => drawable-nodpi}/circle.xml (100%) rename app/src/main/res/{drawable => drawable-nodpi}/drawer.xml (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter1.jpg (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter2.jpeg (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter4.webp (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter5.webp (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter6.jpeg (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter7.jpeg (100%) rename app/src/main/res/{drawable => drawable-nodpi}/easter8.jpeg (100%) rename app/src/main/res/{drawable => drawable-nodpi}/flash_off.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/flash_on.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/github.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/ic_content_copy_black_24dp.xml (100%) rename app/src/main/res/{drawable => drawable-nodpi}/ic_launcher_background.xml (100%) rename app/src/main/res/{drawable => drawable-nodpi}/icon.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/loading_captcha.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/rounded_edittext.xml (100%) rename app/src/main/res/{drawable => drawable-nodpi}/search_off.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/search_on.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/splash_guide.jpg (100%) rename app/src/main/res/{drawable/dummy1.png => drawable-nodpi/throttler1.png} (100%) rename app/src/main/res/{drawable/dummy2.png => drawable-nodpi/throttler2.png} (100%) rename app/src/main/res/{drawable/wall1.png => drawable-nodpi/throttler3.png} (100%) rename app/src/main/res/{drawable/wall2.png => drawable-nodpi/throttler4.png} (100%) rename app/src/main/res/{drawable/dummy4.png => drawable-nodpi/throttler5.png} (100%) rename app/src/main/res/{drawable/wall3.png => drawable-nodpi/throttler6.png} (100%) rename app/src/main/res/{drawable => drawable-nodpi}/wheel.png (100%) rename app/src/main/res/{drawable => drawable-nodpi}/wheel_off.png (100%) diff --git a/Readme.md b/Readme.md index 8682ef7..48e8a3a 100644 --- a/Readme.md +++ b/Readme.md @@ -3,23 +3,15 @@ Helps you find the details of an Indian vehicle by pointing your camera at its n Details of the vehicle are(obtained from the government's vahan portal): -◈ Registered Date - -◈ Chassis No. - -◈ Engine No. - -◈ Owner Name - -◈ Vehicle Class - -◈ Fuel Type - -◈ Vehicle Maker/Model - -◈ Registration Upto - -◈ Insurance Upto +◈ Registered Date
+◈ Chassis No.
+◈ Engine No.
+◈ Owner Name
+◈ Vehicle Class
+◈ Fuel Type
+◈ Vehicle Maker/Model
+◈ Registration Upto
+◈ Insurance Upto
## App Release Get the latest apk from github releases: https://github.com/Udayraj123/VehicleInfoOCR/releases @@ -44,13 +36,10 @@ Vahan portals: ## Libraries -◉ App workflow inspired from [miniRTO app](https://github.com/chandruscm/miniRTO) - -◉ [Android Web Scraper](https://github.com/daandtu/android-web-scraper) - -◉ [Splashy](https://github.com/rahuldange09/Splashy) - -◉ [EditTextPicker](https://github.com/AliAzaz/Edittext-Library) +◉ App workflow inspired from [miniRTO app](https://github.com/chandruscm/miniRTO)
+◉ [Android Web Scraper](https://github.com/daandtu/android-web-scraper)
+◉ [Splashy](https://github.com/rahuldange09/Splashy)
+◉ [EditTextPicker](https://github.com/AliAzaz/Edittext-Library)
@@ -90,7 +79,9 @@ FirebaseMLKit : 2 MB ## License This software is published under GNU GPLv3 license. Please disclose usage when using this source code in your software. +``` Copyright © 2019 Udayraj Deshmukh Vehicle Info Live : Helps you find the details of an Indian vehicle by pointing your camera at its numberplate. This is free software, and you are welcome to redistribute it under certain conditions; For more details see LICENSE +``` \ No newline at end of file diff --git a/Rough.md b/Rough.md index 3c57d40..d7b3df5 100644 --- a/Rough.md +++ b/Rough.md @@ -143,6 +143,8 @@ Optimizations Later: Run Apk analyzer on OMR apk + Make Starter Android template. + Make minimal size android apk (note size and startup time, compare with studio's hello world size) Firebase usage analytics (Have to see how many ppl opened the app[Privacy Policy?!]) Note numplate pattern: diff --git a/app/src/main/java/com/udayraj/vehicleinfolive/MainActivity.java b/app/src/main/java/com/udayraj/vehicleinfolive/MainActivity.java index 7eea201..cbe03ce 100644 --- a/app/src/main/java/com/udayraj/vehicleinfolive/MainActivity.java +++ b/app/src/main/java/com/udayraj/vehicleinfolive/MainActivity.java @@ -203,7 +203,8 @@ public void onClick(View v) { if(f.getName().contains("easter")){ // easter.add TableRow row = new TableRow(MainActivity.this); -// row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,TableRow.LayoutParams.WRAP_CONTENT)); + row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,TableRow.LayoutParams.WRAP_CONTENT)); + row.setBackgroundResource(f.getInt(drawableResources)); easterTable.addView(row); // ImageView meme = new ImageView(MainActivity.this); @@ -616,12 +617,15 @@ private void setSearchButtonListeners() { public void onClick(View v) { Toast.makeText(MainActivity.this, "Searching...", Toast.LENGTH_SHORT).show(); //todo: make this run on api 16 - if(vehicleNumber.getText()!=null) + if(vehicleNumber.getText()!=null && eltVehicleNumber!=null) eltVehicleNumber.setText(vehicleNumber.getText().toString()); else{ - Log.e(TAG,"UNEXPECTED!! VehicleNumber Text is NULL!"); + logToast("UNEXPECTED!! VehicleNumber Text is NULL!"); } eltVehicleNumber.setAttribute("style","background-color:lightgreen !important"); + if(eltCaptchaInput == null){ + logToast(CRYING_EMOJI + " Unexpected error, please report to my creator Udayraj"); + } eltCaptchaInput.setText(captchaInput.getText().toString()); eltCaptchaInput.setAttribute("style","background-color:lightgreen !important"); if(checkInternetConnection()) { @@ -737,8 +741,8 @@ public void run() { drawerView.setVisibility(INVISIBLE); } } - else { - Crashlytics.getInstance().crash(); + else { + // Crashlytics.getInstance().crash(); findViewById(R.id.easter).setVisibility(INVISIBLE); } } diff --git a/app/src/main/java/com/udayraj/vehicleinfolive/text_detection/TextRecognitionProcessor.java b/app/src/main/java/com/udayraj/vehicleinfolive/text_detection/TextRecognitionProcessor.java index c250f7e..bd1e047 100644 --- a/app/src/main/java/com/udayraj/vehicleinfolive/text_detection/TextRecognitionProcessor.java +++ b/app/src/main/java/com/udayraj/vehicleinfolive/text_detection/TextRecognitionProcessor.java @@ -87,7 +87,12 @@ private Task detectInImage(FirebaseVisionImage image) { return detector.processImage(image); } private String numPlateFilter(String s){ - return s.toUpperCase().replaceAll("[^A-Z0-9]",""); + // starting o jugaad + if(s.length()>0 && s.charAt(0)=='o'){ + s = s.substring(1); + Log.d(TAG,"Removed starting o"); + } + return s.toUpperCase().replaceAll("[^A-Z0-9]",""); } private String convertToStrict(String line){ @@ -149,12 +154,13 @@ private void onSuccess( @NonNull FirebaseVisionText results, @NonNull GraphicOve //VERIFY preference to block than line?! autoUpdateMajorText(addText); - //FIXLATER - IND jugaad for now - if(!addText.toUpperCase().equals("IND")){ + //FIXLATER - IND and 'o' jugaad for now + if(!addText.toUpperCase().equals("IND") && !addText.equals("o")){ builder.append(addText); } else{ - Log.d(TAG,"IND detected, not suffixing"); + // doesn't get here + Log.d(TAG,addText.toUpperCase()+" detected, not suffixing"); } } allText = builder.toString(); diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable-nodpi/circle.xml similarity index 100% rename from app/src/main/res/drawable/circle.xml rename to app/src/main/res/drawable-nodpi/circle.xml diff --git a/app/src/main/res/drawable/drawer.xml b/app/src/main/res/drawable-nodpi/drawer.xml similarity index 100% rename from app/src/main/res/drawable/drawer.xml rename to app/src/main/res/drawable-nodpi/drawer.xml diff --git a/app/src/main/res/drawable/easter1.jpg b/app/src/main/res/drawable-nodpi/easter1.jpg similarity index 100% rename from app/src/main/res/drawable/easter1.jpg rename to app/src/main/res/drawable-nodpi/easter1.jpg diff --git a/app/src/main/res/drawable/easter2.jpeg b/app/src/main/res/drawable-nodpi/easter2.jpeg similarity index 100% rename from app/src/main/res/drawable/easter2.jpeg rename to app/src/main/res/drawable-nodpi/easter2.jpeg diff --git a/app/src/main/res/drawable/easter4.webp b/app/src/main/res/drawable-nodpi/easter4.webp similarity index 100% rename from app/src/main/res/drawable/easter4.webp rename to app/src/main/res/drawable-nodpi/easter4.webp diff --git a/app/src/main/res/drawable/easter5.webp b/app/src/main/res/drawable-nodpi/easter5.webp similarity index 100% rename from app/src/main/res/drawable/easter5.webp rename to app/src/main/res/drawable-nodpi/easter5.webp diff --git a/app/src/main/res/drawable/easter6.jpeg b/app/src/main/res/drawable-nodpi/easter6.jpeg similarity index 100% rename from app/src/main/res/drawable/easter6.jpeg rename to app/src/main/res/drawable-nodpi/easter6.jpeg diff --git a/app/src/main/res/drawable/easter7.jpeg b/app/src/main/res/drawable-nodpi/easter7.jpeg similarity index 100% rename from app/src/main/res/drawable/easter7.jpeg rename to app/src/main/res/drawable-nodpi/easter7.jpeg diff --git a/app/src/main/res/drawable/easter8.jpeg b/app/src/main/res/drawable-nodpi/easter8.jpeg similarity index 100% rename from app/src/main/res/drawable/easter8.jpeg rename to app/src/main/res/drawable-nodpi/easter8.jpeg diff --git a/app/src/main/res/drawable/flash_off.png b/app/src/main/res/drawable-nodpi/flash_off.png similarity index 100% rename from app/src/main/res/drawable/flash_off.png rename to app/src/main/res/drawable-nodpi/flash_off.png diff --git a/app/src/main/res/drawable/flash_on.png b/app/src/main/res/drawable-nodpi/flash_on.png similarity index 100% rename from app/src/main/res/drawable/flash_on.png rename to app/src/main/res/drawable-nodpi/flash_on.png diff --git a/app/src/main/res/drawable/github.png b/app/src/main/res/drawable-nodpi/github.png similarity index 100% rename from app/src/main/res/drawable/github.png rename to app/src/main/res/drawable-nodpi/github.png diff --git a/app/src/main/res/drawable/ic_content_copy_black_24dp.xml b/app/src/main/res/drawable-nodpi/ic_content_copy_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_content_copy_black_24dp.xml rename to app/src/main/res/drawable-nodpi/ic_content_copy_black_24dp.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable-nodpi/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_background.xml rename to app/src/main/res/drawable-nodpi/ic_launcher_background.xml diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable-nodpi/icon.png similarity index 100% rename from app/src/main/res/drawable/icon.png rename to app/src/main/res/drawable-nodpi/icon.png diff --git a/app/src/main/res/drawable/loading_captcha.png b/app/src/main/res/drawable-nodpi/loading_captcha.png similarity index 100% rename from app/src/main/res/drawable/loading_captcha.png rename to app/src/main/res/drawable-nodpi/loading_captcha.png diff --git a/app/src/main/res/drawable/rounded_edittext.xml b/app/src/main/res/drawable-nodpi/rounded_edittext.xml similarity index 100% rename from app/src/main/res/drawable/rounded_edittext.xml rename to app/src/main/res/drawable-nodpi/rounded_edittext.xml diff --git a/app/src/main/res/drawable/search_off.png b/app/src/main/res/drawable-nodpi/search_off.png similarity index 100% rename from app/src/main/res/drawable/search_off.png rename to app/src/main/res/drawable-nodpi/search_off.png diff --git a/app/src/main/res/drawable/search_on.png b/app/src/main/res/drawable-nodpi/search_on.png similarity index 100% rename from app/src/main/res/drawable/search_on.png rename to app/src/main/res/drawable-nodpi/search_on.png diff --git a/app/src/main/res/drawable/splash_guide.jpg b/app/src/main/res/drawable-nodpi/splash_guide.jpg similarity index 100% rename from app/src/main/res/drawable/splash_guide.jpg rename to app/src/main/res/drawable-nodpi/splash_guide.jpg diff --git a/app/src/main/res/drawable/dummy1.png b/app/src/main/res/drawable-nodpi/throttler1.png similarity index 100% rename from app/src/main/res/drawable/dummy1.png rename to app/src/main/res/drawable-nodpi/throttler1.png diff --git a/app/src/main/res/drawable/dummy2.png b/app/src/main/res/drawable-nodpi/throttler2.png similarity index 100% rename from app/src/main/res/drawable/dummy2.png rename to app/src/main/res/drawable-nodpi/throttler2.png diff --git a/app/src/main/res/drawable/wall1.png b/app/src/main/res/drawable-nodpi/throttler3.png similarity index 100% rename from app/src/main/res/drawable/wall1.png rename to app/src/main/res/drawable-nodpi/throttler3.png diff --git a/app/src/main/res/drawable/wall2.png b/app/src/main/res/drawable-nodpi/throttler4.png similarity index 100% rename from app/src/main/res/drawable/wall2.png rename to app/src/main/res/drawable-nodpi/throttler4.png diff --git a/app/src/main/res/drawable/dummy4.png b/app/src/main/res/drawable-nodpi/throttler5.png similarity index 100% rename from app/src/main/res/drawable/dummy4.png rename to app/src/main/res/drawable-nodpi/throttler5.png diff --git a/app/src/main/res/drawable/wall3.png b/app/src/main/res/drawable-nodpi/throttler6.png similarity index 100% rename from app/src/main/res/drawable/wall3.png rename to app/src/main/res/drawable-nodpi/throttler6.png diff --git a/app/src/main/res/drawable/wheel.png b/app/src/main/res/drawable-nodpi/wheel.png similarity index 100% rename from app/src/main/res/drawable/wheel.png rename to app/src/main/res/drawable-nodpi/wheel.png diff --git a/app/src/main/res/drawable/wheel_off.png b/app/src/main/res/drawable-nodpi/wheel_off.png similarity index 100% rename from app/src/main/res/drawable/wheel_off.png rename to app/src/main/res/drawable-nodpi/wheel_off.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 563f87d..b433b98 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -176,7 +176,7 @@ diff --git a/app/src/main/res/layout/easter.xml b/app/src/main/res/layout/easter.xml index 079e19c..c2076f0 100644 --- a/app/src/main/res/layout/easter.xml +++ b/app/src/main/res/layout/easter.xml @@ -56,33 +56,15 @@ android:id="@+id/easter_table" android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - + android:layout_height="450dp" + android:scaleType="fitXY" + android:src="@drawable/splash_guide" />