Commit d32c134f authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣

needed to finish icons replacement

parent aa089cfd
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
android:layout_width="142dp" android:layout_width="142dp"
android:layout_height="94dp" android:layout_height="94dp"
android:layout_margin="16dp" android:layout_margin="16dp"
android:padding="2dp" android:padding="8dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:cardElevation="8dp" app:cardElevation="4dp"
app:cardMaxElevation="12dp" app:cardMaxElevation="8dp"
app:cardPreventCornerOverlap="false" app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="false"> app:cardUseCompatPadding="false">
......
...@@ -217,9 +217,12 @@ ...@@ -217,9 +217,12 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:layout_weight="1" android:layout_marginStart="40dp"
android:layout_weight="0"
android:baselineAlignBottom="false" android:baselineAlignBottom="false"
android:src="@drawable/ic_flat" /> android:src="@drawable/ic_flat"
android:tint="@android:color/black"
app:srcCompat="@drawable/ic_plan" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
style="@style/Default_TextView.Header_Text" style="@style/Default_TextView.Header_Text"
...@@ -227,9 +230,9 @@ ...@@ -227,9 +230,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center|center_vertical" android:layout_gravity="center|center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:gravity="center" android:gravity="center|start"
android:text="КАРТОЧКА КВАРТИРЫ" android:text="КАРТОЧКА КВАРТИРЫ"
android:textAlignment="gravity" /> android:textAlignment="center" />
</LinearLayout> </LinearLayout>
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
android:layout_width="284dp" android:layout_width="284dp"
android:layout_height="189dp" android:layout_height="189dp"
android:layout_margin="16dp" android:layout_margin="16dp"
app:cardElevation="2dp" app:cardElevation="4dp"
app:cardMaxElevation="8dp"
app:cardForegroundColor="#00000000" app:cardForegroundColor="#00000000"
app:cardPreventCornerOverlap="false" app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="false"> app:cardUseCompatPadding="false">
......
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton2" android:id="@+id/floatingActionButton2"
android:layout_width="32dp" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:clickable="true" android:clickable="true"
android:src="@drawable/ic_close_circled"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="ВИРТУАЛЬНЫЙ ТУР" /> android:text="ВИРТУАЛЬНЫЙ ТУР" />
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
...@@ -51,18 +50,17 @@ ...@@ -51,18 +50,17 @@
<ImageView <ImageView
android:id="@+id/roundedImageView" android:id="@+id/roundedImageView"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="0dp"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:scaleType="fitCenter"
android:tint="@color/colorCommonBackground" android:tint="@color/colorCommonBackground"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/start_tour_image_view" app:layout_constraintEnd_toEndOf="@+id/start_tour_image_view"
app:layout_constraintStart_toStartOf="@+id/start_tour_image_view" app:layout_constraintStart_toStartOf="@+id/start_tour_image_view"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_feeds" /> app:srcCompat="@drawable/ic_play" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/linearLayout9" android:id="@+id/linearLayout9"
android:background="#FF000000" android:background="#FF000000"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -10,6 +11,16 @@ ...@@ -10,6 +11,16 @@
android:id="@+id/webCamPlayerView" android:id="@+id/webCamPlayerView"
android:background="#FF000000" android:background="#FF000000"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_margin="16dp"
android:clickable="true"
app:srcCompat="@drawable/ic_close_circled" />
</com.google.android.exoplayer2.ui.PlayerView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment