aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-09-29 02:51:09 -0700
committerGitHub <noreply@github.com>2019-09-29 02:51:09 -0700
commit8932e9f5eb9995729f674ebe02464a6f20f4d1ec (patch)
treeb40f3f7d1b291b0d38b84f7bb36d44863e4cad43 /app/src/main/kotlin
parent980c8ded82e5d8aba4626aed09650dba1992ebf9 (diff)
parent2da6aef03b8a3aba0a76964764f01cd1b26ab401 (diff)
downloadfrost-8932e9f5eb9995729f674ebe02464a6f20f4d1ec.tar.gz
frost-8932e9f5eb9995729f674ebe02464a6f20f4d1ec.tar.bz2
frost-8932e9f5eb9995729f674ebe02464a6f20f4d1ec.zip
Merge pull request #1563 from AllanWang/notification-shortcut
Overlay Context Updates
Diffstat (limited to 'app/src/main/kotlin')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt14
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt3
2 files changed, 6 insertions, 11 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 3a6af146..c3d77dc5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -38,8 +38,8 @@ import ca.allanwang.kau.utils.dpToPx
import ca.allanwang.kau.utils.finishSlideOut
import ca.allanwang.kau.utils.materialDialog
import ca.allanwang.kau.utils.navigationBarColor
-import ca.allanwang.kau.utils.setMenuIcons
import ca.allanwang.kau.utils.shareText
+import ca.allanwang.kau.utils.startLink
import ca.allanwang.kau.utils.statusBarColor
import ca.allanwang.kau.utils.tint
import ca.allanwang.kau.utils.toDrawable
@@ -47,7 +47,6 @@ import ca.allanwang.kau.utils.toast
import ca.allanwang.kau.utils.withAlpha
import ca.allanwang.kau.utils.withMainContext
import com.google.android.material.snackbar.BaseTransientBottomBar
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
import com.pitchedapps.frost.R
import com.pitchedapps.frost.contracts.ActivityContract
@@ -314,18 +313,15 @@ abstract class WebOverlayActivityBase(private val userAgent: String = USER_AGENT
menuInflater.inflate(R.menu.menu_web, menu)
overlayContext?.onMenuCreate(this, menu)
toolbar.tint(Prefs.iconColor)
- setMenuIcons(
- menu, Prefs.iconColor,
- R.id.action_share to CommunityMaterial.Icon2.cmd_share,
- R.id.action_copy_link to GoogleMaterial.Icon.gmd_content_copy
- )
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ val url = web.currentUrl.formattedFbUrl
when (item.itemId) {
- R.id.action_copy_link -> copyToClipboard(web.currentUrl.formattedFbUrl)
- R.id.action_share -> shareText(web.currentUrl.formattedFbUrl)
+ R.id.action_copy_link -> copyToClipboard(url)
+ R.id.action_share -> shareText(url)
+ R.id.action_open_in_browser -> startLink(url)
else -> if (!OverlayContext.onOptionsItemSelected(web, item.itemId))
return super.onOptionsItemSelected(item)
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index e4d0b485..955d6482 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -258,9 +258,8 @@ enum class NotificationType(
* and will only show if we have at least 2 notifications
*/
private fun summaryNotification(context: Context, userId: Long, count: Int): FrostNotification {
- val intent = Intent(context, FrostWebActivity::class.java)
+ val intent = createCommonIntent(context, userId)
intent.data = Uri.parse(fbItem.url)
- intent.putExtra(ARG_USER_ID, userId)
val group = "${groupPrefix}_$userId"
val pendingIntent =
PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)