Skip to content

A
AloqaIM-Android
Commit b4971649 authored by Divyanshu Bhargava's avatar Divyanshu Bhargava
Browse files
Options

improved draw tools view interactions

parent 2fe89cd9
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @ b4971649
...@@ -679,24 +679,30 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR ...@@ -679,24 +679,30 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
toggleDrawTools(draw_tools,false) toggleDrawTools(draw_tools,false)
} }
image_draw_width.setOnClickListener { image_draw_width.setOnClickListener {
if(seekBar_width.visibility == View.VISIBLE){ if (draw_tools.translationY == (56).toPx){
toggleDrawTools(draw_tools) toggleDrawTools(draw_tools,true)
}else if (draw_tools.translationY == (0).toPx && seekBar_width.isVisible()){
toggleDrawTools(draw_tools,false)
} }
seekBar_width.setVisible(true) seekBar_width.setVisible(true)
seekBar_opacity.setVisible(false) seekBar_opacity.setVisible(false)
draw_color_palette.setVisible(false) draw_color_palette.setVisible(false)
} }
image_draw_opacity.setOnClickListener { image_draw_opacity.setOnClickListener {
if(seekBar_opacity.visibility == View.VISIBLE){ if (draw_tools.translationY == (56).toPx){
toggleDrawTools(draw_tools) toggleDrawTools(draw_tools,true)
}else if (draw_tools.translationY == (0).toPx && seekBar_opacity.isVisible()){
toggleDrawTools(draw_tools,false)
} }
seekBar_width.setVisible(false) seekBar_width.setVisible(false)
seekBar_opacity.setVisible(true) seekBar_opacity.setVisible(true)
draw_color_palette.setVisible(false) draw_color_palette.setVisible(false)
} }
image_draw_color.setOnClickListener { image_draw_color.setOnClickListener {
if(draw_color_palette.visibility == View.VISIBLE){ if (draw_tools.translationY == (56).toPx){
toggleDrawTools(draw_tools) toggleDrawTools(draw_tools,true)
}else if (draw_tools.translationY == (0).toPx && draw_color_palette.isVisible()){
toggleDrawTools(draw_tools,false)
} }
seekBar_width.setVisible(false) seekBar_width.setVisible(false)
seekBar_opacity.setVisible(false) seekBar_opacity.setVisible(false)
...@@ -805,16 +811,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR ...@@ -805,16 +811,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
} }
} }
private fun toggleDrawTools(view: View, toggleView: Boolean = true) { private fun toggleDrawTools(view: View, showView: Boolean = true) {
if (toggleView){ if (showView){
if (view.translationY == (56).toPx){
view.animate().translationY((0).toPx) view.animate().translationY((0).toPx)
}else{ }else{
view.animate().translationY((56).toPx) view.animate().translationY((56).toPx)
} }
}else{
view.animate().translationY((56).toPx)
}
} }
val Int.toPx: Float val Int.toPx: Float
......
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

Technounit-GROUP 2023