diff --git a/app/build.gradle b/app/build.gradle
index 6ca8ff0..1edfc02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,7 +143,6 @@ dependencies {
// Material-ish things
compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
- compile 'com.melnykov:floatingactionbutton:1.3.0'
compile 'com.github.jd-alexander:LikeButton:0.2.1'
compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
compile 'org.sufficientlysecure:html-textview:3.5'
@@ -167,6 +166,8 @@ dependencies {
// Github issues reporter
compile 'com.heinrichreimersoftware:android-issue-reporter:1.3.1'
+
+ compile 'com.github.rubensousa:floatingtoolbar:1.5.1'
}
apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a501c0b..051fa71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,8 +65,7 @@
+ android:name=".ReaderActivity">
getContentFromMercury(customTabsIntent)
+ R.id.share_action -> this@ReaderActivity.shareLink(url)
+ R.id.open_action -> this@ReaderActivity.openItemUrl(
+ url,
+ contentText,
+ contentImage,
+ contentTitle,
+ contentSource,
+ customTabsIntent,
+ false,
+ false,
+ this@ReaderActivity)
+ else -> Unit
+ }
+ }
+
+ override fun onItemLongClick(item: MenuItem?) {
+ }
+ })
+
+
if (contentText.isEmptyOrNullOrNullString()) {
getContentFromMercury(customTabsIntent)
} else {
@@ -91,27 +121,7 @@ class ReaderActivity : DragDismissActivity() {
.load(contentImage)
.apply(RequestOptions.fitCenterTransform())
.into(image)
-
- shareBtn.setOnClickListener {
- this@ReaderActivity.shareLink(url)
- }
-
- browserBtn.setOnClickListener {
- this@ReaderActivity.openItemUrl(
- url,
- contentText,
- contentImage,
- contentTitle,
- contentSource,
- customTabsIntent,
- false,
- false,
- this@ReaderActivity)
- }
-
- hideProgressBar()
}
- return v
}
private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
@@ -124,6 +134,7 @@ class ReaderActivity : DragDismissActivity() {
if (response.body() != null && response.body()!!.content != null && response.body()!!.content.isNotEmpty()) {
source.text = response.body()!!.domain
title.text = response.body()!!.title
+ this@ReaderActivity.url = response.body()!!.url
if (response.body()!!.content != null && !response.body()!!.content.isEmpty()) {
try {
content.text = Html.fromHtml(response.body()!!.content, HtmlHttpImageGetter(content, null, true), null)
@@ -141,24 +152,6 @@ class ReaderActivity : DragDismissActivity() {
.apply(RequestOptions.fitCenterTransform())
.into(image)
- shareBtn.setOnClickListener {
- this@ReaderActivity.shareLink(response.body()!!.url)
- }
-
- browserBtn.setOnClickListener {
- this@ReaderActivity.openItemUrl(
- response.body()!!.url,
- contentText,
- contentImage,
- contentTitle,
- contentSource,
- customTabsIntent,
- false,
- false,
- this@ReaderActivity)
- }
-
- hideProgressBar()
} else openInBrowserAfterFailing()
}
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
index f265cf9..277b707 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss
import android.content.Intent
import android.os.Bundle
import android.preference.PreferenceManager
+import android.support.design.widget.FloatingActionButton
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
@@ -12,7 +13,6 @@ import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
import apps.amine.bou.readerforselfoss.api.selfoss.Sources
import com.ftinc.scoop.Scoop
-import com.melnykov.fab.FloatingActionButton
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
@@ -41,7 +41,6 @@ class SourcesActivity : AppCompatActivity() {
val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
var items: ArrayList = ArrayList()
- mFab.attachToRecyclerView(mRecyclerView)
mRecyclerView.setHasFixedSize(true)
mRecyclerView.layoutManager = mLayoutManager
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
index 09216b3..cbb21e0 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@@ -61,11 +61,11 @@ fun Context.openItemUrlInternally(linkDecoded: String,
if (articleViewer) {
val intent = Intent(this, ReaderActivity::class.java)
- DragDismissIntentBuilder(this)
+ /*DragDismissIntentBuilder(this)
.setFullscreenOnTablets(true) // defaults to false, tablets will have padding on each side
.setDragElasticity(DragDismissIntentBuilder.DragElasticity.NORMAL) // Larger elasticities will make it easier to dismiss.
.setDrawUnderStatusBar(true)
- .build(intent)
+ .build(intent)*/
intent.putExtra("url", linkDecoded)
diff --git a/app/src/main/res/drawable-hdpi/ic_add.png b/app/src/main/res/drawable-hdpi/ic_add.png
new file mode 100644
index 0000000..7800ba3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_add.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
deleted file mode 100644
index c04b523..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
new file mode 100644
index 0000000..39177c9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_open_in_browser.png b/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
new file mode 100644
index 0000000..5e93186
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_open_in_browser.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add.png b/app/src/main/res/drawable-mdpi/ic_add.png
new file mode 100644
index 0000000..ed40b2b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_add.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
deleted file mode 100644
index 23bf119..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
new file mode 100644
index 0000000..f2aa911
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_open_in_browser.png b/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
new file mode 100644
index 0000000..312f7af
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_open_in_browser.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add.png b/app/src/main/res/drawable-xhdpi/ic_add.png
new file mode 100644
index 0000000..185be8a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_add.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3191d52..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
new file mode 100644
index 0000000..2e79886
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png
new file mode 100644
index 0000000..4ecaa05
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add.png b/app/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 0000000..2ab780a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_add.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index a84106b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png
new file mode 100644
index 0000000..1797eb5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png
new file mode 100644
index 0000000..72f373f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add.png b/app/src/main/res/drawable-xxxhdpi/ic_add.png
new file mode 100644
index 0000000..e6ca376
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_add.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3cb1092..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png b/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png
new file mode 100644
index 0000000..63c5a08
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png b/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png
new file mode 100644
index 0000000..40f55c2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png differ
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index 9a60d71..205125b 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -1,141 +1,128 @@
-
+ android:layout_height="match_parent">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintLeft_toLeftOf="parent"
+ android:layout_gravity="end|bottom|right">
-
+
+
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:src="@drawable/ic_add"
+ app:backgroundTint="?attr/colorAccent"
+ app:rippleColor="?attr/colorAccentDark" />
+
-
+
-
-
-
diff --git a/app/src/main/res/layout/activity_sources.xml b/app/src/main/res/layout/activity_sources.xml
index 9d1e825..a6f1b8c 100644
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@@ -1,6 +1,6 @@
-
-
-
+ android:layout_marginRight="16dp" />
+
diff --git a/app/src/main/res/menu/reader_toolbar.xml b/app/src/main/res/menu/reader_toolbar.xml
new file mode 100644
index 0000000..3127f7c
--- /dev/null
+++ b/app/src/main/res/menu/reader_toolbar.xml
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e21a684..94f6210 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,4 +158,7 @@
ReaderforSelfoss
Report a bug
The items number should be an integer.
+ Read more
+ Open in browser
+ Share
\ No newline at end of file