Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
a59917cd
Commit
a59917cd
authored
May 27, 2020
by
mcarare
Committed by
Jeff Boek
May 27, 2020
Browse files
For #9626: Swap margin for padding and remove use of touch delegate.
Also remove text margin to maintain visual appearance.
parent
d706b085
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
View file @
a59917cd
...
...
@@ -40,7 +40,6 @@ import mozilla.components.support.ktx.android.view.showKeyboard
import
org.mozilla.fenix.R
import
org.mozilla.fenix.components.metrics.Event
import
org.mozilla.fenix.ext.components
import
org.mozilla.fenix.ext.increaseTapArea
import
org.mozilla.fenix.ext.toShortUrl
import
org.mozilla.fenix.home.Tab
...
...
@@ -68,10 +67,6 @@ class CollectionCreationView(
transition
.
duration
=
TRANSITION_DURATION
transition
.
excludeTarget
(
back_button
,
true
)
view
.
bottom_bar_icon_button
.
apply
{
increaseTapArea
(
increaseButtonByDps
)
}
view
.
name_collection_edittext
.
filters
+=
InputFilter
.
LengthFilter
(
COLLECTION_NAME_MAX_LENGTH
)
view
.
name_collection_edittext
.
setOnEditorActionListener
{
view
,
actionId
,
_
->
val
text
=
view
.
text
.
toString
()
...
...
@@ -319,7 +314,6 @@ class CollectionCreationView(
companion
object
{
private
const
val
TRANSITION_DURATION
=
200L
private
const
val
increaseButtonByDps
=
16
private
const
val
COLLECTION_NAME_MAX_LENGTH
=
128
}
}
app/src/main/res/layout/component_collection_creation.xml
View file @
a59917cd
...
...
@@ -146,7 +146,7 @@
android:id=
"@+id/bottom_bar_icon_button"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:
layout_marg
in=
"16dp"
android:
padd
in
g
=
"16dp"
android:background=
"?android:attr/selectableItemBackground"
android:contentDescription=
"@string/create_collection_close"
app:srcCompat=
"@drawable/mozac_ic_close"
...
...
@@ -159,8 +159,6 @@
android:id=
"@+id/bottom_bar_text"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:layout_marginStart=
"8dp"
android:layout_marginEnd=
"8dp"
android:gravity=
"center_vertical"
android:text=
"@string/create_collection_save_to_collection_empty"
android:textColor=
"?neutral"
...
...
Write
Preview
Supports
Markdown
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