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
b80e5724
Commit
b80e5724
authored
Mar 11, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dialogchangeHandler usage
parent
a70ac3cc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
66 additions
and
18 deletions
+66
-18
ChooseResolutionDialogController.kt
...ark/conductor/dialogs/ChooseResolutionDialogController.kt
+30
-6
ScreenController.kt
...l/roompark/presentation/screen/albums/ScreenController.kt
+3
-4
ScreenController.kt
...al/roompark/presentation/screen/photo/ScreenController.kt
+20
-1
PhotoViewAdapter.kt
...ompark/presentation/screen/photo/util/PhotoViewAdapter.kt
+2
-1
choose_size_modal_screen.xml
app/src/main/res/layout/choose_size_modal_screen.xml
+9
-4
photo_view_screen.xml
app/src/main/res/layout/photo_view_screen.xml
+2
-2
No files found.
app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/ChooseResolutionDialogController.kt
View file @
b80e5724
...
...
@@ -5,6 +5,8 @@ import android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
androidx.annotation.LayoutRes
import
androidx.recyclerview.widget.DividerItemDecoration
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
butterknife.BindView
import
com.biganto.visual.roompark.R
...
...
@@ -13,6 +15,7 @@ import com.biganto.visual.roompark.presentation.screen.settings.util.CommonRecyc
import
com.biganto.visual.roompark.presentation.screen.settings.util.CommonViewHolder
import
com.bluelinelabs.conductor.Controller
import
com.google.android.material.textview.MaterialTextView
import
timber.log.Timber
/**
...
...
@@ -35,13 +38,35 @@ class ChooseResolutionDialogController : Controller {
lateinit
var
recyclerView
:
RecyclerView
// override fun onAttach(view: View) {
// tempSystemUiFlag = activity?.window?.decorView?.systemUiVisibility
// activity?.window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
// super.onAttach(view)
// }
//
// private var tempSystemUiFlag : Int? = null
// override fun onDetach(view: View) {
// activity?.window?.decorView?.systemUiVisibility = tempSystemUiFlag?:View.SYSTEM_UI_FLAG_LAYOUT_STABLE
// super.onDetach(view)
// }
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
):
View
{
val
view
=
inflater
.
inflate
(
getLayoutId
(),
container
,
false
)
recyclerView
=
view
.
findViewById
(
R
.
id
.
photoSizesRecyclerView
)
recyclerView
.
layoutManager
=
LinearLayoutManager
(
activity
,
RecyclerView
.
VERTICAL
,
false
)
recyclerView
.
adapter
=
PhotoSizeAdapter
()
recyclerView
.
itemAnimator
=
null
recyclerView
.
addItemDecoration
(
DividerItemDecoration
(
activity
,
DividerItemDecoration
.
VERTICAL
)
)
args
.
getParcelableArrayList
<
PhotoResolutionModel
>(
PHOTOS_KEY
)
?.
let
{
Timber
.
d
(
"items; $it"
)
Timber
.
d
(
"recyclerView; $recyclerView"
)
(
recyclerView
.
adapter
as
PhotoSizeAdapter
).
setItems
(
it
)
(
recyclerView
.
adapter
as
PhotoSizeAdapter
).
notifyDataSetChanged
()
}
return
view
...
...
@@ -60,19 +85,18 @@ class ChooseResolutionDialogController : Controller {
}
private
class
PhotoSizeAdapter
:
CommonRecyclerAdapter
<
PhotoSizeViewHolder
,
PhotoResolutionModel
>(){
internal
class
PhotoSizeAdapter
:
CommonRecyclerAdapter
<
PhotoSizeViewHolder
,
PhotoResolutionModel
>(){
override
val
vhKlazz
=
PhotoSizeViewHolder
::
class
override
fun
getVhLayout
():
Int
=
R
.
layout
.
choose_size_viewholder
}
private
class
PhotoSizeViewHolder
(
itemView
:
View
)
:
CommonViewHolder
<
PhotoResolutionModel
>(
itemView
){
internal
class
PhotoSizeViewHolder
(
itemView
:
View
)
:
CommonViewHolder
<
PhotoResolutionModel
>(
itemView
){
@BindView
(
R
.
id
.
size_text
)
lateinit
var
textView
:
MaterialTextView
override
fun
onViewBound
(
model
:
PhotoResolutionModel
)
{
textView
.
text
=
model
.
resName
Timber
.
d
(
"resname: ${model.resName}"
)
textView
.
text
=
"${model.resWidth}x${model.resHeight}"
}
}
\ No newline at end of file
}
app/src/main/java/com/biganto/visual/roompark/presentation/screen/albums/ScreenController.kt
View file @
b80e5724
...
...
@@ -13,6 +13,7 @@ import com.biganto.visual.roompark.R
import
com.biganto.visual.roompark.base.RoomParkApplication
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.conductor.BigantoBaseController
import
com.biganto.visual.roompark.conductor.dialogs.change_handler.DialogChangeHandler
import
com.biganto.visual.roompark.domain.model.AlbumPreviewModel
import
com.biganto.visual.roompark.domain.model.PhotoModel
import
com.biganto.visual.roompark.presentation.screen.albums.util.AlbumListAdapter
...
...
@@ -20,8 +21,6 @@ import com.biganto.visual.roompark.presentation.screen.albums.util.AlbumsHeaderA
import
com.biganto.visual.roompark.presentation.screen.photo.PhotoScreenController
import
com.biganto.visual.roompark.util.view_utils.grid.CeilsDecoration
import
com.bluelinelabs.conductor.RouterTransaction
import
com.bluelinelabs.conductor.changehandler.FadeChangeHandler
import
com.bluelinelabs.conductor.changehandler.VerticalChangeHandler
import
com.bumptech.glide.Glide
import
com.bumptech.glide.request.target.SimpleTarget
import
com.bumptech.glide.request.target.Target
...
...
@@ -151,8 +150,8 @@ class AlbumsScreenController :
private
fun
render
(
viewState
:
AlbumsScreenViewState
.
PhotoSelected
){
router
.
pushController
(
RouterTransaction
.
with
(
PhotoScreenController
(
viewState
.
photoId
))
.
pushChangeHandler
(
Vertical
ChangeHandler
())
.
popChangeHandler
(
FadeChangeHandler
(
false
))
.
pushChangeHandler
(
Dialog
ChangeHandler
())
.
popChangeHandler
(
DialogChangeHandler
(
))
)
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/photo/ScreenController.kt
View file @
b80e5724
...
...
@@ -2,15 +2,20 @@ package com.biganto.visual.roompark.presentation.screen.photo
import
android.os.Bundle
import
android.view.View
import
android.widget.ImageView
import
androidx.core.os.bundleOf
import
androidx.viewpager2.widget.ViewPager2
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
import
com.biganto.visual.roompark.conductor.BigantoBaseController
import
com.biganto.visual.roompark.conductor.dialogs.ChooseResolutionDialogController
import
com.biganto.visual.roompark.conductor.dialogs.change_handler.DialogChangeHandler
import
com.biganto.visual.roompark.presentation.screen.photo.util.PhotoPreviewSlider
import
com.biganto.visual.roompark.presentation.screen.photo.util.PhotosAdapter
import
com.bluelinelabs.conductor.RouterTransaction
import
com.google.android.material.textview.MaterialTextView
import
timber.log.Timber
import
javax.inject.Inject
...
...
@@ -42,6 +47,20 @@ class PhotoScreenController :
@BindView
(
R
.
id
.
photosPreviewSlider
)
lateinit
var
slider
:
PhotoPreviewSlider
@BindView
(
R
.
id
.
choose_size_button
)
lateinit
var
chooseSizeButton
:
ImageView
@OnClick
(
R
.
id
.
choose_size_button
)
fun
onSwitchSize
(){
router
.
pushController
(
RouterTransaction
.
with
(
ChooseResolutionDialogController
(
ArrayList
(
(
photoViewPager
.
adapter
as
PhotosAdapter
)
.
getItem
(
photoViewPager
.
currentItem
).
resolutionList
)
)).
pushChangeHandler
(
DialogChangeHandler
())
.
popChangeHandler
(
DialogChangeHandler
())
)
}
override
fun
onAttach
(
view
:
View
)
{
tempSystemUiFlag
=
activity
?.
window
?.
decorView
?.
systemUiVisibility
activity
?.
window
?.
decorView
?.
systemUiVisibility
=
View
.
SYSTEM_UI_FLAG_FULLSCREEN
...
...
@@ -50,7 +69,7 @@ class PhotoScreenController :
private
var
tempSystemUiFlag
:
Int
?
=
null
override
fun
onDetach
(
view
:
View
)
{
activity
?.
window
?.
decorView
?.
systemUiVisibility
=
tempSystemUiFlag
?:
View
.
SYSTEM_UI_FLAG_LAYOUT_STABLE
//
activity?.window?.decorView?.systemUiVisibility = tempSystemUiFlag?:View.SYSTEM_UI_FLAG_LAYOUT_STABLE
super
.
onDetach
(
view
)
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/photo/util/PhotoViewAdapter.kt
View file @
b80e5724
...
...
@@ -28,9 +28,10 @@ class PhotosAdapter : CommonRecyclerAdapter<PhotosViewHolder, PhotoModel>() {
val
ret
=
list
.
map
{
it
.
resolutionList
.
lowelest
()
?.
url
?:
error
(
"No res urls!"
)}.
toList
()
Timber
.
d
(
"$ret"
)
return
ret
}
fun
getItem
(
index
:
Int
)
=
list
[
index
]
fun
indexById
(
id
:
Int
):
Int
=
list
.
indexOfFirst
{
it
.
photoId
==
id
}
...
...
app/src/main/res/layout/choose_size_modal_screen.xml
View file @
b80e5724
...
...
@@ -4,7 +4,8 @@
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/linearLayout7"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:background=
"@color/colorPrimary"
>
<FrameLayout
android:id=
"@+id/frameLayout2"
...
...
@@ -25,8 +26,9 @@
style=
"@style/Header_TextView.Main_Header"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:text=
"ОТКРЫТЬ\nВ ДРУГОМ РАЗМЕРЕ"
android:textAlignment=
"
center
"
android:textAlignment=
"
viewStart
"
app:layout_constraintBottom_toTopOf=
"@+id/include4"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
...
...
@@ -36,6 +38,7 @@
layout=
"@layout/horizontal_divider"
android:layout_width=
"0dp"
android:layout_height=
"1dp"
android:layout_marginStart=
"16dp"
app:layout_constraintBottom_toTopOf=
"@+id/photoSizesRecyclerView"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
...
...
@@ -44,6 +47,7 @@
android:id=
"@+id/photoSizesRecyclerView"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
app:layout_constraintBottom_toTopOf=
"@+id/materialTextView"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
...
...
@@ -52,9 +56,10 @@
android:id=
"@+id/materialTextView"
style=
"@style/Default_TextView.Cancel_Text"
android:layout_width=
"0dp"
android:layout_height=
"
144dp
"
android:layout_height=
"
wrap_content
"
android:gravity=
"center"
android:paddingBottom=
"44dp"
android:paddingTop=
"32dp"
android:paddingBottom=
"64dp"
android:text=
"ОТМЕНА"
android:textAlignment=
"gravity"
app:layout_constraintBottom_toBottomOf=
"parent"
...
...
app/src/main/res/layout/photo_view_screen.xml
View file @
b80e5724
...
...
@@ -60,7 +60,7 @@
app:srcCompat=
"@drawable/iic_full_view"
/>
<ImageView
android:id=
"@+id/ch
ang
e_size_button"
android:id=
"@+id/ch
oos
e_size_button"
android:layout_width=
"24dp"
android:layout_height=
"24dp"
android:layout_marginTop=
"16dp"
...
...
@@ -82,7 +82,7 @@
android:orientation=
"horizontal"
android:visibility=
"invisible"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/ch
ang
e_size_button"
app:layout_constraintEnd_toStartOf=
"@+id/ch
oos
e_size_button"
app:layout_constraintStart_toEndOf=
"@+id/show_full_button"
app:layout_constraintTop_toTopOf=
"@+id/guideline2"
app:layout_constraintVertical_bias=
"0.0"
/>
...
...
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