Theme qr bottom sheet according to our palette (6eeda102) · Commits · e / os / Camera

app/src/main/java/net/sourceforge/opencamera/qr/QrImageAnalyzer.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -153,8 +153,8 @@ class QrImageAnalyzer(private val activity: Activity, private val scope: Corouti
		)?.let {
		DrawableCompat.wrap(it.mutate()).apply {
		DrawableCompat.setTint(
		this, activity.getThemeColor(
		com.google.android.material.R.attr.colorOnBackground
		this, activity.getColor(
		R.color.e_icon_color
		)
		)
		}

app/src/main/res/layout/qr_bottom_sheet_dialog.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:tint="@color/qrcodeColorOnSurface"
		app:tint="@color/e_icon_color"
		tools:ignore="ContentDescription" />

		<androidx.cardview.widget.CardView
		@@ -30,7 +30,7 @@
		android:layout_height="88dp"
		android:layout_marginTop="12dp"
		android:clickable="true"
		app:cardBackgroundColor="@color/qrcodeColorOnSurface"
		app:cardBackgroundColor="@color/e_floating_background"
		app:cardCornerRadius="12dp"
		app:cardElevation="0dp"
		app:layout_constraintEnd_toEndOf="parent"
		@@ -71,7 +71,7 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textColor="@color/qrcodeColorOnSurfaceVariant"
		android:textColor="@color/e_primary_text_color"
		android:textStyle="bold"
		android:typeface="normal"
		app:layout_constraintBottom_toTopOf="@+id/data"
		@@ -87,7 +87,7 @@
		android:layout_height="wrap_content"
		android:maxLines="2"
		android:ellipsize="end"
		android:textColor="@color/qrcodeColorOnSurfaceVariant"
		android:textColor="@color/e_secondary_text_color"
		android:textStyle="normal"
		android:typeface="normal"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -106,14 +106,14 @@
		android:layout_marginTop="16dp"
		android:layout_marginEnd="16dp"
		android:layout_marginBottom="16dp"
		android:background="@color/qrcodeSelectableItemBackgroundBorderless"
		android:background="@null"
		android:contentDescription="@string/qr_share_description"
		android:padding="5dp"
		android:src="@drawable/ic_share"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@+id/copy"
		app:layout_constraintTop_toTopOf="parent"
		app:tint="@color/qrcodeColorOnSurface" />
		app:tint="@color/e_icon_color" />

		<ImageButton
		android:id="@+id/copy"
		@@ -122,14 +122,14 @@
		android:layout_marginTop="16dp"
		android:layout_marginEnd="16dp"
		android:layout_marginBottom="16dp"
		android:background="@color/qrcodeSelectableItemBackgroundBorderless"
		android:background="@null"
		android:contentDescription="@string/qr_copy_description"
		android:padding="5dp"
		android:src="@drawable/ic_content_copy"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent"
		app:tint="@color/qrcodeColorOnSurface" />
		app:tint="@color/e_icon_color" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		</androidx.cardview.widget.CardView>

app/src/main/res/values-v21/styles.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		<item name="android:colorControlNormal">@color/color_default_icon</item>
		<item name="android:alertDialogTheme">@style/customAlertDialog</item>
		<item name="android:windowBackground">@color/color_default_background</item>
		<item name="bottomSheetDialogTheme">@style/BottomSheetTheme</item>
		</style>

		<style name="image_button" parent="@android:style/Widget.Material.ImageButton">
		@@ -28,4 +29,11 @@
		<item name="android:windowBackground">@color/color_default_foreground</item>
		<item name="android:textColorPrimaryInverse">@android:color/black</item>
		</style>
		<style name="BottomSheetTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
		<item name="bottomSheetStyle">@style/BottomSheetStyle</item>
		</style>
		<style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
		<item name="backgroundTint">@color/e_floating_background</item>
		</style>

		</resources>