Merge branch 'master' of https://gitnto.innovationcampus.ru/DisplayNone/DisplayNone-front
This commit is contained in:
commit
03b87095cc
@ -9,9 +9,14 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:contentDescription="@string/close_button"
|
||||
android:src="@drawable/ic_close"
|
||||
app:backgroundTint="@color/primary"
|
||||
app:tint="@android:color/white"
|
||||
app:elevation="0dp"
|
||||
app:cornerRadius="25dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
@ -14,7 +15,8 @@
|
||||
android:letterSpacing="0.05"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:textSize="24sp"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
tools:ignore="MissingConstraints" />
|
||||
|
||||
<androidx.camera.view.PreviewView
|
||||
android:id="@+id/viewFinder"
|
||||
@ -39,9 +41,14 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:contentDescription="@string/close_button"
|
||||
android:src="@drawable/ic_close"
|
||||
app:backgroundTint="@color/primary"
|
||||
app:tint="@android:color/white"
|
||||
app:elevation="0dp"
|
||||
app:cornerRadius="25dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
x
Reference in New Issue
Block a user