From e91caafcf785b540a7dc64fe2f926399de8923ac Mon Sep 17 00:00:00 2001 From: Vysakh R J Date: Thu, 3 Dec 2020 11:44:39 +0530 Subject: [PATCH 01/27] Add files via upload --- android/src/main/res/values/colors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml index ffc7633..ccbdac5 100644 --- a/android/src/main/res/values/colors.xml +++ b/android/src/main/res/values/colors.xml @@ -4,6 +4,6 @@ #303F9F #FF4081 - #0effc2 - #12C4FF + #FF6E40 + #FF6E40 From 272643d82fdf681f7d37e47a325a62bcda77739b Mon Sep 17 00:00:00 2001 From: Vysakh R J Date: Thu, 3 Dec 2020 11:45:53 +0530 Subject: [PATCH 02/27] Update activity_second.xml --- .../src/main/res/layout/activity_second.xml | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/android/src/main/res/layout/activity_second.xml b/android/src/main/res/layout/activity_second.xml index 8451c4e..15a41b1 100644 --- a/android/src/main/res/layout/activity_second.xml +++ b/android/src/main/res/layout/activity_second.xml @@ -23,15 +23,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@mipmap/ic_light" /> - - - + - + - + - - From 64026deb584f037db2001e872bf00be1c4b31185 Mon Sep 17 00:00:00 2001 From: Vysakh R J Date: Thu, 3 Dec 2020 11:47:16 +0530 Subject: [PATCH 03/27] Update SecondActivity.java --- .../com/shinow/qrscan/SecondActivity.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/android/src/main/java/com/shinow/qrscan/SecondActivity.java b/android/src/main/java/com/shinow/qrscan/SecondActivity.java index 01ee997..510a86f 100644 --- a/android/src/main/java/com/shinow/qrscan/SecondActivity.java +++ b/android/src/main/java/com/shinow/qrscan/SecondActivity.java @@ -28,7 +28,7 @@ public class SecondActivity extends AppCompatActivity { private int REQUEST_IMAGE = 101; private LinearLayout lightLayout; private LinearLayout backLayout; - private LinearLayout photoLayout; + // private LinearLayout photoLayout; private SensorManager sensorManager; private Sensor lightSensor; private SensorEventListener sensorEventListener; @@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) { lightLayout = findViewById(R.id.scan_light); backLayout = findViewById(R.id.scan_back); - photoLayout = findViewById(R.id.choose_photo); + // photoLayout = findViewById(R.id.choose_photo); sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT); @@ -88,15 +88,15 @@ public void onClick(View v) { SecondActivity.this.finish(); } }); - photoLayout.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(); - intent.setAction(Intent.ACTION_PICK); - intent.setType("image/*"); - SecondActivity.this.startActivityForResult(intent, REQUEST_IMAGE); - } - }); + // photoLayout.setOnClickListener(new View.OnClickListener() { + // @Override + // public void onClick(View v) { + // Intent intent = new Intent(); + // intent.setAction(Intent.ACTION_PICK); + // intent.setType("image/*"); + // SecondActivity.this.startActivityForResult(intent, REQUEST_IMAGE); + // } + // }); } @Override From f6c28deb9ac1687ae67c97fb7a1f0573c3dd3dcd Mon Sep 17 00:00:00 2001 From: Vysakh R J Date: Thu, 3 Dec 2020 12:06:36 +0530 Subject: [PATCH 04/27] Update my_camera.xml --- android/src/main/res/layout/my_camera.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android/src/main/res/layout/my_camera.xml b/android/src/main/res/layout/my_camera.xml index 5302a83..c4f5919 100644 --- a/android/src/main/res/layout/my_camera.xml +++ b/android/src/main/res/layout/my_camera.xml @@ -20,9 +20,6 @@ app:inner_corner_color="@color/scan_corner_color_blue" app:inner_corner_length="20dp" app:inner_corner_width="4dp" - app:inner_scan_bitmap="@drawable/scan_blue" - app:inner_scan_speed="20" - app:inner_scan_iscircle="true" /> - \ No newline at end of file + From e0f3c976ff6a05575baf9680794002885068cdc0 Mon Sep 17 00:00:00 2001 From: Vysakh R J Date: Thu, 3 Dec 2020 12:14:06 +0530 Subject: [PATCH 05/27] Update activity_second.xml --- android/src/main/res/layout/activity_second.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/android/src/main/res/layout/activity_second.xml b/android/src/main/res/layout/activity_second.xml index 15a41b1..a9c89ab 100644 --- a/android/src/main/res/layout/activity_second.xml +++ b/android/src/main/res/layout/activity_second.xml @@ -31,12 +31,21 @@ android:layout_height="50dp" android:orientation="vertical" android:padding="14dp"> +