Maybe fixed issue with marking items.

This reverts commit 98492fd0c0.

.github/CONTRIBUTING.md

@@ -48,12 +48,13 @@ You'll have to:
 
 - Configure fabric and add your `apiKey` and `apiSecret` in the `fabric.properties` file.
 - Create a firebase project and add the `google-services.json` to the `app/` folder.
-- Define the following some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
+- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
 
     - mercuryApiKey: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser
     - feedbackEmail: An email to receive users  feedback.
     - sourceUrl: an url to the source code, used in the settings. **It can be empty.**
     - trackerUrl: an url to the tracker, used in the settings. **It can be empty.**
+    - githubToken: a github token used to report issues from within the app. [Details  here](https://github.com/heinrichreimer/android-issue-reporter#how-to-create-a-bot-key). **It can be empty.** 
     - appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
 
 ### Examples:
@@ -67,10 +68,11 @@ mercuryApiKey="LONGAPIKEY"
 feedbackEmail="EMAIL"
 sourceUrl="URLSOURCE" # It can be empty.
 trackerUrl="URLTRACKER" # It can be empty.
+githubToken="GITHUBTOKEN" # It can be empty or use https://github.com/heinrichreimer/android-issue-reporter#how-to-create-a-bot-key to generate one
 ```
 
 #### As gradle parameters
 
 ```
-./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS" -P mercuryApiKey="LONGAPIKEY" -P feedbackEmail="EMAIL" -P sourceUrl="URLSOURCE" -P trackerUrl="URLTRACKER"
+./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS" -P mercuryApiKey="LONGAPIKEY" -P feedbackEmail="EMAIL" -P sourceUrl="URLSOURCE" -P trackerUrl="URLTRACKER" -P githubToken="GITHUBTOKEN"
 ```

CHANGELOG.md

@@ -1,3 +1,31 @@
+**1.5.4.01**
+
+- Removed the "apk downloaded from outside of playstore" message.
+
+- Versions update.
+
+- HTML viewer version update. It should fix an issue with images.
+
+- Some code cleaning.
+
+**1.5.4.00**
+
+- Added issue reporting from within the app.
+
+**1.5.3.06**
+
+- Fixed infinite scroll not working.
+
+- Fixed logs not working.
+
+- Temporary workaround handling opening invalid urls. Waiting to solve #83.
+
+**1.5.3.05**
+
+- Fixed an issue on older versions of Android.
+
+- Libs update.
+
 **1.5.3.04**
 
 - Crowdin translations

README.md

@@ -4,7 +4,7 @@
 
 [![Build Status](http://jenkins.amine-bou.fr/job/ReaderForSelfoss/badge/icon)](http://jenkins.amine-bou.fr/job/ReaderForSelfoss/)
 
-[![codebeat badge](https://codebeat.co/badges/bce66c0f-fd28-4341-a159-3b6dd22ac854)](https://codebeat.co/projects/github-com-aminecmi-readerforselfoss-master) [![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss)
+[![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss)
 
 This is the repo of [Reader For Selfoss](https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss&hl=en).
 

app/build.gradle

@@ -63,6 +63,7 @@ android {
         buildConfigField "String", "SOURCE_URL", sourceUrl
         buildConfigField "String", "TRACKER_URL", trackerUrl
         buildConfigField "String", "TRANSLATION_URL", translationUrl
+        buildConfigField "String", "GITHUB_TOKEN", githubToken
     }
     buildTypes {
         release {
@@ -94,33 +95,33 @@ android {
 
 dependencies {
     // Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
-    androidTestCompile 'com.android.support.test:runner:1.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestCompile 'com.android.support.test:runner:1.0.1'
     // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.1'
     // Espresso-intents for validation and stubbing of Intents
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.1'
 
 
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     // Android Support
-    compile 'com.android.support:appcompat-v7:26.0.1'
-    compile 'com.android.support:design:26.0.1'
-    compile 'com.android.support:recyclerview-v7:26.0.1'
-    compile 'com.android.support:support-v4:26.0.1'
-    compile 'com.android.support:support-vector-drawable:26.0.1'
-    compile 'com.android.support:customtabs:26.0.1'
-    compile 'com.android.support:cardview-v7:26.0.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:support-vector-drawable:26.1.0'
+    compile 'com.android.support:customtabs:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     // Firebase + crashlytics
-    compile 'com.google.firebase:firebase-core:11.2.0'
-    compile 'com.google.firebase:firebase-config:11.2.0'
-    compile 'com.google.firebase:firebase-invites:11.2.0'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true
+    compile 'com.google.firebase:firebase-core:11.4.2'
+    compile 'com.google.firebase:firebase-config:11.4.2'
+    compile 'com.google.firebase:firebase-invites:11.4.2'
+    compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
+        transitive = true;
     }
 
     //multidex
@@ -141,11 +142,11 @@ dependencies {
     compile 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
-    compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.2'
+    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.3'
+    compile 'org.sufficientlysecure:html-textview:3.5'
 
     // glide
     compile 'com.github.bumptech.glide:glide:4.1.1'
@@ -155,7 +156,7 @@ dependencies {
     compile 'com.github.stkent:amplify:2.1.0'
 
     // For the article reader
-    compile 'com.klinkerapps:drag-dismiss-activity:1.4.3'
+    compile 'com.klinkerapps:drag-dismiss-activity:1.5.0'
 
     // Drawer
     compile('com.mikepenz:materialdrawer:5.9.5@aar') {
@@ -166,6 +167,8 @@ dependencies {
     // Themes
     compile 'com.52inc:scoops:1.0.0'
 
+    // Github issues reporter
+    compile 'com.heinrichreimersoftware:android-issue-reporter:1.3.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
@@ -210,6 +213,7 @@ def initAppForSecretPropertiesIfNeeded() {
             entry(key: "sourceUrl", value: System.getProperty("sourceUrl"))
             entry(key: "trackerUrl", value: System.getProperty("trackerUrl"))
             entry(key: "translationUrl", value: System.getProperty("translationUrl"))
+            entry(key: "githubToken", value: System.getProperty("githubToken"))
         }
     }
 }

app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt

@@ -23,8 +23,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.utils.Config
+import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
 import org.junit.After
 
 
@@ -72,9 +72,6 @@ class HomeActivityEspressoTest {
 
         onView(withContentDescription(R.string.abc_toolbar_collapse_description)).perform(click())
 
-
-        onView(withMenu(id = R.id.readAll, titleId = R.string.readAll)).perform(click())
-
         openActionBarOverflowOrOptionsMenu(context)
 
         onView(withMenu(id = R.id.refresh, titleId = R.string.menu_home_refresh))
@@ -86,9 +83,6 @@ class HomeActivityEspressoTest {
 
         intended(hasComponent(LoginActivity::class.java.name), times(1))
 
-        //onView(isRoot()).perform(pressBack())
-
-
     }
 
     @Test
@@ -98,8 +92,9 @@ class HomeActivityEspressoTest {
 
         onView(withId(R.id.material_drawer_layout)).perform(DrawerActions.open())
 
-        onView(withText(R.string.action_about)).perform(click())
-        intended(hasComponent(LibsActivity::class.java.name))
+        onView(withText(R.string.drawer_report_bug)).perform(click())
+        intended(hasComponent(IssueReporterLauncher.Activity::class.java.name))
+        onView(isRoot()).perform(pressBack())
         onView(isRoot()).perform(pressBack())
         intended(hasComponent(HomeActivity::class.java.name))
 
@@ -108,10 +103,6 @@ class HomeActivityEspressoTest {
         onView(withId(R.id.material_drawer_layout)).perform(DrawerActions.open())
         onView(withText(R.string.drawer_action_clear)).perform(click())
 
-        // bug
-        //onView(withText(R.string.title_activity_settings)).perform(scrollTo(), click())
-        //intended(hasComponent(SettingsActivity::class.java.name))
-
     }
 
     // TODO: test articles opening and actions for cards and lists

app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt

@@ -46,7 +46,7 @@ class IntroActivityEspressoTest {
         Intents.init()
     }
 
-    /*@Test
+    @Test
     fun nextEachTimes() {
 
         rule.launchActivity(Intent())
@@ -61,7 +61,7 @@ class IntroActivityEspressoTest {
         intended(hasComponent(IntroActivity::class.java.name), times(1))
         intended(hasComponent(LoginActivity::class.java.name), times(1))
 
-    }*/
+    }
 
     @Test
     fun nextBackRandomTimes() {
@@ -91,29 +91,6 @@ class IntroActivityEspressoTest {
 
     }
 
-    @Test
-    fun clickSelfossUrl() {
-        rule.launchActivity(Intent())
-
-        onView(withText(R.string.intro_hello_title)).check(matches(isDisplayed()))
-
-        onView(withId(R.id.button_next)).perform(click())
-
-        onView(withId(R.id.button_message)).perform(click())
-
-        intended(
-            allOf(
-                hasData(
-                    hasHost(
-                        equalTo("selfoss.aditu.de")
-                    )
-                ),
-                hasAction(Intent.ACTION_VIEW)
-            )
-        )
-
-    }
-
     @After
     fun releaseIntents() {
         Intents.release()

app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -55,7 +55,6 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow
 import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge
-import apps.amine.bou.readerforselfoss.utils.checkAndDisplayStoreApk
 import apps.amine.bou.readerforselfoss.utils.checkApkVersion
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
@@ -64,6 +63,7 @@ import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.ftinc.scoop.Scoop
+import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
 import com.mikepenz.materialdrawer.AccountHeader
 import com.mikepenz.materialdrawer.AccountHeaderBuilder
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem
@@ -118,6 +118,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var offset: Int = 0
     private var firstVisible: Int = 0
     private var recyclerViewScrollListener: RecyclerView.OnScrollListener? = null
+    private lateinit var settings: SharedPreferences
 
 
 
@@ -151,15 +152,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         customTabActivityHelper = CustomTabActivityHelper()
 
-        val dirtyPref = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        api = SelfossApi(this, this@HomeActivity, dirtyPref.getBoolean("isSelfSignedCert", false), dirtyPref.getBoolean("should_log_everything", false))
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+
+        api = SelfossApi(this, this@HomeActivity, settings.getBoolean("isSelfSignedCert", false), sharedPref.getBoolean("should_log_everything", false))
         items = ArrayList()
 
         appColors =  AppColors(this@HomeActivity)
 
         handleBottomBar()
 
-        handleDrawer(dirtyPref)
+        handleDrawer()
 
         coordinatorLayout = findViewById(R.id.coordLayout)
         swipeRefreshLayout = findViewById(R.id.swipeRefreshLayout)
@@ -193,11 +196,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         val i = items[viewHolder.adapterPosition]
                         val position = items.indexOf(i)
 
-                        if (shouldBeCardView) {
-                            (recyclerView.adapter as ItemCardAdapter).removeItemAtIndex(position)
-                        } else {
-                            (recyclerView.adapter as ItemListAdapter).removeItemAtIndex(position)
+                        val adapter = recyclerView.adapter
+                        when (adapter) {
+                            is ItemCardAdapter -> adapter.removeItemAtIndex(position)
+                            is ItemListAdapter -> adapter.removeItemAtIndex(position)
                         }
+
                         if (items.size > 0)
                             tabNewBadge.setText("${items.size}").maybeShow()
                         else
@@ -209,9 +213,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
 
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(recyclerView)
-
-        this@HomeActivity.checkAndDisplayStoreApk()
-
     }
 
     private fun handleBottomBar() {
@@ -269,7 +270,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
 
-        val settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         editor = settings.edit()
 
         if (BuildConfig.GITHUB_VERSION) {
@@ -302,7 +302,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
     }
 
-    private fun handleDrawer(dirtyPref: SharedPreferences) {
+    private fun handleDrawer() {
         displayAccountHeader =
             PreferenceManager.getDefaultSharedPreferences(this)
                 .getBoolean("account_header_displaying", false)
@@ -313,7 +313,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 .addProfiles(
                     ProfileDrawerItem()
                         .withName(
-                            dirtyPref.getString("url", "")
+                            settings.getString("url", "")
                         )
                         .withIcon(resources.getDrawable(R.mipmap.ic_launcher))
                 )
@@ -349,6 +349,25 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
         drawer = drawerBuilder.build()
 
+        drawer.addStickyFooterItem(
+            PrimaryDrawerItem()
+                .withName(R.string.drawer_report_bug)
+                .withIcon(R.drawable.ic_bug_report)
+                .withIconTintingEnabled(true)
+                .withOnDrawerItemClickListener { _, _, _ ->
+                    IssueReporterLauncher.forTarget(getString(R.string.report_github_user), getString(R.string.report_github_repo))
+                        .theme(R.style.Theme_App_Light)
+                        .guestToken(BuildConfig.GITHUB_TOKEN)
+                        .guestEmailRequired(true)
+                        .minDescriptionLength(20)
+                        .putExtraInfo("Unique ID", settings.getString("unique_id", ""))
+                        .putExtraInfo("From github", BuildConfig.GITHUB_VERSION)
+                        .homeAsUpEnabled(true)
+                        .launch(this)
+                    false
+                }
+        )
+
         drawer.addStickyFooterItem(
             PrimaryDrawerItem()
                 .withName(R.string.title_activity_settings)
@@ -579,9 +598,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     override fun onScrolled(localRecycler: RecyclerView?, dx: Int, dy: Int) {
                         if (dy > 0) {
                             if (localRecycler != null) {
-                                val lastVisibleItem: Int = when (mLayoutManager) {
-                                    is StaggeredGridLayoutManager -> mLayoutManager.findLastCompletelyVisibleItemPositions(null).last()
-                                    is GridLayoutManager -> mLayoutManager.findLastCompletelyVisibleItemPosition()
+                                val manager = recyclerView.layoutManager
+                                val lastVisibleItem: Int = when (manager) {
+                                    is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(null).last()
+                                    is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
                                     else -> 0
                                 }
 
@@ -601,18 +621,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             override fun onTabUnselected(position: Int) = Unit
 
             override fun onTabReselected(position: Int) =
-                if (shouldBeCardView) {
-                    if ((mLayoutManager as StaggeredGridLayoutManager).findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
-                        getElementsAccordingToTab()
-                    } else {
-                        mLayoutManager.scrollToPositionWithOffset(0, 0)
-                    }
-                } else {
-                    if ((mLayoutManager as GridLayoutManager).findFirstCompletelyVisibleItemPosition() == 0) {
-                        getElementsAccordingToTab()
-                    } else {
-                        mLayoutManager.scrollToPositionWithOffset(0, 0)
-                    }
+                when (mLayoutManager) {
+                    is StaggeredGridLayoutManager ->
+                        if (mLayoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
+                            getElementsAccordingToTab()
+                        } else {
+                            mLayoutManager.scrollToPositionWithOffset(0, 0)
+                        }
+                    is GridLayoutManager ->
+                        if (mLayoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
+                            getElementsAccordingToTab()
+                        } else {
+                            mLayoutManager.scrollToPositionWithOffset(0, 0)
+                        }
+                    else -> Unit
                 }
 
             override fun onTabSelected(position: Int) =

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -19,7 +19,6 @@ import android.widget.*
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.checkAndDisplayStoreApk
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.crashlytics.android.Crashlytics
 import com.ftinc.scoop.Scoop
@@ -81,8 +80,6 @@ class LoginActivity : AppCompatActivity() {
 
         if (settings.getString("url", "").isNotEmpty()) {
             goToMain()
-        } else {
-            this@LoginActivity.checkAndDisplayStoreApk()
         }
 
         mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)

app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt

@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss
 
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -41,13 +42,14 @@ class ReaderActivity : DragDismissActivity() {
         Scoop.getInstance().apply(this)
         val v = inflater.inflate(R.layout.activity_reader, parent, false)
         showProgressBar()
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
         val image: ImageView = v.findViewById(R.id.imageView)
         val source: TextView = v.findViewById(R.id.source)
         val title: TextView = v.findViewById(R.id.title)
         val content: HtmlTextView = v.findViewById(R.id.content)
         val url = intent.getStringExtra("url")
-        val parser = MercuryApi(BuildConfig.MERCURY_KEY)
+        val parser = MercuryApi(BuildConfig.MERCURY_KEY, prefs.getBoolean("should_log_everything", false))
         val browserBtn: ImageButton = v.findViewById(R.id.browserBtn)
         val shareBtn: ImageButton = v.findViewById(R.id.shareBtn)
 

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -52,7 +52,7 @@ class ItemCardAdapter(private val app: Activity,
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as ConstraintLayout
+        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as CardView
         return ViewHolder(v)
     }
 
@@ -69,14 +69,9 @@ class ItemCardAdapter(private val app: Activity,
             Glide.with(c).clear(holder.itemImage)
             holder.itemImage.setImageDrawable(null)
         } else {
-            if (fullHeightCards) {
-                c.bitmapFitCenter(itm.getThumbnail(c), holder.itemImage)
-            } else {
-                c.bitmapCenterCrop(itm.getThumbnail(c), holder.itemImage)
-            }
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.itemImage)
         }
 
-        val fHolder = holder
         if (itm.getIcon(c).isEmpty()) {
             val color = generator.getColor(itm.sourcetitle)
 
@@ -163,7 +158,7 @@ class ItemCardAdapter(private val app: Activity,
 
     }
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) {
         lateinit var saveBtn: LikeButton
         lateinit var browserBtn: ImageButton
         lateinit var shareBtn: ImageButton
@@ -173,7 +168,7 @@ class ItemCardAdapter(private val app: Activity,
         lateinit var sourceTitleAndDate: TextView
 
         init {
-            (mView.findViewById<CardView>(R.id.card)).setCardBackgroundColor(appColors.cardBackground)
+            mView.setCardBackgroundColor(appColors.cardBackground)
             handleClickListeners()
             handleCustomTabActions()
         }
@@ -223,7 +218,7 @@ class ItemCardAdapter(private val app: Activity,
             }
 
             browserBtn.setOnClickListener {
-                c.openInBrowser(items[adapterPosition])
+                c.openInBrowserAsNewTask(items[adapterPosition])
             }
         }
 

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -226,7 +226,7 @@ class ItemListAdapter(private val app: Activity,
             }
 
             browserBtn.setOnClickListener {
-                c.openInBrowser(items[adapterPosition])
+                c.openInBrowserAsNewTask(items[adapterPosition])
 
             }
         }

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryApi.kt

@@ -9,13 +9,16 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 
-class MercuryApi(private val key: String) {
+class MercuryApi(private val key: String, shouldLog: Boolean) {
     private val service: MercuryService
 
     init {
 
         val interceptor = HttpLoggingInterceptor()
-        interceptor.level = HttpLoggingInterceptor.Level.BODY
+        interceptor.level = if (shouldLog)
+            HttpLoggingInterceptor.Level.BODY
+        else
+            HttpLoggingInterceptor.Level.NONE
         val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
 
         val gson = GsonBuilder()

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt

@@ -128,6 +128,12 @@ data class Item(@SerializedName("id") val id: String,
         if (stringUrl.contains(":443")) {
             stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
         }
+
+        // handle url not starting with http
+        if (stringUrl.startsWith("//")) {
+            stringUrl = "http:" + stringUrl
+        }
+
         return stringUrl
     }
 

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossService.kt

@@ -1,21 +1,16 @@
 package apps.amine.bou.readerforselfoss.api.selfoss
 
 import retrofit2.Call
-import retrofit2.http.DELETE
-import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Query
-
+import retrofit2.http.*
 
 
 // codebeat:disable[ARITY]
 internal interface SelfossService {
+
     @GET("login")
     fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
 
+
     @GET("items")
     fun getItems(@Query("type") type: String,
                  @Query("tag") tag: String?,
@@ -26,17 +21,21 @@ internal interface SelfossService {
                  @Query("items") items: Int,
                  @Query("offset") offset: Int): Call<List<Item>>
 
+
+    @Headers("Content-Type: application/json")
     @POST("mark/{id}")
     fun markAsRead(@Path("id") id: String,
                    @Query("username") username: String,
                    @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/json")
     @POST("unmark/{id}")
     fun unmarkAsRead(@Path("id") id: String,
                      @Query("username") username: String,
                      @Query("password") password: String): Call<SuccessResponse>
 
+
     @FormUrlEncoded
     @POST("mark")
     fun markAllAsRead(@Field("ids[]") ids: List<String>,
@@ -44,12 +43,14 @@ internal interface SelfossService {
                       @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/json")
     @POST("starr/{id}")
     fun starr(@Path("id") id: String,
               @Query("username") username: String,
               @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/json")
     @POST("unstarr/{id}")
     fun unstarr(@Path("id") id: String,
                 @Query("username") username: String,
@@ -70,10 +71,12 @@ internal interface SelfossService {
     fun update(@Query("username") username: String,
                @Query("password") password: String): Call<String>
 
+
     @GET("sources/spouts")
     fun spouts(@Query("username") username: String,
                @Query("password") password: String): Call<Map<String, Spout>>
 
+
     @GET("sources/list")
     fun sources(@Query("username") username: String,
                 @Query("password") password: String): Call<List<Sources>>
@@ -84,6 +87,7 @@ internal interface SelfossService {
                      @Query("username") username: String,
                      @Query("password") password: String): Call<SuccessResponse>
 
+
     @FormUrlEncoded
     @POST("source")
     fun createSource(@Field("title") title: String,

app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt

@@ -5,51 +5,13 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import android.support.v7.app.AlertDialog
-import android.text.TextUtils
-import android.util.Patterns
 
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import okhttp3.HttpUrl
 
-import apps.amine.bou.readerforselfoss.BuildConfig
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 
 
-fun Context.checkAndDisplayStoreApk() = {
-    fun isStoreVersion(): Boolean =
-        try {
-            val installer = this.packageManager
-                .getInstallerPackageName(this.packageName)
-            !TextUtils.isEmpty(installer)
-        } catch (e: Throwable) {
-            false
-        }
-
-    if (!isStoreVersion() && !BuildConfig.GITHUB_VERSION) {
-        val alertDialog = AlertDialog.Builder(this).create()
-        alertDialog.setTitle(getString(R.string.warning_version))
-        alertDialog.setMessage(getString(R.string.text_version))
-        alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK",
-            { dialog, _ -> dialog.dismiss() })
-        alertDialog.show()
-    } else Unit
-}
-
-fun String.isUrlValid(): Boolean =
-    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
-
-fun String.isBaseUrlValid(): Boolean {
-    val baseUrl = HttpUrl.parse(this)
-    var existsAndEndsWithSlash = false
-    if (baseUrl != null) {
-        val pathSegments = baseUrl.pathSegments()
-        existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
-    }
-
-    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
-}
-
 fun String?.isEmptyOrNullOrNullString(): Boolean =
     this == null || this == "null" || this.isEmpty()
 
@@ -116,11 +78,4 @@ fun Context.shareLink(itemUrl: String) {
     sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
     sendIntent.type = "text/plain"
     startActivity(Intent.createChooser(sendIntent, getString(R.string.share)).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
-}
-
-fun Context.openInBrowser(i: Item) {
-    val intent = Intent(Intent.ACTION_VIEW)
-    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
-    startActivity(intent)
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -7,9 +7,13 @@ import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.support.customtabs.CustomTabsIntent
+import android.util.Patterns
+import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.ReaderActivity
+import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import okhttp3.HttpUrl
 import xyz.klinker.android.drag_dismiss.DragDismissIntentBuilder
 
 
@@ -51,29 +55,35 @@ fun Context.openItemUrl(linkDecoded: String,
                         internalBrowser: Boolean,
                         articleViewer: Boolean,
                         app: Activity) {
-    if (!internalBrowser || !linkDecoded.isUrlValid()) {
-        openInBrowser(linkDecoded, app)
-    } else {
-        if (articleViewer) {
-            val intent = Intent(this, ReaderActivity::class.java)
 
-            DragDismissIntentBuilder(this)
+    if (!linkDecoded.isUrlValid()) {
+        Toast.makeText(this, this.getString(R.string.cant_open_invalid_url), Toast.LENGTH_LONG).show()
+    } else {
+        if (!internalBrowser) {
+            openInBrowser(linkDecoded, app)
+        } else {
+            if (articleViewer) {
+                val intent = Intent(this, ReaderActivity::class.java)
+
+                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)
 
-            intent.putExtra("url", linkDecoded)
-            app.startActivity(intent)
-        } else {
-            try {
-                CustomTabActivityHelper.openCustomTab(app, customTabsIntent, Uri.parse(linkDecoded)
-                ) { _, uri ->
-                    val intent = Intent(Intent.ACTION_VIEW, uri)
-                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    startActivity(intent)
+                intent.putExtra("url", linkDecoded)
+                app.startActivity(intent)
+            } else {
+                try {
+                    CustomTabActivityHelper.openCustomTab(app, customTabsIntent, Uri.parse(linkDecoded)
+                    ) { _, uri ->
+                        val intent = Intent(Intent.ACTION_VIEW, uri)
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        startActivity(intent)
+                    }
+                } catch (e: Exception) {
+                    openInBrowser(linkDecoded, app)
                 }
-            } catch (e: Exception) {
-                openInBrowser(linkDecoded, app)
             }
         }
     }
@@ -84,3 +94,24 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
     intent.data = Uri.parse(linkDecoded)
     app.startActivity(intent)
 }
+
+fun String.isUrlValid(): Boolean =
+    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
+
+fun String.isBaseUrlValid(): Boolean {
+    val baseUrl = HttpUrl.parse(this)
+    var existsAndEndsWithSlash = false
+    if (baseUrl != null) {
+        val pathSegments = baseUrl.pathSegments()
+        existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
+    }
+
+    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
+}
+
+fun Context.openInBrowserAsNewTask(i: Item) {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
+    startActivity(intent)
+}

app/src/main/res/layout/activity_login.xml

@@ -55,9 +55,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/prompt_url"
-                        android:imeActionId="@+id/login"
-                        android:inputType="textUri"
                         android:imeOptions="actionUnspecified"
+                        android:inputType="textUri"
                         android:maxLines="1"
                         />
 

app/src/main/res/layout/activity_reader.xml

@@ -97,7 +97,7 @@
             android:padding="4dp"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_open_in_browser_black_24dp"
-            android:tint="?android:attr/textColorPrimary"
+            android:tint="@android:color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/shareBtn"
             app:layout_constraintHorizontal_bias="0.5"
@@ -114,7 +114,7 @@
             android:padding="4dp"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_share_black_24dp"
-            android:tint="?android:attr/textColorPrimary"
+            android:tint="@android:color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/card_item.xml

@@ -1,157 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:app="http://schemas.android.com/apk/res-auto"
-                                             xmlns:tools="http://schemas.android.com/tools"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="wrap_content">
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="8dp"
+    android:layout_marginRight="8dp"
+    android:layout_marginTop="8dp"
+    app:layout_constraintHorizontal_bias="0.62"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    card_view:cardElevation="2dp"
+    card_view:cardUseCompatPadding="true"
+    card_view:layout_constraintBottom_toBottomOf="parent">
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/card"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:layout_width="0dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintHorizontal_bias="0.62"
-        app:layout_constraintTop_toTopOf="parent"
-        card_view:cardElevation="2dp"
-        card_view:cardUseCompatPadding="true"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp">
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/itemImage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:cropToPadding="true"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/background_splash"
+            card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
 
         <android.support.constraint.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:id="@+id/constraintLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
             <ImageView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:srcCompat="@drawable/background_splash"
-                android:id="@+id/itemImage"
-                android:scaleType="fitCenter"
-                android:adjustViewBounds="true"
-                android:cropToPadding="true"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="0dp"
-                android:layout_marginRight="0dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginLeft="0dp"
-                app:layout_constraintLeft_toLeftOf="parent" />
-
-            <android.support.constraint.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@+id/itemImage"
-                app:layout_constraintRight_toRightOf="parent"
+                android:id="@+id/sourceImage"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/background_splash" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textStyle="bold"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toRightOf="@+id/sourceImage"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/sourceImage"
+                tools:text="Titre" />
+
+            <TextView
+                android:id="@+id/sourceTitleAndDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textSize="14sp"
+                app:layout_constraintLeft_toLeftOf="@+id/title"
+                app:layout_constraintTop_toBottomOf="@+id/title"
+                tools:text="Google Actualité Il y a 5h" />
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                >
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
-                <ImageView
-                    android:layout_height="40dp"
-                    app:srcCompat="@drawable/background_splash"
-                    android:id="@+id/sourceImage"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:layout_marginTop="8dp"
-                    android:layout_width="40dp" />
+                <com.like.LikeButton
+                    android:id="@+id/favButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
 
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:layout_marginEnd="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
-                    android:layout_marginStart="8dp"
-                    android:gravity="start"
-                    android:textAlignment="viewStart"
-                    android:textStyle="bold"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintLeft_toRightOf="@+id/sourceImage"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/sourceImage"
-                    tools:text="Titre" />
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    app:icon_size="22dp"
+                    app:icon_type="heart" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/sourceTitleAndDate"
-                    android:textSize="14sp"
-                    tools:text="Google Actualité Il y a 5h"
-                    android:textAlignment="viewStart"
-                    app:layout_constraintTop_toBottomOf="@+id/title"
-                    android:layout_marginTop="8dp"
-                    app:layout_constraintLeft_toLeftOf="@+id/title"
-                    android:gravity="start" />
+                <ImageButton
+                    android:id="@+id/shareBtn"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/favButton"
+                    android:layout_toStartOf="@+id/favButton"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_share_black_24dp"
+                    android:tint="?android:attr/textColorPrimary" />
 
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                <ImageButton
+                    android:id="@+id/browserBtn"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/shareBtn"
+                    android:layout_toStartOf="@+id/shareBtn"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_open_in_browser_black_24dp"
+                    android:tint="?android:attr/textColorPrimary" />
 
-                    <com.like.LikeButton
-                        app:icon_type="heart"
-                        app:icon_size="22dp"
-                        android:id="@+id/favButton"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
+            </RelativeLayout>
 
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginEnd="8dp"/>
-
-                    <ImageButton
-                        android:id="@+id/shareBtn"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_toLeftOf="@+id/favButton"
-                        android:layout_toStartOf="@+id/favButton"
-                        android:adjustViewBounds="true"
-                        android:background="@android:color/transparent"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/ic_share_black_24dp"
-                        android:tint="?android:attr/textColorPrimary" />
-
-                    <ImageButton
-                        android:id="@+id/browserBtn"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_toLeftOf="@+id/shareBtn"
-                        android:layout_toStartOf="@+id/shareBtn"
-                        android:adjustViewBounds="true"
-                        android:background="@android:color/transparent"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/ic_open_in_browser_black_24dp"
-                        android:tint="?android:attr/textColorPrimary" />
-
-                </RelativeLayout>
-
-            </android.support.constraint.ConstraintLayout>
         </android.support.constraint.ConstraintLayout>
+    </android.support.constraint.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
-</android.support.constraint.ConstraintLayout>
+</android.support.v7.widget.CardView>

app/src/main/res/layout/switch_item.xml

@@ -1,11 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Switch
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>

app/src/main/res/menu/home_menu.xml

@@ -5,14 +5,14 @@
     <item android:id="@+id/action_search"
         android:title="@string/menu_home_search"
         android:icon="@drawable/ic_action_search"
-        app:showAsAction="always|collapseActionView"
+        app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="android.support.v7.widget.SearchView" />
 
     <item android:id="@+id/readAll"
           android:icon="@drawable/ic_done_all_white_24dp"
           android:title="@string/readAll"
           android:orderInCategory="1"
-          app:showAsAction="always"/>
+          app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/refresh"

app/src/main/res/values-af/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ar/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ca/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Melde einen Bug oder rege ein neues Feature an"</string>
-  <string name="warning_version">"WARNUNG"</string>
   <string name="warning_wrong_url">"WARNUNG"</string>
-  <string name="text_version">"Du scheinst eine Version der App verwenden, die nicht aus dem Play Store kommt. Die App könnte manipuliert wurden. Ich bin nicht verantwortlich für daraus resultierende Schäden an deinem Gerät. Bitte erwäge, die ReaderForSelfoss App aus dem Play Store zu nutzen."</string>
   <string name="pref_switch_card_view_title">"Kachelansicht"</string>
   <string name="cant_mark_favortie">"Artikel kann nicht als Favorit markiert werden"</string>
   <string name="cant_unmark_favortie">"Eintrag kann nicht aus Favoriten entfernt werden"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">Keine Quellen geladen</string>
   <string name="drawer_loading">Lade…</string>
   <string name="menu_home_search">Suche</string>
-  <string name="can_delete_source">Quelle kann nicht gelöscht werden...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">Beim Versuch deine Selfoss-Instanz zu erreichen ist ein Fehler aufgetreten. Solltet dieser Fehler bestehen bleiben, trete bitte mit mir in Kontakt.</string>
   <string name="pref_header_theme">Designs</string>
   <string name="default_theme">Standard</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Übersetzung</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Liens utils"</string>
   <string name="issue_tracker_link">"Suivie des problèmes"</string>
   <string name="issue_tracker_summary">"Pour signaler un bug ou demander une nouvelle fonctionnalité"</string>
-  <string name="warning_version">"ATTENTION"</string>
   <string name="warning_wrong_url">"ATTENTION"</string>
-  <string name="text_version">"Il semblerait que vous utilisiez une version de l'application ne provenant pas du Play Store. L'application peut avoir été modifié et son utilisation peut être dangereuse. Je ne serai en aucun cas tenu responsable en cas de dommage causé sur votre appareil. Pour éviter tout problème, je vous conseille de télécharger ReaderForSelfoss directement depuis le Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Impossible de marquer l'élément comme favoris"</string>
   <string name="cant_unmark_favortie">"Impossible de retirer l'élément des favoris"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">Pas de sources chargés</string>
   <string name="drawer_loading">Chargement …</string>
   <string name="menu_home_search">Rechercher</string>
-  <string name="can_delete_source">Petit soucis lors de la suppression de la source.</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">Il y a eu un souci lors de la communication avec votre instance Selfoss. Si le problèmes persiste, contactez-moi pour trouver une solution.</string>
   <string name="pref_header_theme">Thèmes</string>
   <string name="default_theme">Par défaut</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">Aucun appel à l\'API ne sera logué</string>
   <string name="pref_general_infinite_loading_title">(BETA) Charger plus d\'articles au scroll</string>
   <string name="translation">Traduction</string>
+  <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
+  <string name="drawer_report_bug">Signaler un bug</string>
 </resources>

app/src/main/res/values-he/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Bug tracker"</string>
   <string name="issue_tracker_summary">"Rapporteer een probleem of dien een verzoek in"</string>
-  <string name="warning_version">"WAARSCHUWING"</string>
   <string name="warning_wrong_url">"WAARSCHUWING"</string>
-  <string name="text_version">"Deze versie van de applicatie lijkt niet afkomstig van de Play Store en kan mogelijk virussen bevatten. De ontwikkelaar is niet verantwoordelijk voor mogelijke schade aan uw apparaat. Overweeg om de ReaderForSelfoss app uit de Play Store te gebruiken."</string>
   <string name="pref_switch_card_view_title">"Kaart weergave"</string>
   <string name="cant_mark_favortie">"Kan het artikel niet markeren als favoriet"</string>
   <string name="cant_unmark_favortie">"Kan het item niet verwijderen uit favorieten"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Zoeken</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Vertaling</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-no/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -154,4 +152,6 @@
   <string name="login_everything_off">No api call will be logged</string>
   <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
   <string name="translation">Translation</string>
+  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -44,9 +44,7 @@
     <string name="pref_header_links">"Links"</string>
     <string name="issue_tracker_link">"Issue Tracker"</string>
     <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-    <string name="warning_version">"WARNING"</string>
     <string name="warning_wrong_url">"WARNING"</string>
-    <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
     <string name="pref_switch_card_view_title">"Card View"</string>
     <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
     <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -116,7 +114,7 @@
     <string name="no_sources_loaded">No sources loaded</string>
     <string name="drawer_loading">Loading …</string>
     <string name="menu_home_search">Search</string>
-    <string name="can_delete_source">Can\'t delete the source...</string>
+    <string name="can_delete_source">Can\'t delete the source…</string>
     <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
     <string name="pref_header_theme">Themes</string>
     <string name="default_theme">Default</string>
@@ -155,4 +153,8 @@
     <string name="login_everything_off">No api call will be logged</string>
     <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
     <string name="translation">Translation</string>
+    <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+    <string name="report_github_user" translatable="false">aminecmi</string>
+    <string name="report_github_repo" translatable="false">ReaderforSelfoss</string>
+    <string name="drawer_report_bug">Report a bug</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -191,4 +191,11 @@
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
     </style>
 
+    <style name="Theme.App.Light" parent="Theme.IssueReporter.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/md_grey_900</item>
+    </style>
+
 </resources>

app/src/main/res/xml/bottombar.xml

@@ -1,20 +0,0 @@
-<tabs>
-    <tab
-        id="@+id/tab_new"
-        icon="@drawable/ic_fiber_new_black_24dp"
-        title="@string/tab_new"
-        barColorWhenSelected="@color/colorAccent" />
-
-    <tab
-        id="@+id/tab_archive"
-        icon="@drawable/ic_archive_black_24dp"
-        title="@string/tab_read"
-        barColorWhenSelected="@color/colorAccentDark"/>
-
-    <tab
-        id="@+id/tab_fav"
-        icon="@drawable/ic_favorite_black_24dp"
-        title="@string/tab_favs"
-        barColorWhenSelected="@color/pink"/>
-
-</tabs>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.4-3'
+    ext.kotlin_version = '1.1.51'
     repositories {
         jcenter()
         google()
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-rc2'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong