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
25709434
Commit
25709434
authored
Jan 24, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start url
parent
52479f5f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
11 deletions
+34
-11
ScreenController.kt
...ual/roompark/presentation/screen/deal/ScreenController.kt
+0
-3
ScreenController.kt
...l/roompark/presentation/screen/estate/ScreenController.kt
+13
-0
ext.kt
...n/java/com/biganto/visual/roompark/util/extensions/ext.kt
+10
-1
feeds_block_view.xml
app/src/main/res/layout/feeds_block_view.xml
+2
-2
feeds_screen.xml
app/src/main/res/layout/feeds_screen.xml
+2
-1
flate_measure_info_viewholder.xml
app/src/main/res/layout/flate_measure_info_viewholder.xml
+7
-4
No files found.
app/src/main/java/com/biganto/visual/roompark/presentation/screen/deal/ScreenController.kt
View file @
25709434
...
...
@@ -121,9 +121,6 @@ class DealScreenController :
}
)
}
private
fun
bindRecycler
()
{
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenController.kt
View file @
25709434
...
...
@@ -23,6 +23,8 @@ import com.biganto.visual.roompark.domain.model.FeatureModel
import
com.biganto.visual.roompark.domain.model.PlanPresetModel
import
com.biganto.visual.roompark.domain.model.typeShortString
import
com.biganto.visual.roompark.presentation.screen.estate.util.FlatInfoAdapter
import
com.biganto.visual.roompark.util.extensions.setGone
import
com.biganto.visual.roompark.util.extensions.startUrl
import
com.google.android.material.switchmaterial.SwitchMaterial
import
com.google.android.material.tabs.TabLayout
import
com.google.android.material.textview.MaterialTextView
...
...
@@ -159,6 +161,9 @@ class EstateScreenController :
@BindView
(
R
.
id
.
explication_tab
)
lateinit
var
explicationTab
:
MaterialTextView
@BindView
(
R
.
id
.
site_link_viewholder
)
lateinit
var
siteLink
:
View
private
fun
setToolbar
(){
toolBar
.
setToolbar
(
null
,
StatusToolbarModel
())
...
...
@@ -243,6 +248,14 @@ class EstateScreenController :
)
flatTitle
.
text
=
resources
?.
getString
(
viewState
.
estate
.
typeShortString
()
,
viewState
.
estate
.
number
)
siteLink
.
setGone
(
viewState
.
estate
.
url
==
null
)
viewState
.
estate
.
url
?.
let
{
url
->
siteLink
.
setOnClickListener
{
activity
?.
startUrl
(
url
)
}
}
}
private
fun
render
(
viewState
:
EstateScreenViewState
.
ShowEstateInfo
)
{
...
...
app/src/main/java/com/biganto/visual/roompark/util/extensions/ext.kt
View file @
25709434
package
com.biganto.visual.roompark.util.extensions
import
android.app.Activity
import
android.content.Intent
import
android.graphics.Bitmap
import
android.graphics.Canvas
import
android.graphics.RectF
import
android.net.Uri
import
android.view.View
import
timber.log.Timber
import
java.io.File
...
...
@@ -104,3 +107,9 @@ val File.folderSize get() =
.
asSequence
()
.
map
{
it
.
length
()}
.
sum
()
fun
Activity
.
startUrl
(
url
:
String
){
val
browserIntent
=
Intent
(
Intent
.
ACTION_VIEW
,
Uri
.
parse
(
url
))
this
.
startActivity
(
browserIntent
)
}
\ No newline at end of file
app/src/main/res/layout/feeds_block_view.xml
View file @
25709434
...
...
@@ -4,7 +4,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/linearLayout2"
android:layout_width=
"match_parent"
android:layout_height=
"
404
dp"
android:layout_height=
"
360
dp"
android:background=
"@drawable/gradient_background_accent"
android:orientation=
"vertical"
android:paddingStart=
"16dp"
>
...
...
@@ -13,7 +13,7 @@
android:id=
"@+id/feedsTabs"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"
32
dp"
android:layout_marginTop=
"
8
dp"
android:background=
"#00000000"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
app/src/main/res/layout/feeds_screen.xml
View file @
25709434
...
...
@@ -14,7 +14,8 @@
<include
android:id=
"@+id/feedsBlock"
layout=
"@layout/feeds_block_view"
android:layout_height=
"426dp"
android:layout_width=
"0dp"
android:layout_height=
"348dp"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
app/src/main/res/layout/flate_measure_info_viewholder.xml
View file @
25709434
...
...
@@ -2,20 +2,22 @@
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/flat_measure_container"
android:layout_width=
"match_parent"
android:layout_height=
"
32dp
"
android:layout_height=
"
wrap_content
"
android:orientation=
"horizontal"
android:paddingStart=
"16dp"
android:paddingEnd=
"16dp"
android:minHeight=
"32dp"
android:weightSum=
"2"
>
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/flat_measure_description"
style=
"@style/Accent_Minor_TextView.Inverted"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"start|center_vertical"
android:layout_weight=
"1"
android:gravity=
"center_vertical"
android:text=
"Стоимость"
/>
android:text=
"Стоимость
сукиблядь ааааа блпядповд
"
/>
<com.google.android.material.textview.MaterialTextView
...
...
@@ -23,8 +25,9 @@
style=
"@style/Accent_Minor_TextView.Default"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_gravity=
"start|center_vertical"
android:layout_marginStart=
"16dp"
android:layout_weight=
"1"
android:gravity=
"center_vertical"
android:text=
"
4 000 000
"
/>
android:text=
"
бля бля ебаны йрот какого хуя \n ебаный рот
"
/>
</LinearLayout>
\ 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