TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-28 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadow clipping bug

Browse Source
This commit is contained in:
nielsandriesse 2020-09-10 10:15:29 +10:00
parent 36d69cc380
commit d0e399dbb6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/activity_home.xml
View File

@ -100,8 +100,8 @@
<org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
android:id="@+id/newConversationButtonSet" android:id="@+id/newConversationButtonSet"
android:layout_width="252dp" android:layout_width="276dp"
android:layout_height="212dp" android:layout_height="236dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" /> android:layout_alignParentBottom="true" />

15
src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
View File

@ -29,10 +29,10 @@ class NewConversationButtonSetView : RelativeLayout {
var delegate: NewConversationButtonSetViewDelegate? = null var delegate: NewConversationButtonSetViewDelegate? = null
// region Convenience // region Convenience
private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2, 0.0f) } private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2 - sessionButton.shadowMargin, 0.0f) }
private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize, height.toFloat() - bottomMargin - closedGroupButton.expandedSize) } private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin, height.toFloat() - bottomMargin - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin) }
private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize) } private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize - 2 * openGroupButton.shadowMargin) }
private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2, height.toFloat() - bottomMargin - mainButton.expandedSize) } private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2 - mainButton.shadowMargin, height.toFloat() - bottomMargin - mainButton.expandedSize - 2 * mainButton.shadowMargin) }
// endregion // endregion
// region Settings // region Settings
@ -60,8 +60,9 @@ class NewConversationButtonSetView : RelativeLayout {
val expandedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_expanded_size) } val expandedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_expanded_size) }
val collapsedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_collapsed_size) } val collapsedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_collapsed_size) }
private val expandedImageViewPosition by lazy { PointF(0.0f, 0.0f) } val shadowMargin by lazy { toPx(6, resources).toFloat() }
private val collapsedImageViewPosition by lazy { PointF((expandedSize - collapsedSize) / 2, (expandedSize - collapsedSize) / 2) } private val expandedImageViewPosition by lazy { PointF(shadowMargin, shadowMargin) }
private val collapsedImageViewPosition by lazy { PointF(shadowMargin + (expandedSize - collapsedSize) / 2, shadowMargin + (expandedSize - collapsedSize) / 2) }
private val imageView by lazy { private val imageView by lazy {
val result = NewConversationButtonImageView(context) val result = NewConversationButtonImageView(context)
@ -95,7 +96,7 @@ class NewConversationButtonSetView : RelativeLayout {
this.iconID = iconID this.iconID = iconID
this.isMain = isMain this.isMain = isMain
disableClipping() disableClipping()
val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt() val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt() + 2 * shadowMargin.toInt()
val layoutParams = LayoutParams(size, size) val layoutParams = LayoutParams(size, size)
this.layoutParams = layoutParams this.layoutParams = layoutParams
addView(imageView) addView(imageView)