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
Matthew Finkel
fenix
Commits
b05e9ab1
Commit
b05e9ab1
authored
May 29, 2019
by
Jonathan Almeida
Committed by
Jonathan Almeida
May 29, 2019
Browse files
Closes #2968: Specify the activity name in the share item
parent
70453ef2
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/share/AppShareView.kt
View file @
b05e9ab1
...
@@ -62,7 +62,8 @@ class AppShareAdapter(
...
@@ -62,7 +62,8 @@ class AppShareAdapter(
ShareItem
(
ShareItem
(
resolveInfo
.
loadLabel
(
context
.
packageManager
).
toString
(),
resolveInfo
.
loadLabel
(
context
.
packageManager
).
toString
(),
resolveInfo
.
loadIcon
(
context
.
packageManager
),
resolveInfo
.
loadIcon
(
context
.
packageManager
),
resolveInfo
.
activityInfo
.
packageName
resolveInfo
.
activityInfo
.
packageName
,
resolveInfo
.
activityInfo
.
name
)
)
}
}
...
@@ -110,7 +111,7 @@ class AppShareItemViewHolder(
...
@@ -110,7 +111,7 @@ class AppShareItemViewHolder(
itemView
.
setOnClickListener
{
itemView
.
setOnClickListener
{
Log
.
d
(
"Jonathan"
,
"${shareItem?.name} clicked."
)
Log
.
d
(
"Jonathan"
,
"${shareItem?.name} clicked."
)
shareItem
?.
let
{
shareItem
?.
let
{
actionEmitter
.
onNext
(
ShareAction
.
ShareAppClicked
(
it
.
packageName
))
actionEmitter
.
onNext
(
ShareAction
.
ShareAppClicked
(
it
))
}
}
}
}
}
}
...
@@ -126,4 +127,4 @@ class AppShareItemViewHolder(
...
@@ -126,4 +127,4 @@ class AppShareItemViewHolder(
}
}
}
}
data class
ShareItem
(
val
name
:
String
,
val
icon
:
Drawable
,
val
packageName
:
String
)
data class
ShareItem
(
val
name
:
String
,
val
icon
:
Drawable
,
val
packageName
:
String
,
val
activityName
:
String
)
app/src/main/java/org/mozilla/fenix/share/ShareComponent.kt
View file @
b05e9ab1
...
@@ -25,7 +25,7 @@ sealed class ShareAction : Action {
...
@@ -25,7 +25,7 @@ sealed class ShareAction : Action {
object
AddNewDeviceClicked
:
ShareAction
()
object
AddNewDeviceClicked
:
ShareAction
()
data class
ShareDeviceClicked
(
val
device
:
Device
)
:
ShareAction
()
data class
ShareDeviceClicked
(
val
device
:
Device
)
:
ShareAction
()
data class
SendAllClicked
(
val
devices
:
List
<
Device
>)
:
ShareAction
()
data class
SendAllClicked
(
val
devices
:
List
<
Device
>)
:
ShareAction
()
data class
ShareAppClicked
(
val
packageName
:
String
)
:
ShareAction
()
data class
ShareAppClicked
(
val
item
:
ShareItem
)
:
ShareAction
()
}
}
class
ShareComponent
(
class
ShareComponent
(
...
...
app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt
View file @
b05e9ab1
...
@@ -126,7 +126,7 @@ class ShareFragment : AppCompatDialogFragment(), CoroutineScope {
...
@@ -126,7 +126,7 @@ class ShareFragment : AppCompatDialogFragment(), CoroutineScope {
putExtra
(
EXTRA_TEXT
,
shareText
)
putExtra
(
EXTRA_TEXT
,
shareText
)
type
=
"text/plain"
type
=
"text/plain"
flags
=
FLAG_ACTIVITY_NEW_TASK
flags
=
FLAG_ACTIVITY_NEW_TASK
`package`
=
it
.
package
Name
setClassName
(
it
.
item
.
packageName
,
it
.
item
.
activity
Name
)
}
}
startActivity
(
intent
)
startActivity
(
intent
)
dismiss
()
dismiss
()
...
...
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