* 内置手电筒按钮,当光线太暗时，自动显示手电筒 fix(#58)

* 生成二维码时Logo支持自定义大小 fix(#62)
2019-11-15 17:29:37 +08:00
parent 004bd683a1
commit b830b89b5f
31 changed files with 411 additions and 151 deletions
--- a/app/src/main/res/drawable-xxhdpi/flash_off.png
+++ b/app/src/main/res/drawable-xxhdpi/flash_off.png
--- a/app/src/main/res/drawable-xxhdpi/flash_on.png
+++ b/app/src/main/res/drawable-xxhdpi/flash_on.png
--- a/app/src/main/res/layout/custom_activity.xml
+++ b/app/src/main/res/layout/custom_activity.xml
@@ -31,7 +31,6 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="160dp"
-        style="@style/OnClick"/>
+        android:layout_marginTop="160dp" />
    <include layout="@layout/toolbar_capture"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/custom_capture_activity.xml
+++ b/app/src/main/res/layout/custom_capture_activity.xml
@@ -22,7 +22,7 @@
        app:labelTextLocation="bottom"
        app:laserStyle="grid"/>
    <ImageView
-        android:id="@+id/ivFlash"
+        android:id="@+id/ivTorch"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:src="@drawable/flash_selected_selector"
@@ -30,7 +30,6 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="160dp"
-        style="@style/OnClick"/>
+        android:layout_marginTop="160dp" />
    <include layout="@layout/toolbar_capture"/>
 </androidx.constraintlayout.widget.ConstraintLayout>