Skip to content

Room Park Android
Room Park Android
Commit 36489dca authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣
Browse files
Options

Merge branch 'feature/icons' into develop

parents 39fc8480 d0a1228a
Show whitespace changes
Inline Side-by-side
Showing with 462 additions and 185 deletions
app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/ChooseResolutionDialogController.kt
View file @ 36489dca
......@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView
import butterknife.BindView
import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.conductor.dialogs.change_handler.DialogChangeHandler
import com.biganto.visual.roompark.conductor.dialogs.change_handler.PhotoDialogController
import com.biganto.visual.roompark.domain.model.PhotoResolutionModel
import com.biganto.visual.roompark.presentation.screen.settings.util.CommonRecyclerAdapter
import com.biganto.visual.roompark.presentation.screen.settings.util.CommonViewHolder
......@@ -68,7 +67,11 @@ class ChooseResolutionDialogController : Controller {
detachDisposable.add(
(recyclerView.adapter as PhotoSizeAdapter).onItemClicked.subscribe {
Timber.d("gonna shit : $it")
router.replaceTopController(RouterTransaction.with(PhotoDialogController(it.url))
router.replaceTopController(RouterTransaction.with(
PhotoDialogController(
it.url
)
)
.popChangeHandler(DialogChangeHandler())
.pushChangeHandler(DialogChangeHandler())
)
......
app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/change_handler/PhotoDialogController.kt → app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/PhotoDialogController.kt
View file @ 36489dca
package com.biganto.visual.roompark.conductor.dialogs.change_handler
package com.biganto.visual.roompark.conductor.dialogs
import android.content.pm.ActivityInfo
import android.graphics.Bitmap
......@@ -43,6 +43,8 @@ class PhotoDialogController : Controller {
val progress = view.findViewById<ProgressBar>(R.id.photo_load_progress_bar)
progress.visibility = View.VISIBLE
view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
args.getString(PHOTO_URL_KEY)?.let {
......
app/src/main/java/com/biganto/visual/roompark/presentation/screen/article/ScreenController.kt
View file @ 36489dca
......@@ -17,7 +17,6 @@ import com.biganto.visual.roompark.presentation.screen.article.util.HtmlPageAdap
import com.biganto.visual.roompark.presentation.screen.article.util.HtmlTag
import com.biganto.visual.roompark.util.extensions.formatToSimple
import com.bumptech.glide.Glide
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.textview.MaterialTextView
import jp.wasabeef.glide.transformations.BlurTransformation
import timber.log.Timber
......@@ -53,20 +52,14 @@ class ArticleScreenController :
@BindView(R.id.articleHeaderBlock)
lateinit var headerBlock: ViewGroup
@BindView(R.id.articleCloseButton)
lateinit var closeArticle: FloatingActionButton
@BindView(R.id.articleBodyRecyclerView)
lateinit var articleRecyclerView: RecyclerView
val blurPreview:ImageView by lazy {
private val blurPreview:ImageView by lazy {
headerBlock.findViewById<ImageView>(R.id.articlePreviewBlurred)
}
val articlePreview:ImageView by lazy {
private val articlePreview:ImageView by lazy {
headerBlock.findViewById<ImageView>(R.id.articlePreview)
}
......@@ -74,10 +67,6 @@ class ArticleScreenController :
headerBlock.findViewById<MaterialTextView>(R.id.articleDate)
}
val closeButton:FloatingActionButton by lazy {
headerBlock.findViewById<FloatingActionButton>(R.id.articleCloseButton)
}
@OnClick(R.id.articleCloseButton)
fun onCloseArticle(){
handleBack()
......
app/src/main/java/com/biganto/visual/roompark/presentation/screen/photo/ScreenController.kt
View file @ 36489dca
......@@ -62,6 +62,12 @@ class PhotoScreenController :
)
}
@OnClick(R.id.close_current_button)
fun onCloseArticle(){
handleBack()
}
override fun onAttach(view: View) {
// tempSystemUiFlag = activity?.window?.decorView?.systemUiVisibility
super.onAttach(view)
......
app/src/main/java/com/biganto/visual/roompark/presentation/screen/settings/ScreenController.kt
View file @ 36489dca
......@@ -72,7 +72,6 @@ class SettingsScreenController :
@BindView(R.id.signOutButton)
lateinit var signOutButton:MaterialTextView
private fun setToolbar(){
toolBar.appBar.liftOnScrollTargetViewId = R.id.nestedScrollContainer
pushRecycler.isNestedScrollingEnabled = false
......
app/src/main/java/com/biganto/visual/roompark/presentation/screen/web_cam/ScreenController.kt
View file @ 36489dca
......@@ -7,6 +7,7 @@ import android.view.View
import android.view.WindowManager
import androidx.core.os.bundleOf
import butterknife.BindView
import butterknife.OnClick
import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity
......@@ -44,6 +45,11 @@ class WebCamScreenController :
constructor(id: Int) : super(bundleOf(SELECTED_CAM_INDEX_KEY to id))
@OnClick(R.id.close_current_button)
fun onClickExit(){
handleBack()
}
@BindView(R.id.webCamPlayerView)
lateinit var playerView:PlayerView
......
app/src/main/res/drawable/ic_back.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="10dp"
android:height="16dp"
android:viewportWidth="10"
android:viewportHeight="16">
<group>
<clip-path android:pathData="M1.0819,6.8938L8.0999,0.1113C8.2628,-0.0406 8.5308,-0.0363 8.6987,0.1198L9.8548,1.1944C10.0227,1.351 10.0269,1.6002 9.8639,1.7513L3.3468,8.05L9.8796,14.2304C10.0438,14.3835 10.0396,14.6354 9.87,14.7931L8.7023,15.8789C8.5327,16.0367 8.2618,16.0409 8.0976,15.8879L0.1204,8.3413C-0.0438,8.1887 -0.0396,7.9364 0.13,7.7783L1.0819,6.8938Z M 0,0"/>
<group>
<clip-path android:pathData="M-16,248L359,248L359,-27L-16,-27Z M 0,0"/>
<path
android:pathData="M-5,-5L15,-5L15,21L-5,21Z"
android:fillColor="#227f79"/>
</group>
</group>
</vector>
app/src/main/res/drawable/ic_close_circled.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<group>
<clip-path android:pathData="M-335,259L40,259L40,-16L-335,-16Z M 0,0"/>
<group>
<clip-path android:pathData="M0,32L32,32L32,0L0,0Z M 0,0"/>
<group>
<clip-path android:pathData="M16,32C24.8366,32 32,24.8366 32,16C32,7.1634 24.8366,0 16,0C7.1634,0 0,7.1634 0,16C0,24.8366 7.1634,32 16,32Z M 0,0"/>
<group>
<clip-path android:pathData="M0,32L32,32L32,0L0,0Z M 0,0"/>
<path
android:fillColor="#FF000000"
android:pathData="M-5,-5L37,-5L37,37L-5,37Z"
android:strokeAlpha="0.64"
android:fillAlpha="0.64"/>
</group>
</group>
<group>
<clip-path android:pathData="M17.7778,16L24,22.2222L22.2222,24L16,17.7778L9.7778,24L8,22.2222L14.2222,16L8,9.7778L9.7778,8L16,14.2222L22.2222,8L24,9.7778L17.7778,16Z M 0,0"/>
<group>
<clip-path android:pathData="M0,32L32,32L32,0L0,0Z M 0,0"/>
<path
android:pathData="M3,3L29,3L29,29L3,29Z"
android:strokeAlpha="0.64"
android:fillColor="#ffffff"
android:fillAlpha="0.64"/>
</group>
</group>
</group>
</group>
</vector>
app/src/main/res/drawable/ic_close_transparent.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<group>
<clip-path android:pathData="M-308,250L67,250L67,-25L-308,-25Z M 0,0"/>
<group>
<clip-path android:pathData="M0,14L14,14L14,0L0,0Z M 0,0"/>
<group>
<clip-path android:pathData="M8.4815,7L13.6667,12.1852L12.1852,13.6667L7,8.4815L1.8148,13.6667L0.3333,12.1852L5.5185,7L0.3333,1.8148L1.8148,0.3333L7,5.5185L12.1852,0.3333L13.6667,1.8148L8.4815,7Z M 0,0"/>
<group>
<clip-path android:pathData="M0,14L14,14L14,0L0,0Z M 0,0"/>
<path
android:pathData="M-4.6667,-4.6667L18.6667,-4.6667L18.6667,18.6667L-4.6667,18.6667Z"
android:strokeAlpha="0.64"
android:fillColor="#222222"
android:fillAlpha="0.64"/>
</group>
</group>
</group>
</group>
</vector>
app/src/main/res/drawable/ic_download.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="22dp"
android:viewportWidth="24"
android:viewportHeight="22">
<group>
<clip-path android:pathData="M8,13L8,15L5,15C2.2386,15 0,12.7614 0,10C0,7.8733 1.3277,6.0568 3.1995,5.334C3.9469,2.2723 6.7081,0 10,0C12.6381,0 14.9353,1.4593 16.1285,3.6147C16.0756,3.6386 16.0229,3.663 15.9706,3.6882L16.8369,5.4908L18.7903,5.0616C18.7861,5.0427 18.7819,5.0238 18.7776,5.0049C18.8514,5.0016 18.9255,5 19,5C21.7614,5 24,7.2386 24,10C24,12.7614 21.7614,15 19,15L14,15L14,13L19,13C20.6569,13 22,11.6568 22,10C22,8.3432 20.6569,7 19,7C18.5425,7 18.1035,7.1011 17.7032,7.2935L15.4258,8.388L14.8835,5.9201C14.3842,3.6479 12.3592,2 10,2C7.6829,2 5.6839,3.5902 5.1424,5.8083L4.8946,6.8234L3.9199,7.1997C2.7726,7.6428 2,8.749 2,10C2,11.6568 3.3431,13 5,13L8,13Z M 0,0"/>
<group>
<clip-path android:pathData="M-146,252L229,252L229,-23L-146,-23Z M 0,0"/>
<path
android:pathData="M-5,-5L29,-5L29,20L-5,20Z"
android:fillColor="#227f79"/>
</group>
</group>
<group>
<clip-path android:pathData="M11,22L16,18.2294L11.8565,18.2294L11.8565,8L10.1435,8L10.1435,18.2294L6,18.2294L11,22Z M 0,0"/>
<group>
<clip-path android:pathData="M-146,252L229,252L229,-23L-146,-23Z M 0,0"/>
<path
android:pathData="M1,27L21,27L21,3L1,3Z"
android:fillColor="#227f79"/>
</group>
</group>
</vector>
app/src/main/res/drawable/ic_fsoff.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="16dp"
android:viewportWidth="25"
android:viewportHeight="16">
<group>
<clip-path android:pathData="M1.5,0L23.5,0C24.3281,0 25,0.6719 25,1.5L25,14.5C25,15.3281 24.3281,16 23.5,16L1.5,16C0.6719,16 0,15.3281 0,14.5L0,1.5C0,0.6719 0.6719,0 1.5,0ZM1.5,3.5L1.5,12.5L23.5,12.5L23.5,3.5ZM1.5,3.5 M 0,0"/>
<path
android:pathData="M0,0h25v16h-25z"
android:fillColor="#D8D8D8"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</group>
</vector>
app/src/main/res/drawable/ic_fson.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="16dp"
android:viewportWidth="25"
android:viewportHeight="16">
<group>
<clip-path android:pathData="M1.5,1.5L1.5,14.5L23.5,14.5L23.5,1.5ZM1.5,0L23.5,0C24.3281,0 25,0.6719 25,1.5L25,14.5C25,15.3281 24.3281,16 23.5,16L1.5,16C0.6719,16 0,15.3281 0,14.5L0,1.5C0,0.6719 0.6719,0 1.5,0ZM11.75,11.1875L11.75,4.9727L10.7813,5.9414C10.4883,6.2344 10.0117,6.2344 9.7188,5.9414C9.4258,5.6484 9.4258,5.1758 9.7188,4.8828L11.8828,2.7188C12.0391,2.5625 12.25,2.4883 12.457,2.5C12.4688,2.5 12.4844,2.5 12.5,2.5C12.707,2.5 12.8945,2.582 13.0313,2.7188L15.1914,4.8828C15.4844,5.1758 15.4844,5.6484 15.1914,5.9414C14.8984,6.2344 14.4258,6.2344 14.1328,5.9414L13.25,5.0625L13.25,11.1016L14.1328,10.2188C14.4258,9.9258 14.8984,9.9258 15.1914,10.2188C15.4844,10.5117 15.4844,10.9883 15.1914,11.2813L13.0313,13.4414C12.8711,13.6016 12.6641,13.6719 12.457,13.6602C12.25,13.6719 12.0391,13.6016 11.8828,13.4414L9.7188,11.2813C9.4258,10.9883 9.4258,10.5117 9.7188,10.2188C10.0117,9.9258 10.4883,9.9258 10.7813,10.2188ZM11.75,11.1875 M 0,0"/>
<path
android:pathData="M1.5,1.5L1.5,14.5L23.5,14.5L23.5,1.5ZM1.5,0L23.5,0C24.3281,0 25,0.6719 25,1.5L25,14.5C25,15.3281 24.3281,16 23.5,16L1.5,16C0.6719,16 0,15.3281 0,14.5L0,1.5C0,0.6719 0.6719,0 1.5,0ZM11.75,11.1875L11.75,4.9727L10.7813,5.9414C10.4883,6.2344 10.0117,6.2344 9.7188,5.9414C9.4258,5.6484 9.4258,5.1758 9.7188,4.8828L11.8828,2.7188C12.0391,2.5625 12.25,2.4883 12.457,2.5C12.4688,2.5 12.4844,2.5 12.5,2.5C12.707,2.5 12.8945,2.582 13.0313,2.7188L15.1914,4.8828C15.4844,5.1758 15.4844,5.6484 15.1914,5.9414C14.8984,6.2344 14.4258,6.2344 14.1328,5.9414L13.25,5.0625L13.25,11.1016L14.1328,10.2188C14.4258,9.9258 14.8984,9.9258 15.1914,10.2188C15.4844,10.5117 15.4844,10.9883 15.1914,11.2813L13.0313,13.4414C12.8711,13.6016 12.6641,13.6719 12.457,13.6602C12.25,13.6719 12.0391,13.6016 11.8828,13.4414L9.7188,11.2813C9.4258,10.9883 9.4258,10.5117 9.7188,10.2188C10.0117,9.9258 10.4883,9.9258 10.7813,10.2188ZM11.75,11.1875"
android:fillColor="#000000"
android:fillAlpha="1"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</group>
<group>
<clip-path android:pathData="M1.5,1.5L1.5,14.5L23.5,14.5L23.5,1.5ZM1.5,0L23.5,0C24.3281,0 25,0.6719 25,1.5L25,14.5C25,15.3281 24.3281,16 23.5,16L1.5,16C0.6719,16 0,15.3281 0,14.5L0,1.5C0,0.6719 0.6719,0 1.5,0ZM11.75,11.1875L11.75,4.9727L10.7813,5.9414C10.4883,6.2344 10.0117,6.2344 9.7188,5.9414C9.4258,5.6484 9.4258,5.1758 9.7188,4.8828L11.8828,2.7188C12.0391,2.5625 12.25,2.4883 12.457,2.5C12.4688,2.5 12.4844,2.5 12.5,2.5C12.707,2.5 12.8945,2.582 13.0313,2.7188L15.1914,4.8828C15.4844,5.1758 15.4844,5.6484 15.1914,5.9414C14.8984,6.2344 14.4258,6.2344 14.1328,5.9414L13.25,5.0625L13.25,11.1016L14.1328,10.2188C14.4258,9.9258 14.8984,9.9258 15.1914,10.2188C15.4844,10.5117 15.4844,10.9883 15.1914,11.2813L13.0313,13.4414C12.8711,13.6016 12.6641,13.6719 12.457,13.6602C12.25,13.6719 12.0391,13.6016 11.8828,13.4414L9.7188,11.2813C9.4258,10.9883 9.4258,10.5117 9.7188,10.2188C10.0117,9.9258 10.4883,9.9258 10.7813,10.2188ZM11.75,11.1875 M 0,0"/>
<path
android:pathData="M1.5,1.5L1.5,14.5L23.5,14.5L23.5,1.5ZM1.5,0L23.5,0C24.3281,0 25,0.6719 25,1.5L25,14.5C25,15.3281 24.3281,16 23.5,16L1.5,16C0.6719,16 0,15.3281 0,14.5L0,1.5C0,0.6719 0.6719,0 1.5,0ZM11.75,11.1875L11.75,4.9727L10.7813,5.9414C10.4883,6.2344 10.0117,6.2344 9.7188,5.9414C9.4258,5.6484 9.4258,5.1758 9.7188,4.8828L11.8828,2.7188C12.0391,2.5625 12.25,2.4883 12.457,2.5C12.4688,2.5 12.4844,2.5 12.5,2.5C12.707,2.5 12.8945,2.582 13.0313,2.7188L15.1914,4.8828C15.4844,5.1758 15.4844,5.6484 15.1914,5.9414C14.8984,6.2344 14.4258,6.2344 14.1328,5.9414L13.25,5.0625L13.25,11.1016L14.1328,10.2188C14.4258,9.9258 14.8984,9.9258 15.1914,10.2188C15.4844,10.5117 15.4844,10.9883 15.1914,11.2813L13.0313,13.4414C12.8711,13.6016 12.6641,13.6719 12.457,13.6602C12.25,13.6719 12.0391,13.6016 11.8828,13.4414L9.7188,11.2813C9.4258,10.9883 9.4258,10.5117 9.7188,10.2188C10.0117,9.9258 10.4883,9.9258 10.7813,10.2188ZM11.75,11.1875"
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="4"
android:fillColor="#00000000"
android:strokeColor="#D8D8D8"
android:strokeLineCap="butt"/>
</group>
</vector>
app/src/main/res/drawable/ic_plan.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path android:pathData="M9.3333,2.6667L9.3333,9.3333L8,9.3333L8,2.6667L2.6667,2.6667L2.6667,13.3333L8,13.3333L8,12L9.3333,12L9.3333,18.6667L8,18.6667L8,14.6667L2.6667,14.6667L2.6667,21.3333L12,21.3333L12,18.6667L13.3333,18.6667L13.3333,21.3333L21.3333,21.3333L21.3333,18.6667L24,18.6667L24,24L0,24L0,0L24,0L24,16L21.3333,16L21.3333,9.3333L13.3333,9.3333L13.3333,16L12,16L12,8L21.3333,8L21.3333,2.6667L9.3333,2.6667Z M 0,0"/>
<group>
<clip-path android:pathData="M-72,251L303,251L303,-24L-72,-24Z M 0,0"/>
<path
android:pathData="M-5,-5L29,-5L29,29L-5,29Z"
android:fillColor="#227f79"/>
</group>
</group>
</vector>
app/src/main/res/drawable/ic_play.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="18dp"
android:viewportWidth="16"
android:viewportHeight="18">
<group>
<clip-path android:pathData="M0,0L16,9L0,18ZM0,0 M 0,0"/>
<path
android:pathData="M0,0h16v18h-16z"
android:fillColor="#FFFFFF"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</group>
</vector>
app/src/main/res/drawable/ic_ratio.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="20dp"
android:viewportWidth="24"
android:viewportHeight="20">
<group>
<clip-path android:pathData="M0,0L19,0L19,2L0,2ZM17,2L19,2L19,4L17,4ZM0,2L2,2L2,4L0,4ZM14,4L19,4L19,6L14,6ZM20,4L24,4L24,6L20,6ZM0,4L13,4L13,6L0,6ZM11,6L13,6L13,18L11,18ZM17,6L19,6L19,18L17,18ZM22,6L24,6L24,18L22,18ZM0,6L2,6L2,18L0,18ZM0,18L13,18L13,20L0,20ZM14,18L19,18L19,20L14,20ZM20,18L24,18L24,20L20,20ZM20,18 M 0,0"/>
<path
android:pathData="M0,0h24v20h-24z"
android:fillColor="#D8D8D8"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</group>
</vector>
app/src/main/res/drawable/ic_share.xml 0 → 100644
View file @ 36489dca
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="22dp"
android:viewportWidth="16"
android:viewportHeight="22">
<group>
<clip-path android:pathData="M11,7L16,7L16,9L11,9ZM0,7L5,7L5,9L0,9ZM14,9L16,9L16,20L14,20ZM0,9L2,9L2,20L0,20ZM0,20L16,20L16,22L0,22ZM0,20 M 0,0"/>
<path
android:pathData="M-5,2L21,2L21,27L-5,27ZM-5,2"
android:fillColor="#D8D8D8"
android:fillAlpha="1"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</group>
<group>
<clip-path android:pathData="M3,0L13,0L13,14L3,14ZM3,0 M 0,0"/>
<group>
<clip-path android:pathData="M8,0L13,3.7695L8.8555,3.7695L8.8555,14L7.1445,14L7.1445,3.7695L3,3.7695ZM8,0 M 0,0"/>
<path
android:pathData="M-2,-5L18,-5L18,19L-2,19ZM-2,-5"
android:fillColor="#D8D8D8"
android:fillAlpha="1"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</group>
</group>
</vector>
app/src/main/res/layout/activity_main.xml
View file @ 36489dca
......@@ -129,7 +129,7 @@
app:itemBackground="@color/colorCommonBackground"
app:itemHorizontalTranslationEnabled="false"
app:itemIconTint="@drawable/bottom_navigation_icon_selector"
app:labelVisibilityMode="labeled"
app:labelVisibilityMode="unlabeled"
app:menu="@menu/bottom_navigation_menu"
tools:visibility="visible">
......
app/src/main/res/layout/album_header_preview_viewholder.xml
View file @ 36489dca
......@@ -4,9 +4,10 @@
android:layout_width="142dp"
android:layout_height="94dp"
android:layout_margin="16dp"
android:padding="8dp"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
app:cardMaxElevation="6dp"
app:cardForegroundColor="#00000000"
app:cardMaxElevation="8dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="false">
......@@ -17,7 +18,7 @@
android:adjustViewBounds="true"
android:background="@drawable/default_image_placeholder"
android:cropToPadding="true"
android:foreground="@color/colorOpacityBackground"
android:foreground="@color/playTourCardOpacityBackground"
android:scaleType="centerCrop"
app:image_corner_radius="4dp" />
......
app/src/main/res/layout/album_preview_card_viewholder.xml
View file @ 36489dca
......@@ -5,10 +5,11 @@
android:layout_height="94dp"
android:layout_margin="16dp"
app:cardElevation="4dp"
app:cardMaxElevation="6dp"
app:cardForegroundColor="#00000000"
app:cardMaxElevation="6dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="false">
app:cardUseCompatPadding="false"
app:contentPadding="8dp">
<com.biganto.visual.roompark.util.view_utils.image_view.RoundedImageView
android:id="@+id/preview"
......
app/src/main/res/layout/choose_size_viewholder.xml
View file @ 36489dca
......@@ -23,11 +23,14 @@
<ImageView
android:id="@+id/imageView6"
android:layout_width="16dp"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:scaleType="center"
android:scaleX="-1"
android:tint="@color/colorGray"
app:layout_constraintBottom_toBottomOf="@+id/size_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/size_text"
app:srcCompat="@drawable/ic_favorites" />
app:srcCompat="@drawable/ic_chevron_left" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/deal_card_viewholder.xml
View file @ 36489dca
......@@ -217,9 +217,12 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="end|center_vertical"
android:layout_weight="1"
android:layout_marginStart="40dp"
android:layout_weight="0"
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
style="@style/Default_TextView.Header_Text"
......@@ -227,9 +230,9 @@
android:layout_height="match_parent"
android:layout_gravity="center|center_vertical"
android:layout_weight="2"
android:gravity="center"
android:gravity="center|start"
android:text="КАРТОЧКА КВАРТИРЫ"
android:textAlignment="gravity" />
android:textAlignment="center" />
</LinearLayout>
......
app/src/main/res/layout/estate_card_viewholder.xml
View file @ 36489dca
......@@ -4,7 +4,8 @@
android:layout_width="284dp"
android:layout_height="189dp"
android:layout_margin="16dp"
app:cardElevation="2dp"
app:cardElevation="4dp"
app:cardMaxElevation="8dp"
app:cardForegroundColor="#00000000"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="false">
......
app/src/main/res/layout/feed_read_header.xml
View file @ 36489dca
......@@ -43,15 +43,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/articlePreview" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/articleCloseButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:clickable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/presence_offline" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/feed_read_screen.xml
View file @ 36489dca
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/article_container"
android:layout_width="match_parent"
......@@ -35,3 +40,21 @@
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<ImageView
android:id="@+id/articleCloseButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:clickable="true"
android:contentDescription="@string/content_description_close"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_close_circled"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/photo_view_screen.xml
View file @ 36489dca
......@@ -8,8 +8,8 @@
android:background="#000000">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/photoTitle"
style="@style/Common_Text.Inverted"
android:id="@+id/photoTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
......@@ -19,13 +19,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton2"
<ImageView
android:id="@+id/close_current_button"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:clickable="true"
android:contentDescription="@string/content_description_close"
android:focusable="true"
android:scaleType="fitXY"
android:src="@drawable/ic_close_circled"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -69,7 +73,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline2"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/iic_full_view" />
app:srcCompat="@drawable/iic_full_view"/>
<com.biganto.visual.roompark.presentation.screen.photo.util.PhotoPreviewSlider
android:id="@+id/photosPreviewSlider"
......
app/src/main/res/layout/photo_viewer.xml
View file @ 36489dca
......@@ -2,8 +2,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#000000">
<com.github.chrisbanes.photoview.PhotoView
android:id="@+id/photo_frame"
android:layout_width="match_parent"
......@@ -15,7 +17,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true"
android:layout_gravity="center" />
android:layout_gravity="center"
android:indeterminate="true" />
<ImageView
android:id="@+id/close_current_button"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:clickable="true"
android:contentDescription="@string/content_description_close"
android:focusable="true"
android:focusableInTouchMode="true"
android:scaleType="fitXY"
android:src="@drawable/ic_close_circled" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/settings_screen.xml
View file @ 36489dca
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:tools="http://schemas.android.com/tools"
<androidx.core.widget.NestedScrollView 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:id="@+id/nestedScrollContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
android:background="@color/colorPrimary">
<LinearLayout
android:orientation="vertical"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
style="@style/LiteText.Divider"
......@@ -64,12 +66,14 @@
android:layout_height="24dp"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_flat"
android:weightSum="1" />
android:weightSum="1"
app:srcCompat="@drawable/ic_download" />
</LinearLayout>
<include layout="@layout/horizontal_divider"
<include
layout="@layout/horizontal_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
......@@ -96,7 +100,8 @@
android:layout_height="24dp"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_flat"
android:weightSum="1" />
android:weightSum="1"
app:srcCompat="@drawable/ic_download" />
</LinearLayout>
......@@ -121,10 +126,9 @@
<com.google.android.material.textview.MaterialTextView
style="@style/Default_TextView.Cancel_Text"
android:layout_margin="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_margin="32dp" />
<com.google.android.material.textview.MaterialTextView
......@@ -145,5 +149,5 @@
android:layout_height="wrap_content"
android:layout_margin="32dp"
android:text="СМЕНИТЬ АККАУНТ" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/start_tour_viewholder.xml
View file @ 36489dca
......@@ -25,18 +25,17 @@
<ImageView
android:id="@+id/roundedImageView"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:scaleType="fitCenter"
android:tint="@color/colorCommonBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/start_tour_image_view"
app:layout_constraintHorizontal_bias="0.22"
app:layout_constraintStart_toStartOf="@+id/start_tour_image_view"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_feeds" />
app:srcCompat="@drawable/ic_play" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/textView17"
......
app/src/main/res/layout/start_tour_viewholder_big.xml
View file @ 36489dca
<?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_height="wrap_content"
android:orientation="vertical"
......@@ -17,8 +17,7 @@
android:includeFontPadding="false"
android:text="ВИРТУАЛЬНЫЙ ТУР" />
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
......@@ -51,18 +50,17 @@
<ImageView
android:id="@+id/roundedImageView"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_height="0dp"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:scaleType="fitCenter"
android:tint="@color/colorCommonBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/start_tour_image_view"
app:layout_constraintStart_toStartOf="@+id/start_tour_image_view"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_feeds" />
app:srcCompat="@drawable/ic_play" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
......
app/src/main/res/layout/webcam_screen.xml
View file @ 36489dca
<?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"
android:id="@+id/linearLayout9"
android:background="#FF000000"
android:layout_width="match_parent"
......@@ -10,6 +11,26 @@
android:id="@+id/webCamPlayerView"
android:background="#FF000000"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent">
</com.google.android.exoplayer2.ui.PlayerView>
<ImageView
android:id="@+id/close_current_button"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:clickable="true"
android:contentDescription="@string/content_description_close"
android:focusable="true"
android:focusableInTouchMode="true"
android:scaleType="fitXY"
android:src="@drawable/ic_close_circled"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 36489dca
......@@ -90,6 +90,7 @@
<string name="estate_type_store_short">КЛ.%s</string>
<string name="estate_type_other_short">ОБ.%s</string>
<string name="tour_not_allowed">Запуск туров пока недоступен!</string>
<string name="content_description_close">Close</string>
<!--endregion-->
</resources>
app/src/main/res/values/styles.xml
View file @ 36489dca
<resources xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
......
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