Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Room Park Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav Bogdashkin
Room Park Android
Commits
b8965e49
Commit
b8965e49
authored
Jan 14, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finish deal screen xml
parent
70dbb7df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
31 deletions
+85
-31
ScreenController.kt
...ual/roompark/presentation/screen/deal/ScreenController.kt
+1
-1
deal_screen.xml
app/src/main/res/layout/deal_screen.xml
+84
-30
No files found.
app/src/main/java/com/biganto/visual/roompark/presentation/screen/deal/ScreenController.kt
View file @
b8965e49
...
@@ -85,5 +85,5 @@ class DealScreenController :
...
@@ -85,5 +85,5 @@ class DealScreenController :
,
args
.
getInt
(
SELECTED_ESTATE_ID_KEY
))
,
args
.
getInt
(
SELECTED_ESTATE_ID_KEY
))
.
inject
(
this
)
.
inject
(
this
)
override
fun
getLayoutId
():
Int
=
R
.
layout
.
deal_scren
override
fun
getLayoutId
():
Int
=
R
.
layout
.
deal_scre
e
n
}
}
app/src/main/res/layout/deal_screen.xml
View file @
b8965e49
...
@@ -75,11 +75,24 @@
...
@@ -75,11 +75,24 @@
<LinearLayout
<LinearLayout
android:id=
"@+id/statusContainer"
android:id=
"@+id/statusContainer"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"200dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"32dp"
android:background=
"@drawable/gradient_background_accent"
android:background=
"@drawable/gradient_background_accent"
android:backgroundTint=
"#99000000"
android:backgroundTintMode=
"src_over"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:padding=
"16dp"
>
android:padding=
"16dp"
>
<com.google.android.material.textview.MaterialTextView
style=
"@style/Default_TextView.Inverted_Text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginEnd=
"16dp"
android:text=
"СТАТУС СДЕЛКИ"
/>
<LinearLayout
<LinearLayout
android:id=
"@+id/progress_holder"
android:id=
"@+id/progress_holder"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -87,6 +100,16 @@
...
@@ -87,6 +100,16 @@
android:orientation=
"vertical"
></LinearLayout>
android:orientation=
"vertical"
></LinearLayout>
</LinearLayout>
</LinearLayout>
<com.google.android.material.textview.MaterialTextView
style=
"@style/Default_TextView.Header_Text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"32dp"
android:layout_marginEnd=
"16dp"
android:text=
"ФИНАНСЫ"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -94,7 +117,7 @@
...
@@ -94,7 +117,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_sum_header_text_view"
android:id=
"@+id/deal_sum_header_text_view"
style=
"@style/
Accent_Minor_TextView.Inverted
"
style=
"@style/
Common_Text.Notice
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -108,7 +131,7 @@
...
@@ -108,7 +131,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_sum_value_text_view"
android:id=
"@+id/deal_sum_value_text_view"
style=
"@style/
Default_TextView.Header_Text
"
style=
"@style/
Currency_TextView.Currency
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -120,6 +143,12 @@
...
@@ -120,6 +143,12 @@
android:text=
"5 165 301 ₽"
/>
android:text=
"5 165 301 ₽"
/>
</LinearLayout>
</LinearLayout>
<include
layout=
"@layout/horizontal_divider"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"16dp"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -128,7 +157,7 @@
...
@@ -128,7 +157,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_payed_header_text_view"
android:id=
"@+id/deal_payed_header_text_view"
style=
"@style/
Accent_Minor_TextView.Inverted
"
style=
"@style/
Common_Text.Notice
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -142,7 +171,7 @@
...
@@ -142,7 +171,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_payed_value_text_view"
android:id=
"@+id/deal_payed_value_text_view"
style=
"@style/
Default_TextView.Header_Text
"
style=
"@style/
Currency_TextView.Currency
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -155,6 +184,13 @@
...
@@ -155,6 +184,13 @@
</LinearLayout>
</LinearLayout>
<include
layout=
"@layout/horizontal_divider"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"16dp"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -162,7 +198,7 @@
...
@@ -162,7 +198,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_to_pay_header_text_view"
android:id=
"@+id/deal_to_pay_header_text_view"
style=
"@style/
Accent_Minor_TextView.Inverted
"
style=
"@style/
Common_Text.Notice
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -176,7 +212,7 @@
...
@@ -176,7 +212,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/deal_to_pay_value_text_view"
android:id=
"@+id/deal_to_pay_value_text_view"
style=
"@style/
Default_TextView.Accent_Tex
t"
style=
"@style/
Currency_TextView.Currency_Accen
t"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -188,35 +224,48 @@
...
@@ -188,35 +224,48 @@
android:text=
"32 543 ₽"
/>
android:text=
"32 543 ₽"
/>
</LinearLayout>
</LinearLayout>
<include
<include
android:id=
"@+id/start_tour_button"
layout=
"@layout/horizontal_divider"
layout=
"@layout/start_tour_viewholder"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginTop=
"31dp"
/>
<com.google.android.material.textview.MaterialTextView
style=
"@style/Default_TextView.Header_Text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"32dp"
android:layout_marginEnd=
"16dp"
android:includeFontPadding=
"false"
android:text=
"ВИРТУАЛЬНЫЙ ТУР"
/>
<include
android:id=
"@+id/start_tour_card"
layout=
"@layout/start_tour_viewholder_big"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"64dp"
android:layout_height=
"64dp"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginEnd=
"16dp"
/>
android:layout_marginEnd=
"16dp"
/>
<com.google.android.material.card.MaterialCardView
<include
layout=
"@layout/horizontal_divider"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"64dp"
android:layout_height=
"1dp"
android:layout_margin=
"16dp"
android:layout_marginTop=
"24dp"
/>
app:cardElevation=
"4dp"
app:cardMaxElevation=
"8dp"
>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/colorCommonBackground"
android:background=
"@color/colorCommonBackground"
android:weightSum=
"3"
>
android:weightSum=
"3"
android:layout_marginTop=
"24dp"
<ImageView
android:layout_marginBottom=
"16dp"
android:layout_width=
"24dp"
android:layout_marginEnd=
"16dp"
>
android:layout_height=
"24dp"
android:layout_gravity=
"end|center_vertical"
android:layout_weight=
"1"
android:baselineAlignBottom=
"false"
android:src=
"@drawable/ic_flat"
/>
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
style=
"@style/Default_TextView.Header_Text"
style=
"@style/Default_TextView.Header_Text"
...
@@ -224,13 +273,18 @@
...
@@ -224,13 +273,18 @@
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=
"
start
"
android:text=
"
КАРТОЧКА КВАРТИРЫ
"
android:text=
"
Открыть карточку квартиры
"
android:textAlignment=
"gravity"
/>
android:textAlignment=
"gravity"
/>
<ImageView
android:layout_width=
"24dp"
android:layout_height=
"24dp"
android:layout_gravity=
"end|center_vertical"
android:layout_weight=
"1"
android:tint=
"@color/colorAccent"
android:baselineAlignBottom=
"false"
android:src=
"@drawable/ic_flat"
/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment