diff --git a/app/src/main/java/com/readrops/app/activities/ItemActivity.java b/app/src/main/java/com/readrops/app/activities/ItemActivity.java
index e92058bd..956191d6 100644
--- a/app/src/main/java/com/readrops/app/activities/ItemActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/ItemActivity.java
@@ -242,6 +242,6 @@ public class ItemActivity extends AppCompatActivity {
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_TEXT, itemWithFeed.getItem().getTitle() + " - " + itemWithFeed.getItem().getLink());
- startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
+ startActivity(Intent.createChooser(shareIntent, getString(R.string.share_article)));
}
}
diff --git a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt b/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt
index 28dc1acd..62e2d43c 100644
--- a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt
+++ b/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt
@@ -1,9 +1,11 @@
package com.readrops.app.activities
import android.annotation.SuppressLint
+import android.content.Intent
import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.os.Bundle
+import android.view.Menu
import android.view.MenuItem
import android.webkit.WebResourceRequest
import android.webkit.WebSettings
@@ -30,6 +32,8 @@ class WebViewActivity : AppCompatActivity() {
supportActionBar?.setBackgroundDrawable(ColorDrawable(actionBarColor))
setWebViewSettings()
+ binding.activityWebViewSwipe.setOnRefreshListener { binding.webView.reload() }
+
val url: String = intent.getStringExtra(WEB_URL)
binding.webView.loadUrl(url)
}
@@ -51,8 +55,10 @@ class WebViewActivity : AppCompatActivity() {
title = view?.title
supportActionBar?.subtitle = Uri.parse(view?.url).host
+ binding.activityWebViewSwipe.isRefreshing = false
super.onPageFinished(view, url)
}
+
}
}
@@ -72,11 +78,29 @@ class WebViewActivity : AppCompatActivity() {
finish()
return true
}
+ R.id.web_view_refresh -> {
+ binding.webView.reload()
+ }
+ R.id.web_view_share -> {
+ shareLink()
+ }
}
return super.onOptionsItemSelected(item)
}
+ private fun shareLink() {
+ val intent = Intent(Intent.ACTION_SEND)
+ intent.type = "text/plain"
+ intent.putExtra(Intent.EXTRA_TEXT, binding.webView.url.toString())
+ startActivity(Intent.createChooser(intent, getString(R.string.share_url)))
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+ menuInflater.inflate(R.menu.webview_menu, menu)
+ return true
+ }
+
companion object {
const val WEB_URL = "webUrl"
const val ACTION_BAR_COLOR = "actionBarColor"
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 00000000..cc2d1e04
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,5 @@
+