Updates and more.

CHANGELOG.md

@@ -1,3 +1,13 @@
+**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.

app/build.gradle

@@ -95,31 +95,31 @@ android {
 
 dependencies {
     // Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
-    androidTestCompile 'com.android.support.test:runner:1.0.0'
+    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.2'
+    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:design:26.0.2'
+    compile 'com.android.support:design:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.0.2'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.android.support:support-v4:26.0.2'
+    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support:support-vector-drawable:26.0.2'
+    compile 'com.android.support:support-vector-drawable:26.1.0'
-    compile 'com.android.support:customtabs:26.0.2'
+    compile 'com.android.support:customtabs:26.1.0'
-    compile 'com.android.support:cardview-v7:26.0.2'
+    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-core:11.4.2'
-    compile 'com.google.firebase:firebase-config:11.2.0'
+    compile 'com.google.firebase:firebase-config:11.4.2'
-    compile 'com.google.firebase:firebase-invites:11.2.0'
+    compile 'com.google.firebase:firebase-invites:11.4.2'
     compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
         transitive = true;
     }
@@ -146,7 +146,7 @@ dependencies {
     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'

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
@@ -214,9 +213,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
 
         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(recyclerView)
-
-        this@HomeActivity.checkAndDisplayStoreApk()
-
     }
 
     private fun handleBottomBar() {

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/adapters/ItemCardAdapter.kt

@@ -223,7 +223,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/utils/AppUtils.kt

@@ -5,35 +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 com.google.firebase.remoteconfig.FirebaseRemoteConfig
 
-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?.isEmptyOrNullOrNullString(): Boolean =
     this == null || this == "null" || this.isEmpty()
 
@@ -101,10 +79,3 @@ fun Context.shareLink(itemUrl: String) {
     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

@@ -11,6 +11,7 @@ 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
@@ -107,3 +108,10 @@ fun String.isBaseUrlValid(): Boolean {
 
     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/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,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNUNG"</string>
+    <string name="pref_switch_card_view_title">"Kachelansicht"</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>
   <string name="share">"Teilen"</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">Quelle kann nicht gelöscht werden…</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"ATTENTION"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Partager"</string>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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="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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WAARSCHUWING"</string>
+    <string name="pref_switch_card_view_title">"Kaart weergave"</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>
   <string name="share">"Delen"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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="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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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

@@ -46,10 +46,8 @@
   <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="warning_wrong_url">"WARNING"</string>
+    <string name="pref_switch_card_view_title">"Card View"</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>
   <string name="share">"Share"</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>

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>

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

@@ -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