diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..7cd3814
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,73 @@
+# Introduction
+
+### Hey you !
+
+Thank you for wanting to help. Even the smallest things can help this project become better.
+
+Please read the guidelines before contributing, and follow them (or try to) when contributing.
+
+### What you can do to help.
+
+There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
+
+You can fork the repository, and [help me solve some issues](https://github.com/aminecmi/ReaderforSelfoss/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://github.com/aminecmi/ReaderforSelfoss/issues)
+
+### What I can't help you with.
+
+Please, don't use the issue tracker for anything related to [Selfoss itself](https://github.com/SSilence/selfoss). The app calls the api provided by Selfoss, and can't help with solving issues with your Selfoss instance.
+
+Always check if the web version of your instance is working.
+
+# Some rules
+### Bug reports/Feature request
+
+* Always search before reporting an issue or asking for a feature to avoid duplicates.
+* Include your unique user id. It's displayed on the debug settings page. (You can tap it, it'll be copied to your clipboard)
+* Include every other useful details (app version, phone model, Android version and screenshots when possible).
+* Avoid bumping non-fatal issues, or feature requests. I'll try to fix them as soon as possible, and try to prioritize the requests. (You may wan to use the [reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) for that)
+
+### Pull requests
+
+* Don't create a PR for translations. See [here](https://github.com/aminecmi/ReaderforSelfoss/pull/170#issuecomment-355715654) for an explanation why.
+* Please ask before starting to work on an issue. I may be working on it, or someone else could be doing so.
+* Each pull request should implement **ONE** feature or bugfix. Keep in mind that you can submit as many PR as you want.
+* Your code must be simple and clear enough to avoid using comments to explain what it does.
+* Follow the used coding style [the android koding style](https://android.github.io/kotlin-guides/style.html) ([some idoms for reference](http://kotlinlang.org/docs/reference/idioms.html)) with more to come.
+* Try as much as possible to write a test for your feature, and if you do so, run it, and make it work.
+* Always check your changes and discard the ones that are irrelevant to your feature or bugfix.
+* Have meaningful commit messages.
+* Always reference the issue you are working on in your PR description.
+* Be willing to accept criticism on your PRs (as I am on mine).
+* Remember that PR review can take time.
+
+
+# Install Selfoss (if you don't have an instance)
+
+I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.
+
+All the details to need are [here](https://selfoss.aditu.de/).
+
+# Build the project
+
+You can directly import this project into IntellIJ/Android Studio.
+
+You'll have to:
+
+- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
+
+    - 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:
+#### Inside ~/.gradle/gradle.properties
+
+```
+appLoginUrl="URL" # It can be empty.
+appLoginUsername="LOGIN" # It can be empty.
+appLoginPassword="PASS" # It can be empty.
+```
+
+#### As gradle parameters
+
+```
+./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS"
+```
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..a457db0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,32 @@
+### Prerequisites
+
+* [ ] Are you running the latest version?
+* [ ] Did you check for an existing issue ?
+* [ ] Are you reporting to the correct repository?
+* [ ] Did you perform a cursory search?
+* [ ] Did you read the `CONTRIBUTING` guide ?
+
+### Description
+
+[Description of the bug or feature]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expected to happen]
+
+**Actual behavior:** [What actually happened]
+
+
+### Screenshots (optional)
+
+`...`
+
+### Device
+
+- Device (manufacturer, model ...)
+- OS (Android Version, ROM/Stock, Rooted/not, mods...)
+- App version _(See Prerequisites)_
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..76b8ec1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+## Types of changes
+
+- [ ] I have read the **CONTRIBUTING** document.
+- [ ] My code follows the code style of this project.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.
+- [ ] This is **NOT** translation related. (See [here](https://github.com/aminecmi/ReaderforSelfoss/pull/170#issuecomment-355715654))
+
+This closes issue #XXX
+
+This is implements feature #YYY
+
+This finishes chore #ZZZ
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..a87b03b
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,562 @@
+**1.7.x**
+
+- Hiding tags with 0 articles
+
+- Fixed issue with basic auth and images loading
+
+- Added the ability to justify or left align the reader text
+
+- Fixed #251
+
+- Added experimental issue to set a default timeout. Should work for #238.
+
+- Closing #220.
+
+- Start of #238. "Add a quick shortcut to open the app on offline mode ?"
+
+- Closes #216. Issue with selfoss version 2.19.
+
+- Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
+
+- Closes #33. Background sync with settings.
+
+- Closing #1. Initial article caching.
+
+- Closing #228 by removing the list action bar. Action buttons are exclusively on the card view from now on.
+
+- Closing #38. Only doing api calls on network available.
+
+- Closing #298 and #287. Issues with Listview rendering
+
+- Closing #290. Fixing back button issue in Settings
+
+- Closing #300. Fixing issues when displaying some special characters.
+
+- Closing #310. Some feeds don't have icons nor thumbnails.
+
+- Closing #178. Expending images on tap.
+
+- Closing #323. Old issue with textview not having the right color.
+
+- Closing #324. Svg images loading crashes the app.
+
+- Closing #322. App crashed because of svg images.
+
+- Closing #236. New sources can be added in Selfoss 2.19.
+
+- Closing #397 and #355. Tag and Sources filters are now exclusive.
+
+- Dropped support for android 4, the last version supporting it is v1721030811
+
+- Added ability to scroll articles up and down using the volume keys #400
+
+**1.6.x**
+
+- Handling hidden tags.
+
+- Fixed pre-lolipop issue with automatic theme changes.
+
+- Removed all Build config things.
+
+- Removed firebase and fabric.
+
+- Added Acra for optional crash reporting and error logging.
+
+- Dynamic themes !
+
+- Strings cleaning.
+
+- Versions updates.
+
+- Fixes #215, #208.
+
+- Fixes #328.
+
+**1.5.7.x**
+
+- Added confirmation to the mark as read and update menues.
+
+- Add to favorites from article viewer.
+
+- Added an option to use a webview in the article viewer (see #149)
+
+- Fixes (#151 #152 #155 #157 #160 #174) and more.
+
+- New year fixes !!!
+
+- Changed page indicator position as it was overlaping content.
+
+- Now using slack instead of gitter.
+
+- Moved completely to a webview to fix #161.
+
+- Fixed typos in French ( Thanks @aancel )
+
+- Updated the Contribution guide about translations.
+
+- Better handling for articles update. (See #169)
+
+- Ability to change the article viewer content font size (see #153)
+
+- Versions updates * 2.
+
+- Added padding to the recyclerview.
+
+**1.5.5.x (didn't last long) AND 1.5.6.x**
+
+- Toolbar in reader activity.
+
+- Marking items as read on scroll (with settings to enable/disable).
+
+- Swapped the title and subtitle in the article viewer.
+
+- Added an animation to the viewpager.
+
+- Completed Dutch, Indonesian and Portuguese translations !
+
+- Fixed #142, #144, #147.
+
+- Changed versions handling.
+
+- Removed indonesian english as it was causing issues with the english version of the app.
+
+**1.5.4.22**
+
+- You can now scroll through the loaded articles !
+
+**1.5.4.21**
+
+- Spanish translation and some Indonesian !
+
+**1.5.4.20**
+
+- Turkish translation !
+
+**1.5.4.19**
+
+- Fixed an issue with crowdin configuration (and its translations)
+
+**1.5.4.18**
+
+- Typo fix.
+
+- The real last infinite scroll bug fix.
+
+- Simplified Chinese translation !
+
+**1.5.4.17**
+
+- Fixed the last bug with infinite scroll.
+
+**1.5.4.16**
+
+- Fixing list view displaying issues.
+
+- Endless scroll is not in beta anymore.
+
+**1.5.4.15**
+
+- Fixed an issue with the sources list.
+
+**1.5.4.14**
+
+- Fixing infinite scroll trying to load more items when there are no more.
+
+**1.5.4.13**
+
+- Displaying the right number of items.
+
+- Fixing infinite scroll remaining issues. Should be stable enough.
+
+**1.5.4.12**
+
+- Fixed fab and toolbar issue (#113)
+
+- Fixed links clickable (#114)
+
+- Changed the link colors in the article viewer
+
+**1.5.4.11**
+
+- Hiding FABs on scroll.
+
+- Closing #109 (code cleaning)
+
+- Hiding fabs on scroll (#101)
+
+**1.5.4.10**
+
+- Displaying a loader when "reading more" in the article viewer.
+
+- Displaying the thumbnail instead of icon on the article viewer.
+
+- Scrolling to top when loading content with the "read more" button.
+
+**1.5.4.09**
+
+- Using the kotlin wrapper for the material drawer (see #98 for more details).
+
+- Updated support libraries
+
+- Changed the Floating Action Button to the support library version.
+
+- New reader activity action bar #103.
+
+**1.5.4.08**
+
+- Thanks @jrafaelsantana for translating the whole app in Brazilian Portuguese.
+
+**1.5.4.07**
+
+- Loading more items on swipe too.
+
+- Fixed popup menu style. User may need to reselect the theme.
+
+- Disabled reporting marking items as read if there isn't an issue.
+
+**1.5.4.05/06**
+
+- Translation fix.
+
+**1.5.4.04**
+
+- Fixing an issue with marking items as read (something related to an old version of selfoss).
+
+**1.5.4.03**
+
+- Trying to fix some issue with pre-launch reports. Reverted because it seems to be related to the dev console side.
+
+**1.5.4.02**
+
+- Fixing full height cards issue.
+
+**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
+
+**1.5.3.03**
+
+- Libs updates.
+
+- Translation fix.
+
+**1.5.3.01/02**
+
+- Added translation link to the settings page.
+
+- Added the translation link to the README.
+
+**1.5.3.00**
+
+- (BETA) Added pull from bottom to load more pages of results. May be buggy.
+
+**1.5.2.18/19**
+
+- APK minification finally working. That means less space taken !
+- Added an option to log every API call.
+
+**1.5.2.17**
+
+- Source code and tracker links weren't being set, and updated the contributing doc.
+
+**1.5.2.15/16**
+
+- Adding an account header on the lateral drawer.
+
+- The account header is only displayed when the setting is enabled.
+
+**1.5.2.13/14**
+
+- Updated glide.
+
+- Loading images from self signed certificate now working.
+
+**1.5.2.12**
+
+- Self signed certificates are now working for loading data. Image are not loading yet.
+
+**1.5.2.11**
+
+- Added a random unique identifier to be used in the logs.
+
+**1.5.2.08/09/10**
+
+- Added settable logs for reading articles problems.
+
+**1.5.2.07**
+
+- Added the ability to choose the number of items loaded (the maximum value is 200 and is imposed by the selfoss api)
+
+**1.5.2.06**
+
+- Fix problem introduced in 1.5.2.04. SVG file not working on older versions of android.
+
+**1.5.2.05**
+
+- Versions updates
+
+**1.5.2.04**
+
+- Reverted to the old icon.
+
+- Better icon for the intro activity.
+
+- Updated gradle version.
+
+**1.5.2.03**
+
+- Added the ability to accept self signed certificates. (Needs more testing)
+
+**1.5.2.02**
+
+- Added optional login option.
+
+**1.5.2.01**
+
+- New (Better) Icon !
+
+**1.5.2.0**
+
+- New Icon !
+
+**1.5.1.9/10/11**
+
+- Hiding the unread badge when marking all items as read.
+
+**1.5.1.8**
+
+- Fixes and libs updates.
+
+**1.5.1.7**
+
+- Bug fixes.
+
+- Code cleaning
+
+**1.5.1.6**
+
+- Added back the badges after it was fixed on the library side.
+
+**1.5.1.5**
+
+- THEMES !!!! For now, the app has predefined themes. You can ask for new ones until I make them dynamic.
+
+**1.5.1.3/4**
+
+- Fixes introduces by the previous alpha (1.5.1.2)
+
+**1.5.1.2**
+
+- Added testing to the CI.
+
+- Code cleaning
+
+- Display the pull to refresh loader on api call
+
+- Fixes :
+
+  - Can't pull down to refresh on first launch
+
+  - Recurring crash because of the url
+
+  - Couldn't open some urls because of missing "http"
+
+  - Adding a source with invalid url would crash
+
+
+**1.5.1.1**
+
+- Fixed an issue when trying to add a source without being logged in.
+
+- Reloading drawer tags badges on slide to refresh.
+
+**1.5.1**
+
+- Added a drawer for filtering sources and tags.
+
+- You can now search for items from the toolbar.
+
+**1.5.0.2**
+
+- If the content in the article viewer is empty, the article will open in a custom tab.
+
+- Added a share button, and an "open in browser" button to the bottom of the article viewer.
+
+- Updated custom tab code.
+
+**1.5.0.1**
+
+- The release APK wasn't working at all.
+
+**1.5.0.0**
+
+_New_
+
+- The app is now open source ! And rewritten in Kotlin !
+
+**1.4.0.9**
+
+_Fixes_
+
+- Fixes and missing translations.
+
+**1.4.0.8**
+
+_New_
+
+- Added setting for full height and fixed height cards size.
+
+_Fixed_
+
+- Action Bar color now matches the primary color on the recent apps screen.
+
+- Added a bottom margin to de article viewer content
+
+- Multiple fixes for the new article viewer.
+
+**1.4.0.7**
+
+_Fixed_
+
+- Disable swipe to hide from other "tabs" and avoid badges problems
+
+- Fixed a bug with the new Article viewer with some displaying fixes
+
+
+**1.4.0.6**
+
+_New_
+
+- Added the ability to use http authentication (Basic and Digest)
+
+_Fixed_
+
+- Fixed gitter link
+
+- Change the article viewer because the other was causing crashes
+
+**1.4.0.5**
+
+_New_
+
+- Added an intro to the app.
+
+- Added the ability to test the app without a Selfoss instance.
+
+**1.4.0.4**
+
+_New_
+
+- Added the ability to have a github build. If the apk is a Github build, check for update and ask the user to download it (directly from the github page).
+
+_Changes_
+
+- The apk stating that the app wasn't installed from the store is only displayed on start.
+
+**1.4.0.3**
+
+_Fixed_
+
+- Fixed boolean problem.
+
+**1.4.0.2**
+
+_New_
+
+- The app is available in Dutch !
+
+_Fixed_
+
+- Fixed a bug with the articles states.
+
+**1.4.0.1**
+
+_New_
+
+- You can now help me translate the app ! There will be a dialog displayed the first time you open the app, and the link will still be available from the settings page.
+
+_Changes_
+
+- Changed the custom tabs color to dark orange to fix the wrong title color.
+
+_Fixes_
+
+- The badges now are shown even if the tab is selected.
+
+- Fixed feeds not reloading on app resume (caused by 1.4.0.0 changes).
+
+**1.4.0.0**
+
+_New_
+
+- Added a setting to enable/disable the article viewer when the internal browser is enabled.
+
+- Added peek to the card view.
+
+- Text drawable if no icon.
+
+
+_Changes_
+
+- Changed the external browser setting to internal browser and handled the change on first open.
+
+- Some text changes.
+
+- Better animations handling on slow networks.
+
+...
+
+**1.3.3.5**
+
+_New_
+
+- Added tab bar badges with settings to display them.
+
+- Added invites.
+
+_Fixes_
+
+- Fixed a typo.
+
+_Updates_
+
+- Updated support library to 10.2.0.
+
+- Updated firebase to 10.2.0.
+
+- Updated article_viewer to 0.20.1.
+
+- Updated bottom-bar to 2.1.1.
+
+
+**1.3.3.4**
+
+...
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..30ace6a
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/README.md b/README.md
index 9ab8678..ab45c30 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,47 @@
-# ReaderForSelfoss-multiplatform
\ No newline at end of file
+# ReaderForSelfoss-multiplatform
+
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
+
+It's an RSS Reader for Android, that **only** works with [Selfoss](https://selfoss.aditu.de/)
+
+**The project is not dead at all.**
+
+I still want to work on it, but for the last few months, I didn't have that much time to do so.
+
+If you are a developer, don't hesitate to help with PRs.
+
+If you are a user, you can still create new issues. I'll fix them when I can.
+
+<a href="https://f-droid.org/packages/bou.amine.apps.readerforselfossv2.android"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
+
+## Screen captures
+
+<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
+
+## Like my app ?
+
+<a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
+
+## Want to help ?
+
+1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
+
+2. Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md).
+
+3. Build the project by following [these steps](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
+
+## Useful links
+
+- [Check what changed](https://github.com/aminecmi/ReaderforSelfoss/blob/master/CHANGELOG.md)
+- [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
+- [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
+- [Help translation the app](https://crowdin.com/project/readerforselfoss)
+
+## Contributors (Alphabetical order) ❤️
+
+- [@aancel](https://github.com/aancel)
+- [@Binnette](https://github.com/Binnette)
+- [@davidoskky](https://github.com/davidoskky)
+- [@hectorgabucio](https://github.com/hectorgabucio)
+- [@licaon-kter](https://github.com/licaon-kter)
+- [@sergey-babkin](https://github.com/sergey-babkin)
diff --git a/androidApp/.gitignore b/androidApp/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/androidApp/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/androidApp/build.sh b/androidApp/build.sh
new file mode 100755
index 0000000..abdea4d
--- /dev/null
+++ b/androidApp/build.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+git fetch --tags -p
+
+BASE_VERSION="1.7"
+LAST_TAG=$(git tag -l | sort -V | tail -1)
+
+INITIAL_VERSION="${BASE_VERSION//./}$(date '+%y%m%j')"
+
+LAST_DAY_VERSION=$(echo $LAST_TAG | sed "s/v${INITIAL_VERSION}//")
+LAST_DAY_VERSION_LENGTH=$(echo "${#LAST_DAY_VERSION}")
+
+if [[ "$LAST_DAY_VERSION_LENGTH" == "1" ]]
+then
+    TODAYS_VERSION=$(( $LAST_DAY_VERSION + 1 ))
+else
+    TODAYS_VERSION="1"
+fi
+
+VERSION="${INITIAL_VERSION}${TODAYS_VERSION}"
+
+PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//')
+
+./version.sh ${VERSION} ${PARAMS_EXCEPT_PUBLISH}
+
+if [[ "$@" == *'--publish'* ]]
+then
+    ./publish-version.sh ${VERSION}
+else
+    echo "Did not publish. If you wanted to do so, call the script with \"--publish\" or \"--publish-local\"."
+fi
diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro
new file mode 100644
index 0000000..0b3ee7b
--- /dev/null
+++ b/androidApp/proguard-rules.pro
@@ -0,0 +1,65 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/amine/apps/android-sdk-linux/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+#About libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
+
+-dontwarn okio.**
+-dontwarn retrofit2.Platform$Java8
+-keep class retrofit.** { *; }
+-keepclasseswithmembers class * {
+    @retrofit.http.* <methods>;
+}
+-keepattributes *Annotation*,Signature
+-keepattributes Exceptions
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+
+
+#Bottom bar lib
+-dontwarn com.roughike.bottombar.**
+
+
+# self signed glidemodule
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.AppGlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+-dontwarn com.anupcowkur.reservoir.**
+
+-dontwarn javax.annotation.**
+
+-keep class android.support.v7.widget.SearchView { *; }
+
+# maybe remove later ?
+-keep class * extends androidx.fragment.app.Fragment
diff --git a/androidApp/publish-version.sh b/androidApp/publish-version.sh
new file mode 100755
index 0000000..4d4c5b9
--- /dev/null
+++ b/androidApp/publish-version.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# NOTE: This is copy/pasted in jenkins
+
+rm -f version.txt
+printf "versionName=$1-github\nversionCode=$1" >> version.txt
+
+# You'll need to change server as your server and define a VERSION_PATH.
+scp version.txt server:$VERSION_PATH
+
+rm version.txt
diff --git a/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/1.json b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/1.json
new file mode 100644
index 0000000..b478c9e
--- /dev/null
+++ b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/1.json
@@ -0,0 +1,96 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "08ca537d7ac9d4dd216e8e395d70801a",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"08ca537d7ac9d4dd216e8e395d70801a\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/2.json b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/2.json
new file mode 100644
index 0000000..c9d43bc
--- /dev/null
+++ b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/2.json
@@ -0,0 +1,176 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "6fa6944b04100d68eab61039876a8804",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"6fa6944b04100d68eab61039876a8804\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
new file mode 100644
index 0000000..70d1621
--- /dev/null
+++ b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/3.json
@@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "7ad9c4961992c13b670128485ebb3efc",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"7ad9c4961992c13b670128485ebb3efc\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/4.json b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/4.json
new file mode 100644
index 0000000..051cd37
--- /dev/null
+++ b/androidApp/schemas/apps.amine.bou.readerforselfoss.persistence.database.AppDatabase/4.json
@@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "9cf8b03d32f80dfd58160599a1df197d",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"9cf8b03d32f80dfd58160599a1df197d\")"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/androidApp/schemas/bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase/4.json b/androidApp/schemas/bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase/4.json
new file mode 100644
index 0000000..7b7d406
--- /dev/null
+++ b/androidApp/schemas/bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase/4.json
@@ -0,0 +1,226 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "9cf8b03d32f80dfd58160599a1df197d",
+    "entities": [
+      {
+        "tableName": "tags",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
+        "fields": [
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "tag"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "sources",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spout",
+            "columnName": "spout",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "error",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "items",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datetime",
+            "columnName": "datetime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thumbnail",
+            "columnName": "thumbnail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourcetitle",
+            "columnName": "sourcetitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "actions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "articleId",
+            "columnName": "articleid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "read",
+            "columnName": "read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "starred",
+            "columnName": "starred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unstarred",
+            "columnName": "unstarred",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9cf8b03d32f80dfd58160599a1df197d')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/AddSourceEspressoTest.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/AddSourceEspressoTest.kt
new file mode 100644
index 0000000..11a8688
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/AddSourceEspressoTest.kt
@@ -0,0 +1,3 @@
+package bou.amine.apps.readerforselfossv2.android
+
+// TODO: test source adding
\ No newline at end of file
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt
new file mode 100644
index 0000000..79cd207
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt
@@ -0,0 +1,102 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressKey
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import android.view.KeyEvent
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class HomeActivityEspressoTest {
+    lateinit var context: Context
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(HomeActivity::class.java, true, false)
+
+    @Before
+    fun clearData() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        val editor =
+                context
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
+        editor.clear()
+
+        editor.putString("url", BuildConfig.LOGIN_URL)
+        editor.putString("login", BuildConfig.LOGIN_USERNAME)
+        editor.putString("password", BuildConfig.LOGIN_PASSWORD)
+
+        editor.commit()
+
+        Intents.init()
+    }
+
+    @Test
+    fun menuItems() {
+
+        rule.launchActivity(Intent())
+
+        onView(
+                withMenu(
+                        id = R.id.action_search,
+                        titleId = R.string.menu_home_search
+                )
+        ).perform(click())
+
+        onView(withId(R.id.search_bar)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.search_src_text)).perform(
+                typeText("android"),
+                pressKey(KeyEvent.KEYCODE_SEARCH),
+                closeSoftKeyboard()
+        )
+
+        onView(withContentDescription(R.string.abc_toolbar_collapse_description)).perform(click())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withMenu(id = R.id.refresh, titleId = R.string.menu_home_refresh))
+                .perform(click())
+
+        onView(withText(android.R.string.ok))
+            .inRoot(isDialog()).check(matches(isDisplayed())).perform(click())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withText(R.string.action_disconnect)).perform(click())
+
+        intended(hasComponent(LoginActivity::class.java.name))
+    }
+
+    // TODO: test articles opening and actions for cards and lists
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt
new file mode 100644
index 0000000..e64adb3
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt
@@ -0,0 +1,180 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import com.mikepenz.aboutlibraries.ui.LibsActivity
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LoginActivityEspressoTest {
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(LoginActivity::class.java, true, false)
+
+    private lateinit var context: Context
+    private lateinit var url: String
+    private lateinit var username: String
+    private lateinit var password: String
+
+    @Before
+    fun setUp() {
+        context = InstrumentationRegistry.getInstrumentation().targetContext
+        val editor =
+                context
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
+        editor.clear()
+        editor.commit()
+
+
+        url = BuildConfig.LOGIN_URL
+        username = BuildConfig.LOGIN_USERNAME
+        password = BuildConfig.LOGIN_PASSWORD
+
+        Intents.init()
+    }
+
+    @Test
+    fun menuItems() {
+
+        rule.launchActivity(Intent())
+
+        openActionBarOverflowOrOptionsMenu(context)
+
+        onView(withText(R.string.action_about)).perform(click())
+
+        intended(hasComponent(LibsActivity::class.java.name), times(1))
+
+        onView(isRoot()).perform(pressBack())
+
+        intended(hasComponent(LoginActivity::class.java.name))
+    }
+
+    @Test
+    fun wrongLoginUrl() {
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.loginProgress))
+                .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText("WRONGURL"))
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.urlView)).check(matches(isHintOrErrorEnabled()))
+    }
+
+    // TODO: Add tests for multiple false urls with dialog
+
+    @Test
+    fun emptyAuthData() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.loginView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.passwordView)).check(
+                matches(
+                        isHintOrErrorEnabled()
+                )
+        )
+    }
+
+    @Test
+    fun wrongAuthData() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText("WRONGPASS"),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        onView(withId(R.id.urlView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.loginView)).check(matches(isHintOrErrorEnabled()))
+        onView(withId(R.id.passwordView)).check(matches(isHintOrErrorEnabled()))
+    }
+
+    @Test
+    fun workingAuth() {
+
+        rule.launchActivity(Intent())
+
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+
+        onView(withId(R.id.withLogin)).perform(click())
+
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText(password),
+                closeSoftKeyboard()
+        )
+
+        onView(withId(R.id.signInButton)).perform(click())
+
+        Thread.sleep(2000)
+        intended(hasComponent(HomeActivity::class.java.name))
+    }
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt
new file mode 100644
index 0000000..1400a0e
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt
@@ -0,0 +1,81 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import bou.amine.apps.readerforselfossv2.android.HomeActivity
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+import bou.amine.apps.readerforselfossv2.android.MainActivity
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import org.junit.After
+
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityEspressoTest {
+
+    lateinit var intent: Intent
+    lateinit var preferencesEditor: SharedPreferences.Editor
+    private lateinit var url: String
+    private lateinit var username: String
+    private lateinit var password: String
+
+    @Rule @JvmField
+    val rule = ActivityTestRule(MainActivity::class.java, true, false)
+
+    @Before
+    fun setUp() {
+        intent = Intent()
+        val context = getInstrumentation().targetContext
+
+        // create a SharedPreferences editor
+        preferencesEditor = context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE).edit()
+
+        url = BuildConfig.LOGIN_URL
+        username = BuildConfig.LOGIN_USERNAME
+        password = BuildConfig.LOGIN_PASSWORD
+
+        Intents.init()
+    }
+
+    @Test
+    fun checkFirstOpenLaunchesIntro() {
+        preferencesEditor.putString("url", "")
+        preferencesEditor.putString("password", "")
+        preferencesEditor.putString("login", "")
+        preferencesEditor.commit()
+
+        rule.launchActivity(intent)
+
+        intended(hasComponent(LoginActivity::class.java.name))
+        intended(hasComponent(HomeActivity::class.java.name), times(0))
+    }
+
+    @Test
+    fun checkNotFirstOpenLaunchesLogin() {
+        preferencesEditor.putString("url", url)
+        preferencesEditor.putString("password", password)
+        preferencesEditor.putString("login", username)
+        preferencesEditor.commit()
+
+        rule.launchActivity(intent)
+
+        intended(hasComponent(MainActivity::class.java.name))
+        intended(hasComponent(HomeActivity::class.java.name))
+    }
+
+    @After
+    fun releaseIntents() {
+        Intents.release()
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt
new file mode 100644
index 0000000..b8fd12a
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt
@@ -0,0 +1,29 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import androidx.test.espresso.matcher.ViewMatchers
+import android.view.View
+import android.widget.EditText
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers
+import org.hamcrest.TypeSafeMatcher
+
+fun isHintOrErrorEnabled(): Matcher<View> =
+        object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description?) {
+            }
+
+            override fun matchesSafely(item: View?): Boolean {
+                if (item !is EditText) {
+                    return false
+                }
+
+                return item.error.isNotEmpty()
+            }
+        }
+
+fun withMenu(id: Int, titleId: Int): Matcher<View> =
+        Matchers.anyOf(
+                ViewMatchers.withId(id),
+                ViewMatchers.withText(titleId)
+        )
diff --git a/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/utils/DateUtilsTest.kt b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/utils/DateUtilsTest.kt
new file mode 100644
index 0000000..f599393
--- /dev/null
+++ b/androidApp/src/androidTest/java/apps/amine/bou/readerforselfoss/utils/DateUtilsTest.kt
@@ -0,0 +1,31 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.parseDate
+import org.junit.Test
+
+class DateUtilsTest {
+
+    @Test
+    fun parseDateV4() {
+
+        Config.apiVersion = 4
+        val dateString = "2013-04-07T13:43:00+01:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds : Long = 1365338580000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+
+    @Test
+    fun parseDateV1() {
+        Config.apiVersion = 0
+        val dateString = "2013-04-07 13:43:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds = 1365342180000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 82fe01a..f2e3130 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -6,16 +6,81 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:allowBackup="false"
+        android:name=".MyApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"
+            android:theme="@style/SplashTheme"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
+        <activity
+            android:name=".LoginActivity"
+            android:label="@string/title_activity_login">
+        </activity>
+        <activity android:name=".HomeActivity">
+        </activity>
+        <activity
+            android:name=".settings.SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".HomeActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".HomeActivity" />
+        </activity>
+        <activity
+            android:name=".SourcesActivity"
+            android:parentActivityName=".HomeActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".HomeActivity" />
+        </activity>
+        <activity
+            android:name=".AddSourceActivity"
+            android:parentActivityName=".SourcesActivity"
+            android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".SourcesActivity" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ReaderActivity">
+        </activity>
+        <activity
+            android:name=".ImageActivity">
+        </activity>
+
+        <meta-data
+            android:name="bou.amine.apps.readerforselfossv2.android.utils.glide.SelfSignedGlideModule"
+            android:value="GlideModule" />
+
+        <meta-data android:name="android.webkit.WebView.MetricsOptOut"
+            android:value="true" />
+
+        <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="true" />
+
+        <meta-data android:name="android.max_aspect" android:value="2.1" />
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/androidApp/src/main/ic_launcher-web.png b/androidApp/src/main/ic_launcher-web.png
new file mode 100644
index 0000000..a149479
Binary files /dev/null and b/androidApp/src/main/ic_launcher-web.png differ
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/AddSourceActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/AddSourceActivity.kt
new file mode 100644
index 0000000..2067b1c
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/AddSourceActivity.kt
@@ -0,0 +1,266 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.preference.PreferenceManager
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.appcompat.app.AppCompatActivity
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.ProgressBar
+import android.widget.Spinner
+import android.widget.TextView
+import android.widget.Toast
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Spout
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SuccessResponse
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
+import com.ftinc.scoop.Scoop
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
+
+
+class AddSourceActivity : AppCompatActivity() {
+
+    private var mSpoutsValue: String? = null
+    private lateinit var api: SelfossApi
+
+    private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityAddSourceBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(this@AddSourceActivity)
+
+        super.onCreate(savedInstanceState)
+        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        val drawable = binding.nameInput.background
+        drawable.setTint(appColors.colorAccent)
+
+
+        // TODO: clean
+        binding.nameInput.background = drawable
+
+        val drawable1 = binding.sourceUri.background
+        drawable1.setTint(appColors.colorAccent)
+
+        binding.sourceUri.background = drawable1
+
+        val drawable2 = binding.tags.background
+        drawable2.setTint(appColors.colorAccent)
+
+        binding.tags.background = drawable2
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        try {
+            val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+            val settings =
+                getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            api = SelfossApi(
+                this,
+                this@AddSourceActivity,
+                settings.getBoolean("isSelfSignedCert", false),
+                prefs.getString("api_timeout", "-1")!!.toLong()
+            )
+        } catch (e: IllegalArgumentException) {
+            mustLoginToAddSource()
+        }
+
+        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
+
+        binding.saveBtn.setTextColor(appColors.colorAccent)
+
+        binding.saveBtn.setOnClickListener {
+            handleSaveSource(binding.tags, binding.nameInput.text.toString(), binding.sourceUri.text.toString(), api)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val config = Config(this)
+
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(this@AddSourceActivity)) {
+            mustLoginToAddSource()
+        } else {
+            handleSpoutsSpinner(binding.spoutsSpinner, api, binding.progress, binding.formContainer)
+        }
+    }
+
+    private fun handleSpoutsSpinner(
+        spoutsSpinner: Spinner,
+        api: SelfossApi?,
+        mProgress: ProgressBar,
+        formContainer: ConstraintLayout
+    ) {
+        val spoutsKV = HashMap<String, String>()
+        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
+                if (view != null) {
+                    val spoutName = (view as TextView).text.toString()
+                    mSpoutsValue = spoutsKV[spoutName]
+                }
+            }
+
+            override fun onNothingSelected(adapterView: AdapterView<*>) {
+                mSpoutsValue = null
+            }
+        }
+
+        var items: Map<String, Spout>
+        api!!.spouts().enqueue(object : Callback<Map<String, Spout>> {
+            override fun onResponse(
+                call: Call<Map<String, Spout>>,
+                response: Response<Map<String, Spout>>
+            ) {
+                if (response.body() != null) {
+                    items = response.body()!!
+
+                    val itemsStrings = items.map { it.value.name }
+                    for ((key, value) in items) {
+                        spoutsKV[value.name] = key
+                    }
+
+                    mProgress.visibility = View.GONE
+                    formContainer.visibility = View.VISIBLE
+
+                    val spinnerArrayAdapter =
+                        ArrayAdapter(
+                            this@AddSourceActivity,
+                            android.R.layout.simple_spinner_item,
+                            itemsStrings
+                        )
+                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    spoutsSpinner.adapter = spinnerArrayAdapter
+                } else {
+                    handleProblemWithSpouts()
+                }
+            }
+
+            override fun onFailure(call: Call<Map<String, Spout>>, t: Throwable) {
+                handleProblemWithSpouts()
+            }
+
+            private fun handleProblemWithSpouts() {
+                Toast.makeText(
+                    this@AddSourceActivity,
+                    R.string.cant_get_spouts,
+                    Toast.LENGTH_SHORT
+                ).show()
+                mProgress.visibility = View.GONE
+            }
+        })
+    }
+
+    private fun maybeGetDetailsFromIntentSharing(
+        intent: Intent,
+        sourceUri: EditText,
+        nameInput: EditText
+    ) {
+        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
+            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+        }
+    }
+
+    private fun mustLoginToAddSource() {
+        Toast.makeText(this, getString(R.string.addStringNoUrl), Toast.LENGTH_SHORT).show()
+        val i = Intent(this, LoginActivity::class.java)
+        startActivity(i)
+        finish()
+    }
+
+    private fun handleSaveSource(tags: EditText, title: String, url: String, api: SelfossApi) {
+
+        val sourceDetailsUnavailable =
+            title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
+
+        when {
+            sourceDetailsUnavailable -> {
+                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+            }
+            PreferenceManager.getDefaultSharedPreferences(this).getInt("apiVersionMajor", 0) > 1 -> {
+                val tagList = tags.text.toString().split(",").map { it.trim() }
+                api.createSourceApi2(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tagList,
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
+            }
+            else -> {
+                api.createSource(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tags.text.toString(),
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
+            }
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
new file mode 100644
index 0000000..8178cf7
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt
@@ -0,0 +1,1294 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.net.Uri
+import android.os.Bundle
+import androidx.preference.PreferenceManager
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.doOnNextLayout
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.recyclerview.widget.*
+import androidx.room.Room
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import bou.amine.apps.readerforselfossv2.android.adapters.ItemCardAdapter
+import bou.amine.apps.readerforselfossv2.android.adapters.ItemListAdapter
+import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.*
+import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
+import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
+import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.longHash
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import bou.amine.apps.readerforselfossv2.android.utils.persistence.toEntity
+import bou.amine.apps.readerforselfossv2.android.utils.persistence.toView
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.*
+import com.ashokvarma.bottomnavigation.BottomNavigationBar
+import com.ashokvarma.bottomnavigation.BottomNavigationItem
+import com.ashokvarma.bottomnavigation.TextBadgeItem
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import com.ftinc.scoop.Scoop
+import com.mikepenz.aboutlibraries.LibsBuilder
+import com.mikepenz.materialdrawer.holder.BadgeStyle
+import com.mikepenz.materialdrawer.holder.ColorHolder
+import com.mikepenz.materialdrawer.holder.StringHolder
+import com.mikepenz.materialdrawer.model.DividerDrawerItem
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
+import com.mikepenz.materialdrawer.model.ProfileDrawerItem
+import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
+import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
+import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import com.mikepenz.materialdrawer.util.addStickyFooterItem
+import com.mikepenz.materialdrawer.util.updateBadge
+import com.mikepenz.materialdrawer.widget.AccountHeaderView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.concurrent.TimeUnit
+import kotlin.concurrent.thread
+
+class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
+
+    private val MENU_PREFERENCES = 12302
+    private val DRAWER_ID_TAGS = 100101L
+    private val DRAWER_ID_HIDDEN_TAGS = 101100L
+    private val DRAWER_ID_SOURCES = 100110L
+    private val DRAWER_ID_FILTERS = 100111L
+    private val UNREAD_SHOWN = 1
+    private val READ_SHOWN = 2
+    private val FAV_SHOWN = 3
+
+    private var items: ArrayList<Item> = ArrayList()
+    private var allItems: ArrayList<Item> = ArrayList()
+
+    private var internalBrowser = false
+    private var articleViewer = false
+    private var shouldBeCardView = false
+    private var displayUnreadCount = false
+    private var displayAllCount = false
+    private var fullHeightCards: Boolean = false
+    private var itemsNumber: Int = 200
+    private var elementsShown: Int = 1
+    private var userIdentifier: String = ""
+    private var displayAccountHeader: Boolean = false
+    private var infiniteScroll: Boolean = false
+    private var lastFetchDone: Boolean = false
+    private var itemsCaching: Boolean = false
+    private var updateSources: Boolean = true
+    private var markOnScroll: Boolean = false
+    private var hiddenTags: List<String> = emptyList()
+    private var apiVersionMajor: Int = 0
+
+    private var periodicRefresh = false
+    private var refreshMinutes: Long = 360L
+    private var refreshWhenChargingOnly = false
+
+    private lateinit var tabNewBadge: TextBadgeItem
+    private lateinit var tabArchiveBadge: TextBadgeItem
+    private lateinit var tabStarredBadge: TextBadgeItem
+    private lateinit var api: SelfossApi
+    private lateinit var customTabActivityHelper: CustomTabActivityHelper
+    private lateinit var editor: SharedPreferences.Editor
+    private lateinit var sharedPref: SharedPreferences
+    private lateinit var appColors: AppColors
+    private var offset: Int = 0
+    private var firstVisible: Int = 0
+    private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
+    private lateinit var settings: SharedPreferences
+    private lateinit var binding: ActivityHomeBinding
+
+    private var recyclerAdapter: RecyclerView.Adapter<*>? = null
+
+    private var fromTabShortcut: Boolean = false
+    private var offlineShortcut: Boolean = false
+
+    private lateinit var tagsBadge: Map<Long, Int>
+
+    private lateinit var db: AppDatabase
+
+    private lateinit var config: Config
+
+    data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)
+
+    override fun onStart() {
+        super.onStart()
+        customTabActivityHelper.bindCustomTabsService(this)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(this@HomeActivity)
+        config = Config(this@HomeActivity)
+
+        super.onCreate(savedInstanceState)
+        binding = ActivityHomeBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
+        offlineShortcut =  intent.getBooleanExtra("startOffline", false)
+
+        if (fromTabShortcut) {
+            elementsShown = intent.getIntExtra("shortcutTab", UNREAD_SHOWN)
+        }
+
+        setContentView(view)
+
+        handleThemeBinding()
+
+        setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeButtonEnabled(true)
+        val mDrawerToggle = ActionBarDrawerToggle(this, binding.drawerContainer, binding.toolBar, R.string.material_drawer_open, R.string.material_drawer_close)
+        binding.drawerContainer.addDrawerListener(mDrawerToggle)
+        mDrawerToggle.syncState()
+
+        db = Room.databaseBuilder(
+            applicationContext,
+            AppDatabase::class.java, "selfoss-database"
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+
+
+        customTabActivityHelper = CustomTabActivityHelper()
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+        api = SelfossApi(
+            this,
+            this@HomeActivity,
+            settings.getBoolean("isSelfSignedCert", false),
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
+        items = ArrayList()
+        allItems = ArrayList()
+
+        handleBottomBar()
+        handleDrawer()
+
+        handleSwipeRefreshLayout()
+
+        handleSharedPrefs()
+
+        getApiMajorVersion()
+
+        getElementsAccordingToTab()
+    }
+
+    private fun handleSwipeRefreshLayout() {
+        binding.swipeRefreshLayout.setColorSchemeResources(
+            R.color.refresh_progress_1,
+            R.color.refresh_progress_2,
+            R.color.refresh_progress_3
+        )
+        binding.swipeRefreshLayout.setOnRefreshListener {
+            offlineShortcut = false
+            allItems = ArrayList()
+            lastFetchDone = false
+            handleDrawerItems()
+            CoroutineScope(Dispatchers.Main).launch {
+                refreshFocusedItems(applicationContext, api, db, itemsNumber)
+                getElementsAccordingToTab()
+                binding.swipeRefreshLayout.isRefreshing = false
+            }
+        }
+
+        val simpleItemTouchCallback =
+            object : ItemTouchHelper.SimpleCallback(
+                0,
+                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+            ) {
+                override fun getSwipeDirs(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder
+                ): Int =
+                    if (elementsShown == FAV_SHOWN) {
+                        0
+                    } else {
+                        super.getSwipeDirs(
+                            recyclerView,
+                            viewHolder
+                        )
+                    }
+
+                override fun onMove(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder
+                ): Boolean = false
+
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
+                    val position = viewHolder.bindingAdapterPosition
+                    val i = items.elementAtOrNull(position)
+
+                    if (i != null) {
+                        val adapter = binding.recyclerView.adapter as ItemsAdapter<*>
+
+                        adapter.handleItemAtIndex(position)
+
+                        reloadBadgeContent()
+
+                        val tagHashes = i.tags.tags.split(",").map { it.longHash() }
+                        tagsBadge = tagsBadge.map {
+                            if (tagHashes.contains(it.key)) {
+                                (it.key to (it.value - 1))
+                            } else {
+                                (it.key to it.value)
+                            }
+                        }.toMap()
+                        reloadTagsBadges()
+
+                        // Just load everythin
+                        if (items.size <= 0) {
+                            getElementsAccordingToTab()
+                        }
+                    } else {
+                        Toast.makeText(
+                            this@HomeActivity,
+                            "Found null when swiping at positon $position.",
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                }
+            }
+
+        ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
+    }
+
+    private fun handleBottomBar() {
+
+        tabNewBadge = TextBadgeItem()
+            .setText("")
+            .setHideOnSelect(false).hide(false)
+            .setBackgroundColor(appColors.colorPrimary)
+        tabArchiveBadge = TextBadgeItem()
+            .setText("")
+            .setHideOnSelect(false).hide(false)
+            .setBackgroundColor(appColors.colorPrimary)
+        tabStarredBadge = TextBadgeItem()
+            .setText("")
+            .setHideOnSelect(false).hide(false)
+            .setBackgroundColor(appColors.colorPrimary)
+
+        val tabNew =
+            BottomNavigationItem(
+                R.drawable.ic_tab_fiber_new_black_24dp,
+                getString(R.string.tab_new)
+            ).setActiveColor(appColors.colorAccent)
+                .setBadgeItem(tabNewBadge)
+        val tabArchive =
+            BottomNavigationItem(
+                R.drawable.ic_tab_archive_black_24dp,
+                getString(R.string.tab_read)
+            ).setActiveColor(appColors.colorAccentDark)
+                .setBadgeItem(tabArchiveBadge)
+        val tabStarred =
+            BottomNavigationItem(
+                R.drawable.ic_tab_favorite_black_24dp,
+                getString(R.string.tab_favs)
+            ).setActiveColorResource(R.color.pink)
+                .setBadgeItem(tabStarredBadge)
+
+        binding.bottomBar
+            .addItem(tabNew)
+            .addItem(tabArchive)
+            .addItem(tabStarred)
+            .setFirstSelectedPosition(0)
+            .initialise()
+        binding.bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
+        binding.bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)
+
+        if (fromTabShortcut) {
+            binding.bottomBar.selectTab(elementsShown - 1)
+        }
+    }
+
+    private fun getApiMajorVersion() {
+        api.apiVersion.enqueue(object : Callback<ApiVersion> {
+            override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
+                Config.apiVersion = apiVersionMajor
+            }
+
+            override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
+                if(response.body() != null) {
+                    val version = response.body() as ApiVersion
+                    apiVersionMajor = version.getApiMajorVersion()
+                    sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).apply()
+
+                    Config.apiVersion = apiVersionMajor
+                }
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        // TODO: Make this the only appcolors init
+        appColors = AppColors(this@HomeActivity)
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+
+        editor = settings.edit()
+
+        handleDrawerItems()
+
+        handleThemeUpdate()
+
+        reloadLayoutManager()
+
+        if (!infiniteScroll) {
+            binding.recyclerView.setHasFixedSize(true)
+        } else {
+            handleInfiniteScroll()
+        }
+
+        handleBottomBarActions()
+
+        handleRecurringTask()
+
+        handleOfflineActions()
+
+        getElementsAccordingToTab()
+    }
+
+    private fun getAndStoreAllItems() {
+         CoroutineScope(Dispatchers.Main).launch {
+             binding.swipeRefreshLayout.isRefreshing = true
+             getAndStoreAllItems(applicationContext ,api, db)
+             this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)
+             handleListResult()
+             binding.swipeRefreshLayout.isRefreshing = false
+             SharedItems.updateDatabase(db)
+         }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        customTabActivityHelper.unbindCustomTabsService(this)
+    }
+
+    private fun handleSharedPrefs() {
+        internalBrowser = sharedPref.getBoolean("prefer_internal_browser", true)
+        articleViewer = sharedPref.getBoolean("prefer_article_viewer", true)
+        shouldBeCardView = sharedPref.getBoolean("card_view_active", false)
+        displayUnreadCount = sharedPref.getBoolean("display_unread_count", true)
+        displayAllCount = sharedPref.getBoolean("display_other_count", false)
+        fullHeightCards = sharedPref.getBoolean("full_height_cards", false)
+        itemsNumber = sharedPref.getString("prefer_api_items_number", "200")!!.toInt()
+        userIdentifier = sharedPref.getString("unique_id", "")!!
+        displayAccountHeader = sharedPref.getBoolean("account_header_displaying", false)
+        infiniteScroll = sharedPref.getBoolean("infinite_loading", false)
+        itemsCaching = sharedPref.getBoolean("items_caching", false)
+        SharedItems.itemsCaching = itemsCaching
+        updateSources = sharedPref.getBoolean("update_sources", true)
+        markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
+        hiddenTags = if (sharedPref.getString("hidden_tags", "")!!.isNotEmpty()) {
+            sharedPref.getString("hidden_tags", "")!!.replace("\\s".toRegex(), "").split(",")
+        } else {
+            emptyList()
+        }
+        periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
+        refreshWhenChargingOnly = sharedPref.getBoolean("refresh_when_charging", false)
+        refreshMinutes = sharedPref.getString("periodic_refresh_minutes", "360")!!.toLong()
+
+        if (refreshMinutes <= 15) {
+            refreshMinutes = 15
+        }
+
+        apiVersionMajor = sharedPref.getInt("apiVersionMajor", 0)
+    }
+
+    private fun handleThemeBinding() {
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+    }
+
+    private fun handleThemeUpdate() {
+
+        val scoop = Scoop.getInstance()
+        scoop.update(Toppings.PRIMARY.value, appColors.colorPrimary)
+
+        scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
+    }
+
+    private fun handleDrawer() {
+        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
+            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
+                Glide.with(this@HomeActivity)
+                        .asBitmap()
+                        .load(uri)
+                        .apply(RequestOptions()
+                                .placeholder(R.mipmap.ic_launcher)
+                                .fallback(R.mipmap.ic_launcher)
+                                .fitCenter())
+                        .into(imageView)
+            }
+
+            override fun cancel(imageView: ImageView) {
+                Glide.with(this@HomeActivity).clear(imageView)
+            }
+        })
+
+        val drawerListener = object : DrawerLayout.DrawerListener {
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+            }
+
+            override fun onDrawerOpened(drawerView: View) {
+                binding.bottomBar.hide()
+            }
+
+            override fun onDrawerClosed(drawerView: View) {
+                binding.bottomBar.show()
+            }
+
+            override fun onDrawerStateChanged(newState: Int) {
+            }
+
+        }
+
+        binding.drawerContainer.addDrawerListener(drawerListener)
+
+        displayAccountHeader =
+                PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean("account_header_displaying", false)
+
+        binding.mainDrawer.addStickyFooterItem(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.drawer_report_bug
+                iconRes = R.drawable.ic_bug_report_black_24dp
+                isIconTinted = true
+                onDrawerItemClickListener = { _, _, _ ->
+                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
+                    startActivity(browserIntent)
+                    false
+                }
+            })
+
+        binding.mainDrawer.addStickyFooterItem(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.title_activity_settings
+                iconRes = R.drawable.ic_settings_black_24dp
+                isIconTinted = true
+                onDrawerItemClickListener = { _, _, _ ->
+                    startActivity(Intent(this@HomeActivity, SettingsActivity::class.java))
+                    false
+                }
+            })
+
+        if (displayAccountHeader) {
+            AccountHeaderView(this).apply {
+                attachToSliderView(binding.mainDrawer)
+                addProfiles(
+                    ProfileDrawerItem().apply {
+                        nameText = settings.getString("url", "").toString()
+                        setBackgroundResource(R.drawable.bg)
+                        iconRes = R.mipmap.ic_launcher
+                        selectionListEnabledForSingleProfile = false
+                    }
+                )
+            }
+        }
+    }
+
+    private fun handleDrawerItems() {
+        tagsBadge = emptyMap()
+        fun handleDrawerData(maybeDrawerData: DrawerData?, loadedFromCache: Boolean = false) {
+            fun handleTags(maybeTags: List<Tag>?) {
+                if (maybeTags == null) {
+                    if (loadedFromCache) {
+                        binding.mainDrawer.itemAdapter.add(
+                            SecondaryDrawerItem()
+                                .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
+                        )
+                    }
+                } else {
+                    val filteredTags = maybeTags
+                        .filterNot { hiddenTags.contains(it.tag) }
+                        .sortedBy { it.unread == 0 }
+                    tagsBadge = filteredTags.map {
+                        val gd = GradientDrawable()
+                        val gdColor = try {
+                            Color.parseColor(it.color)
+                        } catch (e: IllegalArgumentException) {
+                            appColors.colorPrimary
+                        }
+
+                        gd.setColor(gdColor)
+                        gd.shape = GradientDrawable.RECTANGLE
+                        gd.setSize(30, 30)
+                        gd.cornerRadius = 30F
+                        val drawerItem =
+                            PrimaryDrawerItem()
+                                .apply {
+                                    nameText = it.getTitleDecoded()
+                                    identifier = it.tag.longHash()
+                                    iconDrawable = gd
+                                    badgeStyle = BadgeStyle().apply {
+                                        textColor = ColorHolder.fromColor(Color.WHITE)
+                                        color = ColorHolder.fromColor(appColors.colorAccent) }
+                                    onDrawerItemClickListener = { _,_,_ ->
+                                        allItems = ArrayList()
+                                        SharedItems.tagFilter = it.tag
+                                        SharedItems.sourceFilter = null
+                                        SharedItems.sourceIDFilter = null
+                                        getElementsAccordingToTab()
+                                        fetchOnEmptyList()
+                                        false
+                                    } }
+                        if (it.unread > 0) {
+                            drawerItem.badgeText = it.unread.toString()
+                        }
+
+                        binding.mainDrawer.itemAdapter.add(drawerItem)
+
+                        (it.tag.longHash() to it.unread)
+                    }.toMap()
+                }
+            }
+
+            fun handleHiddenTags(maybeTags: List<Tag>?) {
+                if (maybeTags == null) {
+                    if (loadedFromCache) {
+                        binding.mainDrawer.itemAdapter.add(
+                            SecondaryDrawerItem().apply {
+                                nameRes = R.string.drawer_error_loading_tags
+                                isSelectable = false
+                            }
+                        )
+                    }
+                } else {
+                    val filteredHiddenTags: List<Tag> =
+                        maybeTags.filter { hiddenTags.contains(it.tag) }
+                    tagsBadge = filteredHiddenTags.map {
+                        val gd = GradientDrawable()
+                        val gdColor = try {
+                            Color.parseColor(it.color)
+                        } catch (e: IllegalArgumentException) {
+                            appColors.colorPrimary
+                        }
+
+                        gd.setColor(gdColor)
+                        gd.shape = GradientDrawable.RECTANGLE
+                        gd.setSize(30, 30)
+                        gd.cornerRadius = 30F
+                        val drawerItem =
+                            PrimaryDrawerItem().apply {
+                                nameText = it.getTitleDecoded()
+                                identifier = it.tag.longHash()
+                                iconDrawable = gd
+                                badgeStyle = BadgeStyle().apply {
+                                    textColor = ColorHolder.fromColor(Color.WHITE)
+                                    color = ColorHolder.fromColor(appColors.colorAccent) }
+                                onDrawerItemClickListener = { _,_,_ ->
+                                    allItems = ArrayList()
+                                    SharedItems.tagFilter = it.tag
+                                    SharedItems.sourceFilter = null
+                                    SharedItems.sourceIDFilter = null
+                                    getElementsAccordingToTab()
+                                    fetchOnEmptyList()
+                                    false
+                                } }
+
+                        if (it.unread > 0) {
+                            drawerItem.badgeText = it.unread.toString()
+                        }
+                        binding.mainDrawer.itemAdapter.add(drawerItem)
+
+                        (it.tag.longHash() to it.unread)
+                    }.toMap()
+                }
+            }
+
+            fun handleSources(maybeSources: List<Source>?) {
+                if (maybeSources == null) {
+                    if (loadedFromCache) {
+                        binding.mainDrawer.itemAdapter.add(
+                            SecondaryDrawerItem().apply {
+                                nameRes = R.string.drawer_error_loading_sources
+                                isSelectable = false
+                            }
+                        )
+                    }
+                } else {
+                    for (source in maybeSources) {
+                        val item = PrimaryDrawerItem().apply {
+                            nameText = source.getTitleDecoded()
+                            identifier = source.id.toLong()
+                            iconUrl = source.getIcon(this@HomeActivity)
+                            onDrawerItemClickListener = { _,_,_ ->
+                                allItems = ArrayList()
+                                SharedItems.sourceIDFilter = source.id.toLong()
+                                SharedItems.sourceFilter = source.title
+                                SharedItems.tagFilter = null
+                                getElementsAccordingToTab()
+                                fetchOnEmptyList()
+                                false
+                            }
+                        }
+                        binding.mainDrawer.itemAdapter.add(item)
+                    }
+                }
+            }
+
+            binding.mainDrawer.itemAdapter.clear()
+            if (maybeDrawerData != null) {
+                binding.mainDrawer.itemAdapter.add(
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_filters
+                        isSelectable = false
+                        identifier = DRAWER_ID_FILTERS
+                        badgeRes = R.string.drawer_action_clear
+                        onDrawerItemClickListener = { _,_,_ ->
+                            allItems = ArrayList()
+                            SharedItems.sourceFilter = null
+                            SharedItems.sourceIDFilter = null
+                            SharedItems.tagFilter = null
+                            binding.mainDrawer.setSelectionAtPosition(-1)
+                            getElementsAccordingToTab()
+                            fetchOnEmptyList()
+                            false
+                        }
+                    }
+                )
+                if (hiddenTags.isNotEmpty()) {
+                    binding.mainDrawer.itemAdapter.add(
+                        DividerDrawerItem(),
+                        SecondaryDrawerItem().apply {
+                            nameRes = R.string.drawer_item_hidden_tags
+                            identifier = DRAWER_ID_HIDDEN_TAGS
+                            isSelectable = false
+                        }
+                    )
+                    handleHiddenTags(maybeDrawerData.tags)
+                }
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_tags
+                        identifier = DRAWER_ID_TAGS
+                        isSelectable = false
+                    }
+                )
+                handleTags(maybeDrawerData.tags)
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_sources
+                        identifier = DRAWER_ID_SOURCES
+                        isSelectable = false
+                        badgeRes = R.string.drawer_action_edit
+                        onDrawerItemClickListener = { v,_,_ ->
+                            startActivity(Intent(v!!.context, SourcesActivity::class.java))
+                            false
+                        }
+                    }
+                )
+                handleSources(maybeDrawerData.sources)
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    PrimaryDrawerItem().apply {
+                        nameRes = R.string.action_about
+                        isSelectable = false
+                        iconRes = R.drawable.ic_info_outline_white_24dp
+                        isIconTinted = true
+                        onDrawerItemClickListener = { _,_,_ ->
+                            LibsBuilder()
+                                .withAboutIconShown(true)
+                                .withAboutVersionShown(true)
+                                .start(this@HomeActivity)
+                            false
+                        }
+                    }
+                )
+
+                if (!loadedFromCache) {
+                    if (maybeDrawerData.tags != null) {
+                        thread {
+                            val tagEntities = maybeDrawerData.tags.map { it.toEntity() }
+                            db.drawerDataDao().deleteAllTags()
+                            db.drawerDataDao().insertAllTags(*tagEntities.toTypedArray())
+                        }
+                    }
+                    if (maybeDrawerData.sources != null) {
+                        thread {
+                            val sourceEntities =
+                                maybeDrawerData.sources.map { it.toEntity() }
+                            db.drawerDataDao().deleteAllSources()
+                            db.drawerDataDao().insertAllSources(*sourceEntities.toTypedArray())
+                        }
+                    }
+                }
+            } else {
+                if (!loadedFromCache) {
+                    binding.mainDrawer.itemAdapter.add(
+                        PrimaryDrawerItem().apply {
+                            nameRes = R.string.no_tags_loaded
+                            identifier = DRAWER_ID_TAGS
+                            isSelectable = false
+                        },
+                        PrimaryDrawerItem().apply {
+                            nameRes = R.string.no_sources_loaded
+                            identifier = DRAWER_ID_SOURCES
+                            isSelectable = false
+                        }
+                    )
+                }
+            }
+        }
+
+        fun drawerApiCalls(maybeDrawerData: DrawerData?) {
+            var tags: List<Tag>? = null
+            var sources: List<Source>?
+
+            fun sourcesApiCall() {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && updateSources) {
+                    api.sources.enqueue(object : Callback<List<Source>> {
+                        override fun onResponse(
+                            call: Call<List<Source>>?,
+                            response: Response<List<Source>>
+                        ) {
+                            sources = response.body()
+                            val apiDrawerData = DrawerData(tags, sources)
+                            if ((maybeDrawerData != null && maybeDrawerData != apiDrawerData) || maybeDrawerData == null) {
+                                handleDrawerData(apiDrawerData)
+                            }
+                        }
+
+                        override fun onFailure(call: Call<List<Source>>?, t: Throwable?) {
+                            val apiDrawerData = DrawerData(tags, null)
+                            if ((maybeDrawerData != null && maybeDrawerData != apiDrawerData) || maybeDrawerData == null) {
+                                handleDrawerData(apiDrawerData)
+                            }
+                        }
+                    })
+                }
+            }
+
+            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && updateSources) {
+                api.tags.enqueue(object : Callback<List<Tag>> {
+                    override fun onResponse(
+                        call: Call<List<Tag>>,
+                        response: Response<List<Tag>>
+                    ) {
+                        tags = response.body()
+                        sourcesApiCall()
+                    }
+
+                    override fun onFailure(call: Call<List<Tag>>?, t: Throwable?) {
+                        sourcesApiCall()
+                    }
+                })
+            }
+        }
+
+        binding.mainDrawer.itemAdapter.add(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.drawer_loading
+                isSelectable = false
+            }
+        )
+
+        thread {
+            val drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
+                                        db.drawerDataDao().sources().map { it.toView() })
+            runOnUiThread {
+                handleDrawerData(drawerData, loadedFromCache = true)
+                drawerApiCalls(drawerData)
+            }
+        }
+    }
+
+    private fun reloadLayoutManager() {
+        val currentManager = binding.recyclerView.layoutManager
+        val layoutManager: RecyclerView.LayoutManager
+
+        // This will only update the layout manager if settings changed
+        when (currentManager) {
+            is StaggeredGridLayoutManager ->
+                if (!shouldBeCardView) {
+                    layoutManager = GridLayoutManager(
+                        this,
+                        calculateNoOfColumns()
+                    )
+                    binding.recyclerView.layoutManager = layoutManager
+                }
+            is GridLayoutManager ->
+                if (shouldBeCardView) {
+                    layoutManager = StaggeredGridLayoutManager(
+                        calculateNoOfColumns(),
+                        StaggeredGridLayoutManager.VERTICAL
+                    )
+                    layoutManager.gapStrategy =
+                            StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                    binding.recyclerView.layoutManager = layoutManager
+                }
+            else ->
+                if (currentManager == null) {
+                    if (!shouldBeCardView) {
+                        layoutManager = GridLayoutManager(
+                            this,
+                            calculateNoOfColumns()
+                        )
+                        binding.recyclerView.layoutManager = layoutManager
+                    } else {
+                        layoutManager = StaggeredGridLayoutManager(
+                            calculateNoOfColumns(),
+                            StaggeredGridLayoutManager.VERTICAL
+                        )
+                        layoutManager.gapStrategy =
+                                StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS
+                        binding.recyclerView.layoutManager = layoutManager
+                    }
+                }
+        }
+    }
+
+    private fun handleBottomBarActions() {
+        binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener {
+            override fun onTabUnselected(position: Int) = Unit
+
+            override fun onTabReselected(position: Int) {
+                val layoutManager = binding.recyclerView.adapter
+
+                when (layoutManager) {
+                    is StaggeredGridLayoutManager ->
+                        if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) {
+                            getElementsAccordingToTab()
+                        } else {
+                            layoutManager.scrollToPositionWithOffset(0, 0)
+                        }
+                    is GridLayoutManager ->
+                        if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) {
+                            getElementsAccordingToTab()
+                        } else {
+                            layoutManager.scrollToPositionWithOffset(0, 0)
+                        }
+                    else -> Unit
+                }
+            }
+
+            override fun onTabSelected(position: Int) {
+                offset = 0
+                lastFetchDone = false
+
+                elementsShown = position + 1
+                getElementsAccordingToTab()
+                binding.recyclerView.scrollToPosition(0)
+
+                fetchOnEmptyList()
+            }
+        })
+    }
+
+    private fun fetchOnEmptyList() {
+        binding.recyclerView.doOnNextLayout {
+            if (SharedItems.focusedItems.size - 1 == getLastVisibleItem()) {
+                getElementsAccordingToTab(true)
+            }
+        }
+    }
+
+    private fun handleInfiniteScroll() {
+        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
+                if (dy > 0) {
+                    val lastVisibleItem = getLastVisibleItem()
+
+                    if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
+                        getElementsAccordingToTab(appendResults = true)
+                    }
+                }
+            }
+        }
+
+        binding.recyclerView.clearOnScrollListeners()
+        binding.recyclerView.addOnScrollListener(recyclerViewScrollListener)
+    }
+
+    private fun getLastVisibleItem() : Int {
+        val manager = binding.recyclerView.layoutManager
+        return when (manager) {
+            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
+                null
+            ).last()
+            is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
+            else -> 0
+        }
+    }
+
+    private fun mayBeEmpty() =
+        if (items.isEmpty()) {
+            binding.emptyText.visibility = View.VISIBLE
+        } else {
+            binding.emptyText.visibility = View.GONE
+        }
+
+    private fun getElementsAccordingToTab(
+        appendResults: Boolean = false,
+        offsetOverride: Int? = null
+    ) {
+        fun doGetAccordingToTab() {
+            when (elementsShown) {
+                UNREAD_SHOWN -> getUnRead(appendResults)
+                READ_SHOWN -> getRead(appendResults)
+                FAV_SHOWN -> getStarred(appendResults)
+                else -> getUnRead(appendResults)
+            }
+        }
+
+        offset = if (appendResults) {
+            SharedItems.focusedItems.size - 1
+        } else {
+            0
+        }
+        firstVisible = if (appendResults) firstVisible else 0
+
+        doGetAccordingToTab()
+    }
+
+    private fun getUnRead(appendResults: Boolean = false) {
+        CoroutineScope(Dispatchers.Main).launch {
+            if (appendResults || !SharedItems.fetchedUnread) {
+                binding.swipeRefreshLayout.isRefreshing = true
+                getUnreadItems(applicationContext, api, db, itemsNumber, offset)
+                binding.swipeRefreshLayout.isRefreshing = false
+            }
+            SharedItems.getUnRead()
+            items = SharedItems.focusedItems
+            handleListResult()
+        }
+    }
+
+    private fun getRead(appendResults: Boolean = false) {
+        CoroutineScope(Dispatchers.Main).launch {
+            if (appendResults || !SharedItems.fetchedAll) {
+                binding.swipeRefreshLayout.isRefreshing = true
+                getReadItems(applicationContext, api, db, itemsNumber, offset)
+                binding.swipeRefreshLayout.isRefreshing = false
+            }
+            SharedItems.getAll()
+            items = SharedItems.focusedItems
+            handleListResult()
+        }
+    }
+
+    private fun getStarred(appendResults: Boolean = false) {
+        CoroutineScope(Dispatchers.Main).launch {
+            if (appendResults || !SharedItems.fetchedStarred) {
+                binding.swipeRefreshLayout.isRefreshing = true
+                getStarredItems(applicationContext, api, db, itemsNumber, offset)
+                binding.swipeRefreshLayout.isRefreshing = false
+            }
+            SharedItems.getStarred()
+            items = SharedItems.focusedItems
+            handleListResult()
+        }
+    }
+
+    private fun handleListResult(appendResults: Boolean = false) {
+        if (appendResults) {
+            val oldManager = binding.recyclerView.layoutManager
+            firstVisible = when (oldManager) {
+                is StaggeredGridLayoutManager ->
+                    oldManager.findFirstCompletelyVisibleItemPositions(null).last()
+                is GridLayoutManager ->
+                    oldManager.findFirstCompletelyVisibleItemPosition()
+                else -> 0
+            }
+        }
+
+        if (recyclerAdapter == null) {
+            if (shouldBeCardView) {
+                recyclerAdapter =
+                        ItemCardAdapter(
+                            this,
+                            items,
+                            api,
+                            db,
+                            customTabActivityHelper,
+                            internalBrowser,
+                            articleViewer,
+                            fullHeightCards,
+                            appColors,
+                            userIdentifier,
+                            config
+                        ) {
+                            updateItems(it)
+                        }
+            } else {
+                recyclerAdapter =
+                        ItemListAdapter(
+                            this,
+                            items,
+                            api,
+                            db,
+                            customTabActivityHelper,
+                            internalBrowser,
+                            articleViewer,
+                            userIdentifier,
+                            appColors,
+                            config
+                        ) {
+                            updateItems(it)
+                        }
+
+                binding.recyclerView.addItemDecoration(
+                    DividerItemDecoration(
+                        this@HomeActivity,
+                        DividerItemDecoration.VERTICAL
+                    )
+                )
+            }
+            binding.recyclerView.adapter = recyclerAdapter
+        } else {
+                (recyclerAdapter as ItemsAdapter<*>).updateAllItems()
+        }
+
+        reloadBadges()
+        mayBeEmpty()
+    }
+
+    private fun reloadBadges() {
+        if (displayUnreadCount || displayAllCount) {
+            CoroutineScope(Dispatchers.Main).launch {
+                reloadBadges(applicationContext, api)
+                reloadBadgeContent()
+            }
+        }
+    }
+
+    private fun reloadBadgeContent() {
+        if (displayUnreadCount) {
+            tabNewBadge
+                .setText(SharedItems.badgeUnread.toString())
+                .maybeShow()
+        }
+        if (displayAllCount) {
+            tabArchiveBadge
+                .setText(SharedItems.badgeAll.toString())
+                .maybeShow()
+            tabStarredBadge
+                .setText(SharedItems.badgeStarred.toString())
+                .maybeShow()
+        }
+    }
+
+    private fun reloadTagsBadges() {
+        tagsBadge.forEach {
+            binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
+        }
+        binding.mainDrawer.resetDrawerContent()
+    }
+
+    private fun calculateNoOfColumns(): Int {
+        val displayMetrics = resources.displayMetrics
+        val dpWidth = displayMetrics.widthPixels / displayMetrics.density
+        return (dpWidth / 300).toInt()
+    }
+
+    override fun onQueryTextChange(p0: String?): Boolean {
+        if (p0.isNullOrBlank()) {
+            SharedItems.searchFilter = null
+            getElementsAccordingToTab()
+            fetchOnEmptyList()
+        }
+        return false
+    }
+
+    override fun onQueryTextSubmit(p0: String?): Boolean {
+        SharedItems.searchFilter = p0
+        getElementsAccordingToTab()
+        fetchOnEmptyList()
+        return false
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.home_menu, menu)
+
+        val searchItem = menu.findItem(R.id.action_search)
+        val searchView = searchItem.getActionView() as SearchView
+        searchView.setOnQueryTextListener(this)
+
+        return true
+    }
+
+    private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) {
+        AlertDialog.Builder(this@HomeActivity)
+            .setMessage(messageRes)
+            .setTitle(titleRes)
+            .setPositiveButton(android.R.string.ok) { _, _ -> doFn() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .create()
+            .show()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.refresh -> {
+                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+                    needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
+                        api.update().enqueue(object : Callback<String> {
+                            override fun onResponse(
+                                call: Call<String>,
+                                response: Response<String>
+                            ) {
+                                Toast.makeText(
+                                    this@HomeActivity,
+                                    R.string.refresh_success_response, Toast.LENGTH_LONG
+                                )
+                                    .show()
+                            }
+
+                            override fun onFailure(call: Call<String>, t: Throwable) {
+                                Toast.makeText(
+                                    this@HomeActivity,
+                                    R.string.refresh_failer_message,
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        })
+                        Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    }
+                    return true
+                } else {
+                    return false
+                }
+            }
+            R.id.readAll -> {
+                if (elementsShown == UNREAD_SHOWN) {
+                    needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
+                        binding.swipeRefreshLayout.isRefreshing = true
+
+                        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+                            CoroutineScope(Dispatchers.Main).launch {
+                                val success = readAll(applicationContext, api, db)
+                                if (success) {
+                                    Toast.makeText(
+                                        this@HomeActivity,
+                                        R.string.all_posts_read,
+                                        Toast.LENGTH_SHORT
+                                    ).show()
+                                    tabNewBadge.removeBadge()
+
+                                    handleDrawerItems()
+
+                                    getElementsAccordingToTab()
+                                } else {
+                                    Toast.makeText(
+                                        this@HomeActivity,
+                                        R.string.all_posts_not_read,
+                                        Toast.LENGTH_SHORT
+                                    ).show()
+                                }
+                                handleListResult()
+                                binding.swipeRefreshLayout.isRefreshing = false
+                            }
+                        }
+                    }
+                }
+                return true
+            }
+            R.id.action_disconnect -> {
+                return Config.logoutAndRedirect(this, this@HomeActivity, editor)
+            }
+            else -> return super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun maxItemNumber(): Int =
+        when (elementsShown) {
+            UNREAD_SHOWN -> SharedItems.badgeUnread
+            READ_SHOWN -> SharedItems.badgeAll
+            FAV_SHOWN -> SharedItems.badgeStarred
+            else -> SharedItems.badgeUnread // if !elementsShown then unread are fetched.
+        }
+
+    private fun updateItems(adapterItems: ArrayList<Item>) {
+        items = adapterItems
+    }
+
+    private fun handleRecurringTask() {
+        if (periodicRefresh) {
+            val myConstraints = Constraints.Builder()
+                .setRequiresBatteryNotLow(true)
+                .setRequiresCharging(refreshWhenChargingOnly)
+                .setRequiresStorageNotLow(true)
+                .build()
+
+            val backgroundWork =
+                PeriodicWorkRequestBuilder<LoadingWorker>(refreshMinutes, TimeUnit.MINUTES)
+                    .setConstraints(myConstraints)
+                    .addTag("selfoss-loading")
+                    .build()
+
+            WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork)
+        }
+    }
+
+    private fun handleOfflineActions() {
+        fun <T>doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+           call.enqueue(object: Callback<T> {
+               override fun onResponse(
+                   call: Call<T>,
+                   response: Response<T>
+               ) {
+                   thread {
+                       db.actionsDao().delete(action)
+                   }
+               }
+
+               override fun onFailure(call: Call<T>, t: Throwable) {
+               }
+           })
+        }
+
+        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
+            CoroutineScope(Dispatchers.Main).launch {
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
+                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.unstarred -> doAndReportOnFail(api.unstarrItem(action.articleId), action)
+                    }
+                }
+            }
+        }
+    }
+}
+
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt
new file mode 100644
index 0000000..16db2e8
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt
@@ -0,0 +1,53 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityImageBinding
+import bou.amine.apps.readerforselfossv2.android.fragments.ImageFragment
+
+class ImageActivity : AppCompatActivity() {
+    private lateinit var allImages : ArrayList<String>
+    private var position : Int = 0
+
+    private lateinit var binding: ActivityImageBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityImageBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
+        position = intent.getIntExtra("position", 0)
+
+        binding.pager.adapter = ScreenSlidePagerAdapter(this)
+        binding.pager.setCurrentItem(position, false)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+
+        override fun getItemCount(): Int = allImages.size
+
+        override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
new file mode 100644
index 0000000..76c7542
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt
@@ -0,0 +1,293 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import android.text.TextUtils
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import androidx.preference.PreferenceManager
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SuccessResponse
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityLoginBinding
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import com.mikepenz.aboutlibraries.LibsBuilder
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class LoginActivity : AppCompatActivity() {
+
+    private var inValidCount: Int = 0
+    private var isWithSelfSignedCert = false
+    private var isWithLogin = false
+    private var isWithHTTPLogin = false
+
+    private lateinit var settings: SharedPreferences
+    private lateinit var editor: SharedPreferences.Editor
+    private lateinit var userIdentifier: String
+    private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityLoginBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(this@LoginActivity)
+
+        super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolbar)
+
+        handleBaseUrlFail()
+
+        settings = PreferenceManager.getDefaultSharedPreferences(applicationContext)
+        userIdentifier = settings.getString("unique_id", "")!!
+
+        editor = settings.edit()
+
+        if (settings.getString("url", "")!!.isNotEmpty()) {
+            goToMain()
+        }
+
+        handleActions()
+    }
+
+    private fun handleActions() {
+
+        binding.withSelfhostedCert.setOnCheckedChangeListener { _, b ->
+            isWithSelfSignedCert = !isWithSelfSignedCert
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            binding.warningText.visibility = visi
+        }
+
+        binding.passwordView.setOnEditorActionListener(
+            TextView.OnEditorActionListener { _, id, _ ->
+                if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
+                    attemptLogin()
+                    return@OnEditorActionListener true
+                }
+                false
+            }
+        )
+
+        binding.signInButton.setOnClickListener { attemptLogin() }
+
+        binding.withLogin.setOnCheckedChangeListener { _, b ->
+            isWithLogin = !isWithLogin
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            binding.loginView.visibility = visi
+            binding.passwordView.visibility = visi
+        }
+
+        binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
+            isWithHTTPLogin = !isWithHTTPLogin
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            binding.httpLoginView.visibility = visi
+            binding.httpPasswordView.visibility = visi
+        }
+    }
+
+    private fun handleBaseUrlFail() {
+        if (intent.getBooleanExtra("baseUrlFail", false)) {
+            val alertDialog = AlertDialog.Builder(this).create()
+            alertDialog.setTitle(getString(R.string.warning_wrong_url))
+            alertDialog.setMessage(getString(R.string.base_url_error))
+            alertDialog.setButton(
+                AlertDialog.BUTTON_NEUTRAL,
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
+            alertDialog.show()
+        }
+    }
+
+    private fun goToMain() {
+        val intent = Intent(this, HomeActivity::class.java)
+        startActivity(intent)
+        finish()
+    }
+
+    private fun attemptLogin() {
+
+        // Reset errors.
+        binding.urlView.error = null
+        binding.loginView.error = null
+        binding.httpLoginView.error = null
+        binding.passwordView.error = null
+        binding.httpPasswordView.error = null
+
+        // Store values at the time of the login attempt.
+        val url = binding.urlView.text.toString()
+        val login = binding.loginView.text.toString()
+        val httpLogin = binding.httpLoginView.text.toString()
+        val password = binding.passwordView.text.toString()
+        val httpPassword = binding.httpPasswordView.text.toString()
+
+        var cancel = false
+        var focusView: View? = null
+
+        if (!url.isBaseUrlValid(this@LoginActivity)) {
+            binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
+            cancel = true
+            inValidCount++
+            if (inValidCount == 3) {
+                val alertDialog = AlertDialog.Builder(this).create()
+                alertDialog.setTitle(getString(R.string.warning_wrong_url))
+                alertDialog.setMessage(getString(R.string.text_wrong_url))
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
+                alertDialog.show()
+                inValidCount = 0
+            }
+        }
+
+        if (isWithLogin) {
+            if (TextUtils.isEmpty(password)) {
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                focusView = binding.loginView
+                cancel = true
+            }
+        }
+
+        if (isWithHTTPLogin) {
+            if (TextUtils.isEmpty(httpPassword)) {
+                binding.httpPasswordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.httpPasswordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(httpLogin)) {
+                binding.httpLoginView.error = getString(R.string.error_field_required)
+                focusView = binding.httpLoginView
+                cancel = true
+            }
+        }
+
+        if (cancel) {
+            focusView?.requestFocus()
+        } else {
+            showProgress(true)
+
+            editor.putString("url", url)
+            editor.putString("login", login)
+            editor.putString("httpUserName", httpLogin)
+            editor.putString("password", password)
+            editor.putString("httpPassword", httpPassword)
+            editor.putBoolean("isSelfSignedCert", isWithSelfSignedCert)
+            editor.apply()
+
+            val api = SelfossApi(
+                this,
+                this@LoginActivity,
+                isWithSelfSignedCert,
+                -1L
+            )
+
+            if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
+                api.login().enqueue(object : Callback<SuccessResponse> {
+                    private fun preferenceError(t: Throwable) {
+                        editor.remove("url")
+                        editor.remove("login")
+                        editor.remove("httpUserName")
+                        editor.remove("password")
+                        editor.remove("httpPassword")
+                        editor.apply()
+                        binding.urlView.error = getString(R.string.wrong_infos)
+                        binding.loginView.error = getString(R.string.wrong_infos)
+                        binding.passwordView.error = getString(R.string.wrong_infos)
+                        binding.httpLoginView.error = getString(R.string.wrong_infos)
+                        binding.httpPasswordView.error = getString(R.string.wrong_infos)
+                        showProgress(false)
+                    }
+
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            goToMain()
+                        } else {
+                            preferenceError(Exception("No response body..."))
+                        }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        preferenceError(t)
+                    }
+                })
+            } else {
+                showProgress(false)
+            }
+        }
+    }
+
+    private fun showProgress(show: Boolean) {
+        val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime)
+
+        binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+        binding.loginForm
+            .animate()
+            .setDuration(shortAnimTime.toLong())
+            .alpha(
+                if (show) 0F else 1F
+            ).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+            }
+        }
+        )
+
+        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.loginProgress
+            .animate()
+            .setDuration(shortAnimTime.toLong())
+            .alpha(
+                if (show) 1F else 0F
+            ).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+            }
+        }
+        )
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.login_menu, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.about -> {
+                LibsBuilder()
+                    .withAboutIconShown(true)
+                    .withAboutVersionShown(true)
+                    .start(this)
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MainActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MainActivity.kt
index 916dfa4..7e08951 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MainActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MainActivity.kt
@@ -1,30 +1,23 @@
 package bou.amine.apps.readerforselfossv2.android
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Intent
 import android.os.Bundle
-import bou.amine.apps.readerforselfossv2.Greeting
-import android.widget.TextView
-import bou.amine.apps.readerforselfossv2.rest.SelfossApi
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import java.util.logging.Logger
-
-fun greet(): String {
-    return Greeting().greeting()
-}
+import androidx.appcompat.app.AppCompatActivity
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityMainBinding
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        CoroutineScope(Dispatchers.IO).launch {
-            val s = SelfossApi().getItems("unread", 300, 0).forEach { i -> println(i.getImages()) }
-            Logger.getLogger(")").info(s.toString())
-        }
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
 
-        val tv: TextView = findViewById(R.id.text_view)
-        tv.text = greet()
+        val intent = Intent(this, LoginActivity::class.java)
+
+        startActivity(intent)
+        finish()
     }
 }
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
new file mode 100644
index 0000000..7d19deb
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt
@@ -0,0 +1,101 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.Build
+import androidx.preference.PreferenceManager
+import android.widget.ImageView
+import androidx.multidex.MultiDexApplication
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import com.ftinc.scoop.Scoop
+import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
+import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import java.util.UUID.randomUUID
+
+class MyApp : MultiDexApplication() {
+    private lateinit var config: Config
+
+    override fun onCreate() {
+        super.onCreate()
+        config = Config(baseContext)
+
+        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        if (prefs.getString("unique_id", "")!!.isEmpty()) {
+            val editor = prefs.edit()
+            editor.putString("unique_id", randomUUID().toString())
+            editor.apply()
+        }
+
+        initDrawerImageLoader()
+
+        initTheme()
+
+        tryToHandleBug()
+
+        handleNotificationChannels()
+    }
+
+    private fun handleNotificationChannels() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
+            val name = getString(R.string.notification_channel_sync)
+            val importance = NotificationManager.IMPORTANCE_LOW
+            val mChannel = NotificationChannel(Config.syncChannelId, name, importance)
+
+            val newItemsChannelname = getString(R.string.new_items_channel_sync)
+            val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
+            val newItemsChannelmChannel = NotificationChannel(Config.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
+
+            notificationManager.createNotificationChannel(mChannel)
+            notificationManager.createNotificationChannel(newItemsChannelmChannel)
+        }
+    }
+
+    private fun initDrawerImageLoader() {
+        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
+            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
+                Glide.with(imageView.context)
+                    .loadMaybeBasicAuth(config, uri.toString())
+                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
+                    .into(imageView)
+            }
+
+            override fun cancel(imageView: ImageView) {
+                Glide.with(imageView.context).clear(imageView)
+            }
+
+            override fun placeholder(ctx: Context, tag: String?): Drawable {
+                return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
+            }
+        })
+    }
+
+    private fun initTheme() {
+        Scoop.waffleCone()
+            .addFlavor(getString(R.string.default_theme), R.style.NoBar, true)
+            .addFlavor(getString(R.string.default_dark_theme), R.style.NoBarDark, false)
+            .setSharedPreferences(PreferenceManager.getDefaultSharedPreferences(this))
+            .initialize()
+    }
+
+    private fun tryToHandleBug() {
+        val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+        Thread.setDefaultUncaughtExceptionHandler { thread, e ->
+            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+                    it.toString().contains("android.view.ViewDebug")
+                }) {
+                Unit
+            } else {
+                oldHandler.uncaughtException(thread, e)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
new file mode 100644
index 0000000..8bd1edd
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt
@@ -0,0 +1,265 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Color
+import android.os.Bundle
+import android.view.KeyEvent
+import androidx.preference.PreferenceManager
+import androidx.appcompat.app.AppCompatActivity
+import android.view.Menu
+import android.view.MenuItem
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.room.Room
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivityReaderBinding
+import bou.amine.apps.readerforselfossv2.android.fragments.ArticleFragment
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.toggleStar
+import com.ftinc.scoop.Scoop
+
+class ReaderActivity : AppCompatActivity() {
+
+    private var markOnScroll: Boolean = false
+    private var currentItem: Int = 0
+    private lateinit var userIdentifier: String
+    private lateinit var appColors: AppColors
+
+    private lateinit var api: SelfossApi
+
+    private lateinit var toolbarMenu: Menu
+
+    private lateinit var db: AppDatabase
+    private lateinit var prefs: SharedPreferences
+    private lateinit var binding: ActivityReaderBinding
+
+    private var activeAlignment: Int = 1
+    private val JUSTIFY = 1
+    private val ALIGN_LEFT = 2
+
+    private fun showMenuItem(willAddToFavorite: Boolean) {
+        if (willAddToFavorite) {
+            toolbarMenu.findItem(R.id.star).icon.setTint(Color.WHITE)
+        } else {
+            toolbarMenu.findItem(R.id.star).icon.setTint(Color.RED)
+        }
+    }
+
+    private fun canFavorite() {
+        showMenuItem(true)
+    }
+
+    private fun canRemoveFromFavorite() {
+        showMenuItem(false)
+    }
+
+    private lateinit var editor: SharedPreferences.Editor
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        appColors = AppColors(this)
+        binding = ActivityReaderBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        setContentView(view)
+
+        db = Room.databaseBuilder(
+            applicationContext,
+            AppDatabase::class.java, "selfoss-database"
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        val settings =
+            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+        prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        editor = prefs.edit()
+
+        userIdentifier = prefs.getString("unique_id", "")!!
+        markOnScroll = prefs.getBoolean("mark_on_scroll", false)
+        activeAlignment = prefs.getInt("text_align", JUSTIFY)
+
+        api = SelfossApi(
+            this,
+            this@ReaderActivity,
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1")!!.toLong()
+        )
+
+        if (allItems.isEmpty()) {
+            finish()
+        }
+
+        currentItem = intent.getIntExtra("currentItem", 0)
+
+        readItem(allItems[currentItem])
+
+        binding.pager.adapter = ScreenSlidePagerAdapter(this)
+        binding.pager.setCurrentItem(currentItem, false)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        binding.indicator.setViewPager(binding.pager)
+    }
+
+    private fun readItem(item: Item) {
+        if (markOnScroll) {
+                SharedItems.readItem(applicationContext, api, db, item)
+            }
+    }
+
+    override fun onSaveInstanceState(oldInstanceState: Bundle) {
+        super.onSaveInstanceState(oldInstanceState)
+        oldInstanceState.clear()
+    }
+
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
+        FragmentStateAdapter(fa) {
+
+        override fun getItemCount(): Int = allItems.size
+
+        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        return when (keyCode) {
+            KeyEvent.KEYCODE_VOLUME_DOWN -> {
+                val currentFragment = supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
+                currentFragment.scrollDown()
+                true
+            }
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                val currentFragment = supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
+                currentFragment.scrollUp()
+                true
+            }
+            else -> {
+                super.onKeyDown(keyCode, event)
+            }
+        }
+    }
+
+    private fun alignmentMenu(showJustify: Boolean) {
+        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
+        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.reader_menu, menu)
+        toolbarMenu = menu
+
+        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+            canRemoveFromFavorite()
+        } else {
+            canFavorite()
+        }
+        if (activeAlignment == JUSTIFY) {
+            alignmentMenu(false)
+        } else {
+            alignmentMenu(true)
+        }
+
+        binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                }
+        )
+
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        fun afterSave() {
+            allItems[binding.pager.currentItem] =
+                    allItems[binding.pager.currentItem].toggleStar()
+            canRemoveFromFavorite()
+        }
+
+        fun afterUnsave() {
+            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
+            canFavorite()
+        }
+
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+            R.id.star -> {
+                if (allItems[binding.pager.currentItem].starred) {
+                    SharedItems.unstarItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterUnsave()
+                } else {
+                    SharedItems.starItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterSave()
+                }
+            }
+            R.id.align_left -> {
+                editor.putInt("text_align", ALIGN_LEFT)
+                editor.apply()
+                alignmentMenu(true)
+                refreshFragment()
+            }
+            R.id.align_justify -> {
+                editor.putInt("text_align", JUSTIFY)
+                editor.apply()
+                alignmentMenu(false)
+                refreshFragment()
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun refreshFragment() {
+        finish()
+        overridePendingTransition(0, 0)
+        startActivity(intent)
+        overridePendingTransition(0, 0)
+    }
+
+    companion object {
+        var allItems: ArrayList<Item> = ArrayList()
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
new file mode 100644
index 0000000..ca9d5da
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/SourcesActivity.kt
@@ -0,0 +1,109 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import android.content.Context
+import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Bundle
+import androidx.preference.PreferenceManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import android.widget.Toast
+import bou.amine.apps.readerforselfossv2.android.adapters.SourcesListAdapter
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Source
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySourcesBinding
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import com.ftinc.scoop.Scoop
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class SourcesActivity : AppCompatActivity() {
+
+    private lateinit var appColors: AppColors
+    private lateinit var binding: ActivitySourcesBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(this@SourcesActivity)
+        binding = ActivitySourcesBinding.inflate(layoutInflater)
+        val view = binding.root
+
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        super.onCreate(savedInstanceState)
+
+        setContentView(view)
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        binding.fab.rippleColor = appColors.colorAccentDark
+        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        binding.recyclerView.clearOnScrollListeners()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val mLayoutManager = LinearLayoutManager(this)
+
+        val settings =
+            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+
+        val api = SelfossApi(
+            this,
+            this@SourcesActivity,
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getString("api_timeout", "-1")!!.toLong()
+        )
+        var items: ArrayList<Source> = ArrayList()
+
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.layoutManager = mLayoutManager
+
+        if (this@SourcesActivity.isNetworkAccessible(binding.recyclerView)) {
+            api.sources.enqueue(object : Callback<List<Source>> {
+                override fun onResponse(
+                    call: Call<List<Source>>,
+                    response: Response<List<Source>>
+                ) {
+                    if (response.body() != null && response.body()!!.isNotEmpty()) {
+                        items = response.body() as ArrayList<Source>
+                    }
+                    val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
+                    binding.recyclerView.adapter = mAdapter
+                    mAdapter.notifyDataSetChanged()
+                    if (items.isEmpty()) {
+                        Toast.makeText(
+                            this@SourcesActivity,
+                            R.string.nothing_here,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+
+                override fun onFailure(call: Call<List<Source>>, t: Throwable) {
+                    Toast.makeText(
+                        this@SourcesActivity,
+                        R.string.cant_get_sources,
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
+        }
+
+        binding.fab.setOnClickListener {
+            startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
new file mode 100644
index 0000000..9f20454
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt
@@ -0,0 +1,153 @@
+package bou.amine.apps.readerforselfossv2.android.adapters
+
+import android.app.Activity
+import android.content.Context
+import androidx.recyclerview.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView.ScaleType
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.buildCustomTabsIntent
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
+import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
+import bou.amine.apps.readerforselfossv2.android.utils.shareLink
+import bou.amine.apps.readerforselfossv2.android.utils.sourceAndDateText
+import bou.amine.apps.readerforselfossv2.android.utils.toTextDrawableString
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
+import com.bumptech.glide.Glide
+
+class ItemCardAdapter(
+    override val app: Activity,
+    override var items: ArrayList<Item>,
+    override val api: SelfossApi,
+    override val db: AppDatabase,
+    private val helper: CustomTabActivityHelper,
+    private val internalBrowser: Boolean,
+    private val articleViewer: Boolean,
+    private val fullHeightCards: Boolean,
+    override val appColors: AppColors,
+    override val userIdentifier: String,
+    override val config: Config,
+    override val updateItems: (ArrayList<Item>) -> Unit
+) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
+    private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private val imageMaxHeight: Int =
+        c.resources.getDimension(R.dimen.card_image_max_height).toInt()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        with(holder) {
+            val itm = items[position]
+
+            binding.favButton.isSelected = itm.starred
+            binding.title.text = itm.getTitleDecoded()
+
+            binding.title.setOnTouchListener(LinkOnTouchListener())
+
+            binding.title.setLinkTextColor(appColors.colorAccent)
+
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+
+            if (!fullHeightCards) {
+                binding.itemImage.maxHeight = imageMaxHeight
+                binding.itemImage.scaleType = ScaleType.CENTER_CROP
+            }
+
+            if (itm.getThumbnail(c).isEmpty()) {
+                binding.itemImage.visibility = View.GONE
+                Glide.with(c).clear(binding.itemImage)
+                binding.itemImage.setImageDrawable(null)
+            } else {
+                binding.itemImage.visibility = View.VISIBLE
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
+            }
+
+            if (itm.getIcon(c).isEmpty()) {
+                val color = generator.getColor(itm.getSourceTitle())
+
+                val drawable =
+                        TextDrawable
+                                .builder()
+                                .round()
+                                .build(itm.getSourceTitle().toTextDrawableString(c), color)
+                binding.sourceImage.setImageDrawable(drawable)
+            } else {
+                c.circularBitmapDrawable(config, itm.getIcon(c), binding.sourceImage)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        init {
+            handleClickListeners()
+            handleCustomTabActions()
+        }
+
+        private fun handleClickListeners() {
+
+            binding.favButton.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                if (isNetworkAvailable(c)) {
+                    if (item.starred) {
+                        SharedItems.unstarItem(c, api, db, item)
+                        item.starred = false
+                        binding.favButton.isSelected = false
+                    } else {
+                        SharedItems.starItem(c, api, db, item)
+                        item.starred = true
+                        binding.favButton.isSelected = true
+                    }
+                }
+            }
+
+                binding.shareBtn.setOnClickListener {
+                    val item = items[bindingAdapterPosition]
+                    c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
+                }
+
+                binding.browserBtn.setOnClickListener {
+                    c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+                }
+            }
+
+        private fun handleCustomTabActions() {
+            val customTabsIntent = c.buildCustomTabsIntent()
+            helper.bindCustomTabsService(app)
+
+            binding.root.setOnClickListener {
+                c.openItemUrl(
+                    items,
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    customTabsIntent,
+                    internalBrowser,
+                    articleViewer,
+                    app
+                )
+            }
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
new file mode 100644
index 0000000..de7a516
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt
@@ -0,0 +1,105 @@
+package bou.amine.apps.readerforselfossv2.android.adapters
+
+import android.app.Activity
+import android.content.Context
+import androidx.recyclerview.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
+import bou.amine.apps.readerforselfossv2.android.utils.buildCustomTabsIntent
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
+import bou.amine.apps.readerforselfossv2.android.utils.sourceAndDateText
+import bou.amine.apps.readerforselfossv2.android.utils.toTextDrawableString
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
+import kotlin.collections.ArrayList
+
+class ItemListAdapter(
+    override val app: Activity,
+    override var items: ArrayList<Item>,
+    override val api: SelfossApi,
+    override val db: AppDatabase,
+    private val helper: CustomTabActivityHelper,
+    private val internalBrowser: Boolean,
+    private val articleViewer: Boolean,
+    override val userIdentifier: String,
+    override val appColors: AppColors,
+    override val config: Config,
+    override val updateItems: (ArrayList<Item>) -> Unit
+) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private val c: Context = app.baseContext
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        with(holder) {
+            val itm = items[position]
+
+            binding.title.text = itm.getTitleDecoded()
+
+            binding.title.setOnTouchListener(LinkOnTouchListener())
+
+            binding.title.setLinkTextColor(appColors.colorAccent)
+
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
+
+            if (itm.getThumbnail(c).isEmpty()) {
+
+                if (itm.getIcon(c).isEmpty()) {
+                    val color = generator.getColor(itm.getSourceTitle())
+
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.getSourceTitle().toTextDrawableString(c), color)
+
+                    binding.itemImage.setImageDrawable(drawable)
+                } else {
+                    c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
+                }
+            } else {
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            handleCustomTabActions()
+        }
+
+        private fun handleCustomTabActions() {
+            val customTabsIntent = c.buildCustomTabsIntent()
+            helper.bindCustomTabsService(app)
+
+            binding.root.setOnClickListener {
+                c.openItemUrl(
+                    items,
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
+                    customTabsIntent,
+                    internalBrowser,
+                    articleViewer,
+                    app
+                )
+            }
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
new file mode 100644
index 0000000..79fb9c9
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemsAdapter.kt
@@ -0,0 +1,119 @@
+package bou.amine.apps.readerforselfossv2.android.adapters
+
+import android.app.Activity
+import android.graphics.Color
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import com.google.android.material.snackbar.Snackbar
+
+abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
+    abstract var items: ArrayList<Item>
+    abstract val api: SelfossApi
+    abstract val db: AppDatabase
+    abstract val userIdentifier: String
+    abstract val app: Activity
+    abstract val appColors: AppColors
+    abstract val config: Config
+    abstract val updateItems: (ArrayList<Item>) -> Unit
+
+    fun updateAllItems() {
+        items = SharedItems.focusedItems
+        notifyDataSetChanged()
+        updateItems(items)
+    }
+
+    private fun unmarkSnackbar(i: Item, position: Int) {
+        val s = Snackbar
+            .make(
+                app.findViewById(R.id.coordLayout),
+                R.string.marked_as_read,
+                Snackbar.LENGTH_LONG
+            )
+            .setAction(R.string.undo_string) {
+                SharedItems.unreadItem(app, api, db, i)
+                if (SharedItems.displayedItems == "unread") {
+                    addItemAtIndex(i, position)
+                } else {
+                    notifyItemChanged(position)
+                }
+            }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+    }
+
+    private fun markSnackbar(position: Int) {
+        val s = Snackbar
+            .make(
+                app.findViewById(R.id.coordLayout),
+                R.string.marked_as_unread,
+                Snackbar.LENGTH_LONG
+            )
+            .setAction(R.string.undo_string) {
+                SharedItems.readItem(app, api, db, items[position])
+                items = SharedItems.focusedItems
+                if (SharedItems.displayedItems == "unread") {
+                    notifyItemRemoved(position)
+                    updateItems(items)
+                } else {
+                    notifyItemChanged(position)
+                }
+            }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+    }
+
+    fun handleItemAtIndex(position: Int) {
+        if (SharedItems.unreadItemStatusAtIndex(position)) {
+            readItemAtIndex(position)
+        } else {
+            unreadItemAtIndex(position)
+        }
+    }
+
+    private fun readItemAtIndex(position: Int) {
+        val i = items[position]
+        SharedItems.readItem(app, api, db, i)
+        if (SharedItems.displayedItems == "unread") {
+            items.remove(i)
+            notifyItemRemoved(position)
+            updateItems(items)
+        } else {
+            notifyItemChanged(position)
+        }
+        unmarkSnackbar(i, position)
+    }
+
+    private fun unreadItemAtIndex(position: Int) {
+        SharedItems.unreadItem(app, api, db, items[position])
+        notifyItemChanged(position)
+        markSnackbar(position)
+    }
+
+    fun addItemAtIndex(item: Item, position: Int) {
+        items.add(position, item)
+        notifyItemInserted(position)
+        updateItems(items)
+
+    }
+
+    fun addItemsAtEnd(newItems: List<Item>) {
+        val oldSize = items.size
+        items.addAll(newItems)
+        notifyItemRangeInserted(oldSize, newItems.size)
+        updateItems(items)
+
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
new file mode 100644
index 0000000..d885e82
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt
@@ -0,0 +1,106 @@
+package bou.amine.apps.readerforselfossv2.android.adapters
+
+import android.app.Activity
+import android.content.Context
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.Toast
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Source
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SuccessResponse
+import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import bou.amine.apps.readerforselfossv2.android.utils.toTextDrawableString
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class SourcesListAdapter(
+    private val app: Activity,
+    private val items: ArrayList<Source>,
+    private val api: SelfossApi
+) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
+    private val c: Context = app.baseContext
+    private val generator: ColorGenerator = ColorGenerator.MATERIAL
+    private lateinit var config: Config
+    private lateinit var binding: SourceListItemBinding
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding.root)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val itm = items[position]
+        config = Config(c)
+
+        if (itm.getIcon(c).isEmpty()) {
+            val color = generator.getColor(itm.getTitleDecoded())
+
+            val drawable =
+                TextDrawable
+                    .builder()
+                    .round()
+                    .build(itm.getTitleDecoded().toTextDrawableString(c), color)
+            binding.itemImage.setImageDrawable(drawable)
+        } else {
+            c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
+        }
+
+        binding.sourceTitle.text = itm.getTitleDecoded()
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+
+        init {
+            handleClickListeners()
+        }
+
+        private fun handleClickListeners() {
+
+            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
+
+            deleteBtn.setOnClickListener {
+                if (c.isNetworkAccessible(null)) {
+                    val (id) = items[adapterPosition]
+                    api.deleteSource(id).enqueue(object : Callback<SuccessResponse> {
+                        override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                        ) {
+                            if (response.body() != null && response.body()!!.isSuccess) {
+                                items.removeAt(adapterPosition)
+                                notifyItemRemoved(adapterPosition)
+                                notifyItemRangeChanged(adapterPosition, itemCount)
+                            } else {
+                                Toast.makeText(
+                                    app,
+                                    R.string.can_delete_source,
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        }
+
+                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                            Toast.makeText(
+                                app,
+                                R.string.can_delete_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    })
+                }
+            }
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryApi.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryApi.kt
new file mode 100644
index 0000000..46d32ff
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryApi.kt
@@ -0,0 +1,35 @@
+package bou.amine.apps.readerforselfossv2.android.api.mercury
+
+import com.google.gson.GsonBuilder
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class MercuryApi() {
+    private val service: MercuryService
+
+    init {
+
+        val interceptor = HttpLoggingInterceptor()
+        interceptor.level = HttpLoggingInterceptor.Level.NONE
+        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
+
+        val gson = GsonBuilder()
+            .setLenient()
+            .create()
+        val retrofit =
+            Retrofit
+                .Builder()
+                .baseUrl("https://www.amine-bou.fr")
+                .client(client)
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .build()
+        service = retrofit.create(MercuryService::class.java)
+    }
+
+    fun parseUrl(url: String): Call<ParsedContent> {
+        return service.parseUrl(url)
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryModels.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryModels.kt
new file mode 100644
index 0000000..de4e5cc
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryModels.kt
@@ -0,0 +1,59 @@
+package bou.amine.apps.readerforselfossv2.android.api.mercury
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+
+class ParsedContent(
+    @SerializedName("title") val title: String,
+    @SerializedName("content") val content: String?,
+    @SerializedName("date_published") val date_published: String,
+    @SerializedName("lead_image_url") val lead_image_url: String?,
+    @SerializedName("dek") val dek: String,
+    @SerializedName("url") val url: String,
+    @SerializedName("domain") val domain: String,
+    @SerializedName("excerpt") val excerpt: String,
+    @SerializedName("total_pages") val total_pages: Int,
+    @SerializedName("rendered_pages") val rendered_pages: Int,
+    @SerializedName("next_page_url") val next_page_url: String
+) : Parcelable {
+
+    companion object {
+        @JvmField
+        val CREATOR: Parcelable.Creator<ParsedContent> =
+            object : Parcelable.Creator<ParsedContent> {
+                override fun createFromParcel(source: Parcel): ParsedContent = ParsedContent(source)
+                override fun newArray(size: Int): Array<ParsedContent?> = arrayOfNulls(size)
+            }
+    }
+
+    constructor(source: Parcel) : this(
+        title = source.readString().orEmpty(),
+        content = source.readString(),
+        date_published = source.readString().orEmpty(),
+        lead_image_url = source.readString(),
+        dek = source.readString().orEmpty(),
+        url = source.readString().orEmpty(),
+        domain = source.readString().orEmpty(),
+        excerpt = source.readString().orEmpty(),
+        total_pages = source.readInt(),
+        rendered_pages = source.readInt(),
+        next_page_url = source.readString().orEmpty()
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(title)
+        dest.writeString(content)
+        dest.writeString(date_published)
+        dest.writeString(lead_image_url)
+        dest.writeString(dek)
+        dest.writeString(url)
+        dest.writeString(domain)
+        dest.writeString(excerpt)
+        dest.writeInt(total_pages)
+        dest.writeInt(rendered_pages)
+        dest.writeString(next_page_url)
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryService.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryService.kt
new file mode 100644
index 0000000..ce1b3e0
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/mercury/MercuryService.kt
@@ -0,0 +1,10 @@
+package bou.amine.apps.readerforselfossv2.android.api.mercury
+
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface MercuryService {
+    @GET("parser.php")
+    fun parseUrl(@Query("link") link: String): Call<ParsedContent>
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/BooleanTypeAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/BooleanTypeAdapter.kt
new file mode 100644
index 0000000..90d8a27
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/BooleanTypeAdapter.kt
@@ -0,0 +1,22 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+
+internal class BooleanTypeAdapter : JsonDeserializer<Boolean> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Boolean? =
+        try {
+            json.asInt == 1
+        } catch (e: Exception) {
+            json.asBoolean
+        }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossApi.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossApi.kt
new file mode 100644
index 0000000..1f59981
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossApi.kt
@@ -0,0 +1,245 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import android.app.Activity
+import android.content.Context
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.getUnsafeHttpClient
+import com.burgstaller.okhttp.AuthenticationCacheInterceptor
+import com.burgstaller.okhttp.CachingAuthenticatorDecorator
+import com.burgstaller.okhttp.DispatchingAuthenticator
+import com.burgstaller.okhttp.basic.BasicAuthenticator
+import com.burgstaller.okhttp.digest.CachingAuthenticator
+import com.burgstaller.okhttp.digest.Credentials
+import com.burgstaller.okhttp.digest.DigestAuthenticator
+import com.google.gson.GsonBuilder
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.ResponseBody.Companion.toResponseBody
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.net.SocketTimeoutException
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
+
+class SelfossApi(
+    c: Context,
+    callingActivity: Activity?,
+    isWithSelfSignedCert: Boolean,
+    timeout: Long
+) {
+
+    private lateinit var service: SelfossService
+    private val config: Config = Config(c)
+    private val userName: String
+    private val password: String
+
+    fun OkHttpClient.Builder.maybeWithSelfSigned(isWithSelfSignedCert: Boolean): OkHttpClient.Builder =
+        if (isWithSelfSignedCert) {
+            getUnsafeHttpClient()
+        } else {
+            this
+        }
+
+    fun OkHttpClient.Builder.maybeWithSettingsTimeout(timeout: Long): OkHttpClient.Builder =
+        if (timeout != -1L) {
+            this.readTimeout(timeout, TimeUnit.SECONDS)
+                .connectTimeout(timeout, TimeUnit.SECONDS)
+        } else {
+            this
+        }
+
+    fun Credentials.createAuthenticator(): DispatchingAuthenticator =
+        DispatchingAuthenticator.Builder()
+            .with("digest", DigestAuthenticator(this))
+            .with("basic", BasicAuthenticator(this))
+            .build()
+
+    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder {
+        val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
+        return OkHttpClient
+            .Builder()
+            .maybeWithSettingsTimeout(timeout)
+            .maybeWithSelfSigned(isWithSelfSignedCert)
+            .authenticator(CachingAuthenticatorDecorator(this, authCache))
+            .addInterceptor(AuthenticationCacheInterceptor(authCache))
+            .addInterceptor(object: Interceptor {
+                override fun intercept(chain: Interceptor.Chain): Response {
+                    val request: Request = chain.request()
+                    val response: Response = chain.proceed(request)
+
+                    if (response.code == 408) {
+                        return response
+                    }
+                    return response
+                }
+            })
+    }
+
+    init {
+        userName = config.userLogin
+        password = config.userPassword
+
+        val authenticator =
+            Credentials(
+                config.httpUserLogin,
+                config.httpUserPassword
+            ).createAuthenticator()
+
+        val gson =
+            GsonBuilder()
+                .registerTypeAdapter(Boolean::class.javaPrimitiveType, BooleanTypeAdapter())
+                .registerTypeAdapter(SelfossTagType::class.java, SelfossTagTypeTypeAdapter())
+                .setLenient()
+                .create()
+
+        val logging = HttpLoggingInterceptor()
+
+
+        logging.level = HttpLoggingInterceptor.Level.NONE
+        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)
+
+        val timeoutCode = 504
+        httpClient
+                .addInterceptor { chain ->
+                    val res = chain.proceed(chain.request())
+                    if (res.code == timeoutCode) {
+                        throw SocketTimeoutException("timeout")
+                    }
+                    res
+                }
+                .addInterceptor(logging)
+                .addInterceptor { chain ->
+                    val request = chain.request()
+                    try {
+                        chain.proceed(request)
+                    } catch (e: SocketTimeoutException) {
+                        Response.Builder()
+                                .code(timeoutCode)
+                                .protocol(Protocol.HTTP_2)
+                                .body("".toResponseBody("text/plain".toMediaTypeOrNull()))
+                                .message("")
+                                .request(request)
+                                .build()
+                    }
+                }
+
+        try {
+            val retrofit =
+                Retrofit
+                    .Builder()
+                    .baseUrl(config.baseUrl)
+                    .client(httpClient.build())
+                    .addConverterFactory(GsonConverterFactory.create(gson))
+                    .build()
+            service = retrofit.create(SelfossService::class.java)
+        } catch (e: IllegalArgumentException) {
+            if (callingActivity != null) {
+                Config.logoutAndRedirect(c, callingActivity, config.settings.edit(), baseUrlFail = true)
+            }
+        }
+    }
+
+    fun login(): Call<SuccessResponse> =
+        service.loginToSelfoss(config.userLogin, config.userPassword)
+
+    suspend fun readItems(
+        itemsNumber: Int,
+        offset: Int
+    ): retrofit2.Response<List<Item>> =
+        getItems("read", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+
+    suspend fun newItems(
+        itemsNumber: Int,
+        offset: Int
+    ): retrofit2.Response<List<Item>> =
+        getItems("unread", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+
+    suspend fun starredItems(
+        itemsNumber: Int,
+        offset: Int
+    ): retrofit2.Response<List<Item>> =
+        getItems("starred", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+
+    fun allItems(): Call<List<Item>> =
+        service.allItems(userName, password)
+
+    suspend fun allNewItems(): retrofit2.Response<List<Item>> =
+            getItems("unread", null, null, null, 200, 0)
+
+    suspend fun allReadItems(): retrofit2.Response<List<Item>> =
+            getItems("read", null, null, null, 200, 0)
+
+    suspend fun allStarredItems(): retrofit2.Response<List<Item>> =
+        getItems("read", null, null, null, 200, 0)
+
+    private suspend fun getItems(
+        type: String,
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
+        items: Int,
+        offset: Int
+    ): retrofit2.Response<List<Item>> =
+        service.getItems(type, tag, sourceId, search, null, userName, password, items, offset)
+
+    suspend fun updateItems(
+        updatedSince: String
+    ): retrofit2.Response<List<Item>> =
+        service.getItems("read", null, null, null, updatedSince, userName, password, 200, 0)
+
+    fun markItem(itemId: String): Call<SuccessResponse> =
+        service.markAsRead(itemId, userName, password)
+
+    fun unmarkItem(itemId: String): Call<SuccessResponse> =
+        service.unmarkAsRead(itemId, userName, password)
+
+    suspend fun readAll(ids: List<String>): SuccessResponse =
+        service.markAllAsRead(ids, userName, password)
+
+    fun starrItem(itemId: String): Call<SuccessResponse> =
+        service.starr(itemId, userName, password)
+
+    fun unstarrItem(itemId: String): Call<SuccessResponse> =
+        service.unstarr(itemId, userName, password)
+
+    suspend fun stats(): retrofit2.Response<Stats> = service.stats(userName, password)
+
+    val tags: Call<List<Tag>>
+        get() = service.tags(userName, password)
+
+    fun update(): Call<String> =
+        service.update(userName, password)
+
+    val apiVersion: Call<ApiVersion>
+        get() = service.version()
+
+    val sources: Call<List<Source>>
+        get() = service.sources(userName, password)
+
+    fun deleteSource(id: String): Call<SuccessResponse> =
+        service.deleteSource(id, userName, password)
+
+    fun spouts(): Call<Map<String, Spout>> =
+        service.spouts(userName, password)
+
+    fun createSource(
+        title: String,
+        url: String,
+        spout: String,
+        tags: String,
+        filter: String
+    ): Call<SuccessResponse> =
+        service.createSource(title, url, spout, tags, filter, userName, password)
+
+    fun createSourceApi2(
+        title: String,
+        url: String,
+        spout: String,
+        tags: List<String>,
+        filter: String
+    ): Call<SuccessResponse> =
+        service.createSourceApi2(title, url, spout, tags, filter, userName, password)
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossFetching.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossFetching.kt
new file mode 100644
index 0000000..6ecbf29
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossFetching.kt
@@ -0,0 +1,134 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import android.content.Context
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
+import kotlinx.coroutines.*
+import retrofit2.Response
+
+suspend fun getAndStoreAllItems(context: Context, api: SelfossApi, db: AppDatabase) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        launch {
+            try {
+                enqueueArticles(api.allNewItems(), db, true)
+            } catch (e: Throwable) {}
+        }
+        launch {
+            try {
+                enqueueArticles(api.allReadItems(), db, false)
+            } catch (e: Throwable) {}
+        }
+        launch {
+            try {
+                enqueueArticles(api.allStarredItems(), db, false)
+            } catch (e: Throwable) {}
+        }
+    } else {
+        launch { SharedItems.updateDatabase(db) }
+    }
+}
+
+suspend fun updateItems(context: Context, api: SelfossApi, db: AppDatabase) = coroutineScope {
+    if (isNetworkAvailable(context)) {
+        launch {
+            try {
+                enqueueArticles(api.updateItems(SharedItems.items[0].datetime), db, true)
+            } catch (e: Throwable) {}
+        }
+    }
+}
+
+suspend fun refreshFocusedItems(context: Context, api: SelfossApi, db: AppDatabase, itemsNumber: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        val response = when (SharedItems.displayedItems) {
+            "read" -> api.readItems(itemsNumber, 0)
+            "unread" -> api.newItems(itemsNumber, 0)
+            "starred" -> api.starredItems(itemsNumber, 0)
+            else -> api.readItems(itemsNumber, 0)
+        }
+
+        if (response.isSuccessful) {
+            SharedItems.refreshFocusedItems(response.body() as ArrayList<Item>)
+            SharedItems.updateDatabase(db)
+        }
+    }
+}
+
+suspend fun getReadItems(context: Context, api: SelfossApi, db: AppDatabase, itemsNumber: Int, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+            try {
+                enqueueArticles(api.readItems( itemsNumber, offset), db, false)
+                SharedItems.fetchedAll = true
+                SharedItems.updateDatabase(db)
+            } catch (e: Throwable) {}
+    }
+}
+
+suspend fun getUnreadItems(context: Context, api: SelfossApi, db: AppDatabase, itemsNumber: Int, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            if (!SharedItems.fetchedUnread) {
+                SharedItems.clearDBItems(db)
+            }
+            enqueueArticles(api.newItems(itemsNumber, offset), db, false)
+            SharedItems.fetchedUnread = true
+        } catch (e: Throwable) {}
+    }
+    SharedItems.updateDatabase(db)
+}
+
+suspend fun getStarredItems(context: Context, api: SelfossApi, db: AppDatabase, itemsNumber: Int, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            enqueueArticles(api.starredItems(itemsNumber, offset), db, false)
+            SharedItems.fetchedStarred = true
+            SharedItems.updateDatabase(db)
+        } catch (e: Throwable) {
+        }
+    }
+}
+
+suspend fun readAll(context: Context, api: SelfossApi, db: AppDatabase): Boolean {
+    var success = false
+    if (isNetworkAvailable(context)) {
+        try {
+            val ids = SharedItems.focusedItems.map { it.id }
+            if (ids.isNotEmpty()) {
+                val result = api.readAll(ids)
+                SharedItems.readItems(db, ids)
+                success = result.isSuccess
+            }
+        } catch (e: Throwable) {}
+    }
+    return success
+}
+
+suspend fun reloadBadges(context: Context, api: SelfossApi) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            val response = api.stats()
+
+            if (response.isSuccessful) {
+                val badges = response.body()
+                SharedItems.badgeUnread = badges!!.unread
+                SharedItems.badgeAll = badges.total
+                SharedItems.badgeStarred = badges.starred
+            }
+        } catch (e: Throwable) {}
+    } else {
+        SharedItems.computeBadges()
+    }
+}
+
+private fun enqueueArticles(response: Response<List<Item>>, db: AppDatabase, clearDatabase: Boolean) {
+        if (response.isSuccessful) {
+            if (clearDatabase) {
+                CoroutineScope(Dispatchers.IO).launch {
+                    SharedItems.clearDBItems(db)
+                }
+            }
+            val allItems = response.body() as ArrayList<Item>
+            SharedItems.appendNewItems(allItems)
+        }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossModels.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossModels.kt
new file mode 100644
index 0000000..455e0b9
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossModels.kt
@@ -0,0 +1,253 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import android.content.Context
+import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.Html
+import android.webkit.URLUtil
+import org.jsoup.Jsoup
+
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.isEmptyOrNullOrNullString
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+import com.google.gson.annotations.SerializedName
+import java.util.*
+import kotlin.collections.ArrayList
+
+private fun constructUrl(config: Config?, path: String, file: String?): String {
+    return if (file.isEmptyOrNullOrNullString()) {
+        ""
+    } else {
+        val baseUriBuilder = Uri.parse(config!!.baseUrl).buildUpon()
+        baseUriBuilder.appendPath(path).appendPath(file)
+
+        baseUriBuilder.toString()
+    }
+}
+
+data class Tag(
+    @SerializedName("tag") val tag: String,
+    @SerializedName("color") val color: String,
+    @SerializedName("unread") val unread: Int
+) {
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(tag).toString()
+    }
+}
+
+class SuccessResponse(@SerializedName("success") val success: Boolean) {
+    val isSuccess: Boolean
+        get() = success
+}
+
+class Stats(
+    @SerializedName("total") val total: Int,
+    @SerializedName("unread") val unread: Int,
+    @SerializedName("starred") val starred: Int
+)
+
+data class Spout(
+    @SerializedName("name") val name: String,
+    @SerializedName("description") val description: String
+)
+
+data class ApiVersion(
+        @SerializedName("version") val version: String?,
+        @SerializedName("apiversion") val apiversion: String?
+) {
+    fun getApiMajorVersion() : Int {
+        var versionNumber = 0
+        if (apiversion != null) {
+            versionNumber = apiversion.substringBefore(".").toInt()
+        }
+        return versionNumber
+    }
+}
+
+data class Source(
+    @SerializedName("id") val id: String,
+    @SerializedName("title") val title: String,
+    @SerializedName("tags") val tags: SelfossTagType,
+    @SerializedName("spout") val spout: String,
+    @SerializedName("error") val error: String,
+    @SerializedName("icon") val icon: String
+) {
+    var config: Config? = null
+
+    fun getIcon(app: Context): String {
+        if (config == null) {
+            config = Config(app)
+        }
+        return constructUrl(config, "favicons", icon)
+    }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
+}
+
+data class Item(
+    @SerializedName("id") val id: String,
+    @SerializedName("datetime") val datetime: String,
+    @SerializedName("title") val title: String,
+    @SerializedName("content") val content: String,
+    @SerializedName("unread") var unread: Boolean,
+    @SerializedName("starred") var starred: Boolean,
+    @SerializedName("thumbnail") val thumbnail: String?,
+    @SerializedName("icon") val icon: String?,
+    @SerializedName("link") val link: String,
+    @SerializedName("sourcetitle") val sourcetitle: String,
+    @SerializedName("tags") val tags: SelfossTagType
+) : Parcelable {
+
+    var config: Config? = null
+
+    companion object {
+        @JvmField val CREATOR: Parcelable.Creator<Item> = object : Parcelable.Creator<Item> {
+            override fun createFromParcel(source: Parcel): Item = Item(source)
+            override fun newArray(size: Int): Array<Item?> = arrayOfNulls(size)
+        }
+    }
+
+    constructor(source: Parcel) : this(
+        id = source.readString().orEmpty(),
+        datetime = source.readString().orEmpty(),
+        title = source.readString().orEmpty(),
+        content = source.readString().orEmpty(),
+        unread = 0.toByte() != source.readByte(),
+        starred = 0.toByte() != source.readByte(),
+        thumbnail = source.readString(),
+        icon = source.readString(),
+        link = source.readString().orEmpty(),
+        sourcetitle = source.readString().orEmpty(),
+        tags = if (source.readParcelable<SelfossTagType>(ClassLoader.getSystemClassLoader()) != null) source.readParcelable(ClassLoader.getSystemClassLoader())!! else SelfossTagType("")
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(id)
+        dest.writeString(datetime)
+        dest.writeString(title)
+        dest.writeString(content)
+        dest.writeByte((if (unread) 1 else 0))
+        dest.writeByte((if (starred) 1 else 0))
+        dest.writeString(thumbnail)
+        dest.writeString(icon)
+        dest.writeString(link)
+        dest.writeString(sourcetitle)
+        dest.writeParcelable(tags, flags)
+    }
+
+    fun getIcon(app: Context): String {
+        if (config == null) {
+            config = Config(app)
+        }
+        return constructUrl(config, "favicons", icon)
+    }
+
+    fun getThumbnail(app: Context): String {
+        if (config == null) {
+            config = Config(app)
+        }
+        return constructUrl(config, "thumbnails", thumbnail)
+    }
+
+    fun getImages() : ArrayList<String> {
+        val allImages = ArrayList<String>()
+
+        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
+            val url = image.attr("src")
+            if (url.lowercase(Locale.US).contains(".jpg") ||
+                    url.lowercase(Locale.US).contains(".jpeg") ||
+                    url.lowercase(Locale.US).contains(".png") ||
+                    url.lowercase(Locale.US).contains(".webp"))
+            {
+                allImages.add(url)
+            }
+        }
+        return allImages
+    }
+
+    fun preloadImages(context: Context) : Boolean {
+        val imageUrls = this.getImages()
+
+        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
+
+
+        try {
+            for (url in imageUrls) {
+                if ( URLUtil.isValidUrl(url)) {
+                    val image = Glide.with(context).asBitmap()
+                            .apply(glideOptions)
+                            .load(url).submit()
+                }
+            }
+        } catch (e : Error) {
+            return false
+        }
+
+        return true
+    }
+
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(title).toString()
+    }
+
+    fun getSourceTitle(): String {
+        return Html.fromHtml(sourcetitle).toString()
+    }
+
+    // TODO: maybe find a better way to handle these kind of urls
+    fun getLinkDecoded(): String {
+        var stringUrl: String
+        stringUrl =
+                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
+                    if (link.contains("&amp;url=")) {
+                        link.substringAfter("&amp;url=")
+                    } else {
+                        this.link.replace("&amp;", "&")
+                    }
+                } else {
+                    this.link.replace("&amp;", "&")
+                }
+
+        // handle :443 => https
+        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
+    }
+}
+
+data class SelfossTagType(val tags: String) : Parcelable {
+
+    companion object {
+        @JvmField val CREATOR: Parcelable.Creator<SelfossTagType> =
+            object : Parcelable.Creator<SelfossTagType> {
+                override fun createFromParcel(source: Parcel): SelfossTagType =
+                    SelfossTagType(source)
+
+                override fun newArray(size: Int): Array<SelfossTagType?> = arrayOfNulls(size)
+            }
+    }
+
+    constructor(source: Parcel) : this(
+        tags = source.readString().orEmpty()
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(tags)
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossService.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossService.kt
new file mode 100644
index 0000000..335c05e
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossService.kt
@@ -0,0 +1,141 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import retrofit2.Call
+import retrofit2.Response
+import retrofit2.http.DELETE
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+internal interface SelfossService {
+
+    @GET("login")
+    fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
+
+    @GET("items")
+    suspend fun getItems(
+        @Query("type") type: String,
+        @Query("tag") tag: String?,
+        @Query("source") source: Long?,
+        @Query("search") search: String?,
+        @Query("updatedsince") updatedSince: String?,
+        @Query("username") username: String,
+        @Query("password") password: String,
+        @Query("items") items: Int,
+        @Query("offset") offset: Int
+    ): Response<List<Item>>
+
+    @GET("items")
+    fun allItems(
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<List<Item>>
+
+    @Headers("Content-Type: application/x-www-form-urlencoded")
+    @POST("mark/{id}")
+    fun markAsRead(
+        @Path("id") id: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @Headers("Content-Type: application/x-www-form-urlencoded")
+    @POST("unmark/{id}")
+    fun unmarkAsRead(
+        @Path("id") id: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @FormUrlEncoded
+    @POST("mark")
+    suspend fun markAllAsRead(
+        @Field("ids[]") ids: List<String>,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): SuccessResponse
+
+    @Headers("Content-Type: application/x-www-form-urlencoded")
+    @POST("starr/{id}")
+    fun starr(
+        @Path("id") id: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @Headers("Content-Type: application/x-www-form-urlencoded")
+    @POST("unstarr/{id}")
+    fun unstarr(
+        @Path("id") id: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @GET("stats")
+    suspend fun stats(
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Response<Stats>
+
+    @GET("tags")
+    fun tags(
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<List<Tag>>
+
+    @GET("update")
+    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<Source>>
+
+    @GET("api/about")
+    fun version(): Call<ApiVersion>
+
+    @DELETE("source/{id}")
+    fun deleteSource(
+        @Path("id") id: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @FormUrlEncoded
+    @POST("source")
+    fun createSource(
+        @Field("title") title: String,
+        @Field("url") url: String,
+        @Field("spout") spout: String,
+        @Field("tags") tags: String,
+        @Field("filter") filter: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+
+    @FormUrlEncoded
+    @POST("source")
+    fun createSourceApi2(
+        @Field("title") title: String,
+        @Field("url") url: String,
+        @Field("spout") spout: String,
+        @Field("tags[]") tags: List<String>,
+        @Field("filter") filter: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossTagTypeTypeAdapter.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossTagTypeTypeAdapter.kt
new file mode 100644
index 0000000..318eeb0
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/api/selfoss/SelfossTagTypeTypeAdapter.kt
@@ -0,0 +1,22 @@
+package bou.amine.apps.readerforselfossv2.android.api.selfoss
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+
+internal class SelfossTagTypeTypeAdapter : JsonDeserializer<SelfossTagType> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): SelfossTagType? =
+        if (json.isJsonArray) {
+            SelfossTagType(json.asJsonArray.joinToString(",") { it.toString() })
+        } else {
+            SelfossTagType(json.toString())
+        }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt
new file mode 100644
index 0000000..fd930a8
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt
@@ -0,0 +1,169 @@
+package bou.amine.apps.readerforselfossv2.android.background
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.preference.PreferenceManager
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
+import androidx.core.app.NotificationCompat.PRIORITY_LOW
+import androidx.room.Room
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import bou.amine.apps.readerforselfossv2.android.MainActivity
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.getAndStoreAllItems
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.SharedItems
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAvailable
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+import kotlin.concurrent.schedule
+import kotlin.concurrent.thread
+
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
+    lateinit var db: AppDatabase
+
+override fun doWork(): Result {
+    val settings =
+        this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+    val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+    val periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
+    if (periodicRefresh) {
+        val api = SelfossApi(
+            this.context,
+            null,
+            settings.getBoolean("isSelfSignedCert", false),
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
+
+        if (isNetworkAvailable(context)) {
+
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+                val notification =
+                    NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(Config.syncChannelId)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+
+                notificationManager.notify(1, notification.build())
+
+                val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
+
+                db = Room.databaseBuilder(
+                    applicationContext,
+                    AppDatabase::class.java, "selfoss-database"
+                ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3)
+                    .addMigrations(MIGRATION_3_4).build()
+
+                val actions = db.actionsDao().actions()
+
+                actions.forEach { action ->
+                    when {
+                        action.read -> doAndReportOnFail(
+                            api.markItem(action.articleId),
+                            action
+                        )
+                        action.unread -> doAndReportOnFail(
+                            api.unmarkItem(action.articleId),
+                            action
+                        )
+                        action.starred -> doAndReportOnFail(
+                            api.starrItem(action.articleId),
+                            action
+                        )
+                        action.unstarred -> doAndReportOnFail(
+                            api.unstarrItem(action.articleId),
+                            action
+                        )
+                    }
+                }
+
+                getAndStoreAllItems(context, api, db)
+                SharedItems.updateDatabase(db)
+                storeItems(notifyNewItems, notificationManager)
+            }
+        }
+    }
+    return Result.success()
+}
+
+    private fun storeItems(notifyNewItems: Boolean, notificationManager: NotificationManager) {
+        CoroutineScope(Dispatchers.IO).launch {
+                val apiItems = SharedItems.items
+
+
+                val newSize = apiItems.filter { it.unread }.size
+                if (notifyNewItems && newSize > 0) {
+
+                    val intent = Intent(context, MainActivity::class.java).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    }
+                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        0
+                    }
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
+
+                    val newItemsNotification =
+                        NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                            .setContentTitle(context.getString(R.string.new_items_notification_title))
+                            .setContentText(
+                                context.getString(
+                                    R.string.new_items_notification_text,
+                                    newSize
+                                )
+                            )
+                            .setPriority(PRIORITY_DEFAULT)
+                            .setChannelId(Config.newItemsChannelId)
+                            .setContentIntent(pendingIntent)
+                            .setAutoCancel(true)
+                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
+
+                    Timer("", false).schedule(4000) {
+                        notificationManager.notify(2, newItemsNotification.build())
+                    }
+                }
+                apiItems.map { it.preloadImages(context) }
+            Timer("", false).schedule(4000) {
+                notificationManager.cancel(1)
+            }
+        }
+    }
+
+    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
+        call.enqueue(object : Callback<T> {
+            override fun onResponse(
+                call: Call<T>,
+                response: Response<T>
+            ) {
+                thread {
+                    db.actionsDao().delete(action)
+                }
+            }
+
+            override fun onFailure(call: Call<T>, t: Throwable) {
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
new file mode 100644
index 0000000..cd39850
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt
@@ -0,0 +1,564 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Bitmap
+import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
+import android.net.Uri
+import android.os.Bundle
+import androidx.preference.PreferenceManager
+import android.view.*
+import android.webkit.*
+import android.widget.Toast
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.fragment.app.Fragment
+import androidx.core.widget.NestedScrollView
+import androidx.appcompat.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.res.ResourcesCompat
+import androidx.room.Room
+import bou.amine.apps.readerforselfossv2.android.ImageActivity
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
+import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
+import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
+import bou.amine.apps.readerforselfossv2.android.themes.AppColors
+import bou.amine.apps.readerforselfossv2.android.utils.*
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
+import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import bou.amine.apps.readerforselfossv2.android.utils.*
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+import com.github.rubensousa.floatingtoolbar.FloatingToolbar
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.net.MalformedURLException
+import java.net.URL
+import java.util.*
+import java.util.concurrent.ExecutionException
+import kotlin.collections.ArrayList
+
+class ArticleFragment : Fragment() {
+    private var fontSize: Int = 16
+    private lateinit var item: Item
+    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
+    private lateinit var url: String
+    private lateinit var contentText: String
+    private lateinit var contentSource: String
+    private lateinit var contentImage: String
+    private lateinit var contentTitle: String
+    private lateinit var allImages : ArrayList<String>
+    private lateinit var editor: SharedPreferences.Editor
+    private lateinit var fab: FloatingActionButton
+    private lateinit var appColors: AppColors
+    private lateinit var db: AppDatabase
+    private lateinit var textAlignment: String
+    private lateinit var config: Config
+    private var _binding: FragmentArticleBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var prefs: SharedPreferences
+
+    private var typeface: Typeface? = null
+    private var resId: Int = 0
+    private var font = ""
+    private var staticBar = false
+
+    override fun onStop() {
+        super.onStop()
+        if (mCustomTabActivityHelper != null) {
+            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        appColors = AppColors(requireActivity())
+        config = Config(requireActivity())
+
+        super.onCreate(savedInstanceState)
+
+        item = requireArguments().getParcelable(ARG_ITEMS)!!
+
+        db = Room.databaseBuilder(
+            requireContext(),
+            AppDatabase::class.java, "selfoss-database"
+        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        try {
+            _binding = FragmentArticleBinding.inflate(inflater, container, false)
+
+            url = item.getLinkDecoded()
+            contentText = item.content
+            contentTitle = item.getTitleDecoded()
+            contentImage = item.getThumbnail(requireActivity())
+            contentSource = item.sourceAndDateText()
+            allImages = item.getImages()
+
+            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+            editor = prefs.edit()
+            fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
+            staticBar = prefs.getBoolean("reader_static_bar", false)
+
+            font = prefs.getString("reader_font", "")!!
+            if (font.isNotEmpty()) {
+                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
+                typeface = try {
+                    ResourcesCompat.getFont(requireContext(), resId)!!
+                } catch (e: java.lang.Exception) {
+                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), requireContext())
+                    // Just to be sure
+                    null
+                }
+            }
+
+            refreshAlignment()
+
+            val settings = requireActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+            val api = SelfossApi(
+                requireContext(),
+                requireActivity(),
+                settings.getBoolean("isSelfSignedCert", false),
+                prefs.getString("api_timeout", "-1")!!.toLong()
+            )
+
+            fab = binding.fab
+
+            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+
+            fab.rippleColor = appColors.colorAccentDark
+
+            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+            floatingToolbar.attachFab(fab)
+
+            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
+
+            val customTabsIntent = requireActivity().buildCustomTabsIntent()
+            mCustomTabActivityHelper = CustomTabActivityHelper()
+            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
+
+
+            floatingToolbar.setClickListener(
+                object : FloatingToolbar.ItemClickListener {
+                    override fun onItemClick(item: MenuItem) {
+                        when (item.itemId) {
+                            R.id.more_action -> getContentFromMercury(customTabsIntent)
+                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                            R.id.unread_action -> if (context != null) {
+                                if (this@ArticleFragment.item.unread) {
+                                    SharedItems.readItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                            this@ArticleFragment.item
+                                    )
+                                    this@ArticleFragment.item.unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                } else {
+                                    SharedItems.unreadItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                            this@ArticleFragment.item
+                                    )
+                                    this@ArticleFragment.item.unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                }
+                            }
+                            else -> Unit
+                        }
+                    }
+
+                    override fun onItemLongClick(item: MenuItem?) {
+                    }
+                }
+            )
+
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
+            binding.source.text = contentSource
+            if (typeface != null) {
+                binding.source.typeface = typeface
+            }
+
+            if (contentText.isEmptyOrNullOrNullString()) {
+                getContentFromMercury(customTabsIntent)
+            } else {
+                binding.titleView.text = contentTitle
+                if (typeface != null) {
+                    binding.titleView.typeface = typeface
+                }
+
+                htmlToWebview()
+
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    binding.imageView.visibility = View.VISIBLE
+                    Glide
+                        .with(requireContext())
+                        .asBitmap()
+                        .loadMaybeBasicAuth(config, contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(binding.imageView)
+                } else {
+                    binding.imageView.visibility = View.GONE
+                }
+            }
+
+            binding.nestedScrollView.setOnScrollChangeListener(
+                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                    if (scrollY > oldScrollY) {
+                        floatingToolbar.hide()
+                        fab.hide()
+                    } else {
+                        if (staticBar) {
+                            floatingToolbar.show()
+                        } else {
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        }
+                    }
+                }
+            )
+
+        } catch (e: InflateException) {
+            AlertDialog.Builder(requireContext())
+                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
+                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
+                .setPositiveButton(android.R.string.ok
+                ) { _, _ ->
+                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(requireContext())
+                    val editor = sharedPref.edit()
+                    editor.putBoolean("prefer_article_viewer", false)
+                    editor.apply()
+                    requireActivity().finish()
+                }
+                .create()
+                .show()
+        }
+
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun refreshAlignment() {
+        textAlignment = when (prefs.getInt("text_align", 1)) {
+            1 -> "justify"
+            2 -> "left"
+            else -> "justify"
+        }
+    }
+
+    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
+        if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
+            binding.progressBar.visibility = View.VISIBLE
+            val parser = MercuryApi()
+
+            parser.parseUrl(url).enqueue(
+                object : Callback<ParsedContent> {
+                    override fun onResponse(
+                        call: Call<ParsedContent>,
+                        response: Response<ParsedContent>
+                    ) {
+                        // TODO: clean all the following after finding the mercury content issue
+                        try {
+                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
+                                try {
+                                    binding.titleView.text = response.body()!!.title
+                                    if (typeface != null) {
+                                        binding.titleView.typeface = typeface
+                                    }
+                                    try {
+                                        // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                                        URL(response.body()!!.url)
+                                        url = response.body()!!.url
+                                    } catch (e: MalformedURLException) {
+                                        // Mercury returned a relative url. We do nothing.
+                                    }
+                                } catch (e: Exception) {
+                                }
+
+                                try {
+                                    contentText = response.body()!!.content.orEmpty()
+                                    htmlToWebview()
+                                } catch (e: Exception) {
+                                }
+
+                                try {
+                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
+                                        binding.imageView.visibility = View.VISIBLE
+                                        try {
+                                            Glide
+                                                .with(requireContext())
+                                                .asBitmap()
+                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
+                                                .apply(RequestOptions.fitCenterTransform())
+                                                .into(binding.imageView)
+                                        } catch (e: Exception) {
+                                        }
+                                    } else {
+                                        binding.imageView.visibility = View.GONE
+                                    }
+                                } catch (e: Exception) {
+                                    if (context != null) {
+                                    }
+                                }
+
+                                try {
+                                    binding.nestedScrollView.scrollTo(0, 0)
+
+                                    binding.progressBar.visibility = View.GONE
+                                } catch (e: Exception) {
+                                    if (context != null) {
+                                    }
+                                }
+                            } else {
+                                try {
+                                    openInBrowserAfterFailing(customTabsIntent)
+                                } catch (e: Exception) {
+                                    if (context != null) {
+                                    }
+                                }
+                            }
+                        } catch (e: Exception) {
+                            if (context != null) {
+                            }
+                        }
+                    }
+
+                    override fun onFailure(
+                        call: Call<ParsedContent>,
+                        t: Throwable
+                    ) = openInBrowserAfterFailing(customTabsIntent)
+                }
+            )
+        }
+    }
+
+    private fun htmlToWebview() {
+        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
+
+        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
+        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
+
+
+        binding.webcontent.settings.standardFontFamily = a.getString(0)
+        binding.webcontent.visibility = View.VISIBLE
+
+        // TODO: Set the color strings programmatically
+        val (stringTextColor, stringBackgroundColor) = if (appColors.isDarkTheme) {
+            Pair("#FFFFFF", "#303030")
+        } else {
+            Pair("#212121", "#FAFAFA")
+        }
+
+        binding.webcontent.settings.useWideViewPort = true
+        binding.webcontent.settings.loadWithOverviewMode = true
+        binding.webcontent.settings.javaScriptEnabled = false
+
+        binding.webcontent.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                }
+                return true
+            }
+
+            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
+                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
+                    }catch ( e : ExecutionException) {}
+                }
+                else if (url.lowercase(Locale.US).contains(".png")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
+                    }catch ( e : ExecutionException) {}
+                }
+                else if (url.lowercase(Locale.US).contains(".webp")) {
+                    try {
+                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
+                    }catch ( e : ExecutionException) {}
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onSingleTapUp(e: MotionEvent?): Boolean {
+                return performClick()
+            }
+        })
+
+        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
+
+        binding.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+
+        var baseUrl: String? = null
+
+        try {
+            val itemUrl = URL(url)
+            baseUrl = itemUrl.protocol + "://" + itemUrl.host
+        } catch (e: MalformedURLException) {
+        }
+
+        val fontName =  when (font) {
+            getString(R.string.open_sans_font_id) -> "Open Sans"
+            getString(R.string.roboto_font_id) -> "Roboto"
+            else -> ""
+        }
+
+        val fontLinkAndStyle = if (font.isNotEmpty()) {
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
+                |<style>
+                |   * {
+                |       font-family: '$fontName';
+                |   }
+                |</style>
+            """.trimMargin()
+        } else {
+            ""
+        }
+
+        binding.webcontent.loadDataWithBaseURL(
+            baseUrl,
+            """<html>
+                |<head>
+                |   <meta name="viewport" content="width=device-width, initial-scale=1">
+                |   <style>
+                |      img {
+                |        display: inline-block;
+                |        height: auto;
+                |        width: 100%;
+                |        max-width: 100%;
+                |      }
+                |      a {
+                |        color: $stringColor !important;
+                |      }
+                |      *:not(a) {
+                |        color: $stringTextColor;
+                |      }
+                |      * {
+                |        font-size: ${fontSize}px;
+                |        text-align: $textAlignment;
+                |        word-break: break-word;
+                |        overflow:hidden;
+                |        line-height: 1.5em;
+                |        background-color: $stringBackgroundColor;
+                |      }
+                |      body, html {
+                |        background-color: $stringBackgroundColor !important;
+                |        border-color: $stringBackgroundColor  !important;
+                |        padding: 0 !important;
+                |        margin: 0 !important;
+                |      }
+                |      a, pre, code {
+                |        text-align: $textAlignment;
+                |      }
+                |      pre, code {
+                |        white-space: pre-wrap;
+                |        width:100%;
+                |        background-color: $stringBackgroundColor;
+                |      }
+                |   </style>
+                |   $fontLinkAndStyle
+                |</head>
+                |<body>
+                |   $contentText
+                |</body>""".trimMargin(),
+            "text/html",
+            "utf-8",
+            null
+        )
+    }
+
+    fun scrollDown() {
+        val height = binding.nestedScrollView.measuredHeight
+        binding.nestedScrollView.smoothScrollBy(0, height/2)
+    }
+
+    fun scrollUp() {
+        val height = binding.nestedScrollView.measuredHeight
+        binding.nestedScrollView.smoothScrollBy(0, -height/2)
+    }
+
+    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
+        binding.progressBar.visibility = View.GONE
+        requireActivity().openItemUrlInternalBrowser(
+                url,
+                customTabsIntent,
+                requireActivity()
+        )
+    }
+
+    companion object {
+        private const val ARG_ITEMS = "items"
+
+        fun newInstance(
+                item: Item
+        ): ArticleFragment {
+            val fragment = ArticleFragment()
+            val args = Bundle()
+            args.putParcelable(ARG_ITEMS, item)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    fun performClick(): Boolean {
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+
+            val intent = Intent(activity, ImageActivity::class.java)
+            intent.putExtra("allImages", allImages)
+            intent.putExtra("position", position)
+            startActivity(intent)
+            return false
+        }
+        return false
+    }
+
+
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ImageFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ImageFragment.kt
new file mode 100644
index 0000000..50d1ea1
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ImageFragment.kt
@@ -0,0 +1,56 @@
+package bou.amine.apps.readerforselfossv2.android.fragments
+
+import android.os.Bundle
+import android.view.*
+import androidx.fragment.app.Fragment
+import bou.amine.apps.readerforselfossv2.android.databinding.FragmentImageBinding
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+
+class ImageFragment : Fragment() {
+
+    private lateinit var imageUrl : String
+    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+    private var _binding: FragmentImageBinding? = null
+    private val binding get() = _binding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        imageUrl = requireArguments().getString("imageUrl")!!
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        _binding = FragmentImageBinding.inflate(inflater, container, false)
+        val view = binding?.root
+
+        binding!!.photoView.visibility = View.VISIBLE
+        Glide.with(activity)
+                .asBitmap()
+                .apply(glideOptions)
+                .load(imageUrl)
+                .into(binding!!.photoView)
+
+        return view
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val ARG_IMAGE = "imageUrl"
+
+        fun newInstance(
+                imageUrl : String
+        ): ImageFragment {
+            val fragment = ImageFragment()
+            val args = Bundle()
+            args.putString(ARG_IMAGE, imageUrl)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ActionsDao.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ActionsDao.kt
new file mode 100644
index 0000000..f834c22
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ActionsDao.kt
@@ -0,0 +1,23 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
+
+@Dao
+interface ActionsDao {
+    @Query("SELECT * FROM actions order by id asc")
+    suspend fun actions(): List<ActionEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllActions(vararg actions: ActionEntity)
+
+    @Query("DELETE FROM actions WHERE articleid = :article_id AND read = 1")
+    fun deleteReadActionForArticle(article_id: String)
+
+    @Delete
+    fun delete(action: ActionEntity)
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/DrawerDataDao.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/DrawerDataDao.kt
new file mode 100644
index 0000000..7b8c98c
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/DrawerDataDao.kt
@@ -0,0 +1,36 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.dao
+
+import androidx.room.Delete
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
+
+@Dao
+interface DrawerDataDao {
+    @Query("SELECT * FROM tags")
+    fun tags(): List<TagEntity>
+
+    @Query("SELECT * FROM sources")
+    fun sources(): List<SourceEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllTags(vararg tags: TagEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllSources(vararg sources: SourceEntity)
+
+    @Query("DELETE FROM tags")
+    fun deleteAllTags()
+
+    @Query("DELETE FROM sources")
+    fun deleteAllSources()
+
+    @Delete
+    fun deleteTag(tag: TagEntity)
+
+    @Delete
+    fun deleteSource(source: SourceEntity)
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ItemsDao.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ItemsDao.kt
new file mode 100644
index 0000000..d85eb66
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/dao/ItemsDao.kt
@@ -0,0 +1,29 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ItemEntity
+import androidx.room.Update
+
+
+
+@Dao
+interface ItemsDao {
+    @Query("SELECT * FROM items order by id desc")
+    suspend fun items(): List<ItemEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllItems(vararg items: ItemEntity)
+
+    @Query("DELETE FROM items")
+    suspend fun deleteAllItems()
+
+    @Delete
+    suspend fun delete(item: ItemEntity)
+
+    @Update
+    suspend fun updateItem(item: ItemEntity)
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/database/AppDatabase.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/database/AppDatabase.kt
new file mode 100644
index 0000000..20be67a
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/database/AppDatabase.kt
@@ -0,0 +1,20 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.database
+
+import androidx.room.RoomDatabase
+import androidx.room.Database
+import bou.amine.apps.readerforselfossv2.android.persistence.dao.ActionsDao
+import bou.amine.apps.readerforselfossv2.android.persistence.dao.DrawerDataDao
+import bou.amine.apps.readerforselfossv2.android.persistence.dao.ItemsDao
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ItemEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
+
+@Database(entities = [TagEntity::class, SourceEntity::class, ItemEntity::class, ActionEntity::class], version = 4)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun drawerDataDao(): DrawerDataDao
+
+    abstract fun itemsDao(): ItemsDao
+
+    abstract fun actionsDao(): ActionsDao
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ActionEntity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ActionEntity.kt
new file mode 100644
index 0000000..2a15e82
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ActionEntity.kt
@@ -0,0 +1,22 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "actions")
+data class ActionEntity(
+    @ColumnInfo(name = "articleid")
+    val articleId: String,
+    @ColumnInfo(name = "read")
+    val read: Boolean,
+    @ColumnInfo(name = "unread")
+    val unread: Boolean,
+    @ColumnInfo(name = "starred")
+    var starred: Boolean,
+    @ColumnInfo(name = "unstarred")
+    var unstarred: Boolean
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Int = 0
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/DrawerDataEntity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/DrawerDataEntity.kt
new file mode 100644
index 0000000..cca0542
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/DrawerDataEntity.kt
@@ -0,0 +1,33 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "tags")
+data class TagEntity(
+    @PrimaryKey
+    @ColumnInfo(name = "tag")
+    val tag: String,
+    @ColumnInfo(name = "color")
+    val color: String,
+    @ColumnInfo(name = "unread")
+    val unread: Int
+)
+
+@Entity(tableName = "sources")
+data class SourceEntity(
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    val id: String,
+    @ColumnInfo(name = "title")
+    val title: String,
+    @ColumnInfo(name = "tags")
+    val tags: String,
+    @ColumnInfo(name = "spout")
+    val spout: String,
+    @ColumnInfo(name = "error")
+    val error: String,
+    @ColumnInfo(name = "icon")
+    val icon: String
+)
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ItemEntity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ItemEntity.kt
new file mode 100644
index 0000000..5b97779
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/entities/ItemEntity.kt
@@ -0,0 +1,32 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "items")
+data class ItemEntity(
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    val id: String,
+    @ColumnInfo(name = "datetime")
+    val datetime: String,
+    @ColumnInfo(name = "title")
+    val title: String,
+    @ColumnInfo(name = "content")
+    val content: String,
+    @ColumnInfo(name = "unread")
+    val unread: Boolean,
+    @ColumnInfo(name = "starred")
+    var starred: Boolean,
+    @ColumnInfo(name = "thumbnail")
+    val thumbnail: String?,
+    @ColumnInfo(name = "icon")
+    val icon: String?,
+    @ColumnInfo(name = "link")
+    val link: String,
+    @ColumnInfo(name = "sourcetitle")
+    val sourcetitle: String,
+    @ColumnInfo(name = "tags")
+    val tags: String
+)
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/migrations/migrations.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/migrations/migrations.kt
new file mode 100644
index 0000000..1636fd5
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/persistence/migrations/migrations.kt
@@ -0,0 +1,34 @@
+package bou.amine.apps.readerforselfossv2.android.persistence.migrations
+
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.migration.Migration
+
+val MIGRATION_1_2: Migration = object : Migration(1, 2) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `items` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
+    }
+}
+
+val MIGRATION_2_3: Migration = object : Migration(2, 3) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
+    }
+}
+
+val MIGRATION_3_4: Migration = object : Migration(3, 4) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // @see https://stackoverflow.com/questions/57392015/how-to-migrate-not-null-table-column-into-null-in-android-room-database
+        // Create the new table
+        database.execSQL("CREATE TABLE IF NOT EXISTS `itemstmp` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
+
+        // Copy the data
+        database.execSQL(
+                "INSERT INTO itemstmp (`id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags`) SELECT `id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags` FROM items")
+
+        // Remove the old table
+        database.execSQL("DROP TABLE items")
+
+        // Change the table name to the correct one
+        database.execSQL("ALTER TABLE itemstmp RENAME TO items")
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
new file mode 100644
index 0000000..aa708e7
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
@@ -0,0 +1,221 @@
+package bou.amine.apps.readerforselfossv2.android.settings
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.*
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceManager
+import android.view.*
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.addTextChangedListener
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
+import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import com.ftinc.scoop.Scoop
+import java.lang.NumberFormatException
+
+private const val TITLE_TAG = "settingsActivityTitle"
+
+class SettingsActivity : AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", false)) {
+            setTheme(R.style.NoBarDark)
+        }
+        val binding = ActivitySettingsBinding.inflate(layoutInflater)
+
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        setContentView(binding.root)
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.settings, MainPreferenceFragment())
+                    .commit()
+        } else {
+            title = savedInstanceState.getCharSequence(TITLE_TAG)
+        }
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                setTitle(R.string.title_activity_settings)
+            }
+        }
+
+        setSupportActionBar(binding.toolbar)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.title = title
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        // Save current activity title so we can set it again after a configuration change
+        outState.putCharSequence(TITLE_TAG, title)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        if (supportFragmentManager.popBackStackImmediate()) {
+            supportActionBar?.title = getText(R.string.title_activity_settings)
+            return true
+        }
+        return super.onSupportNavigateUp()
+    }
+
+    override fun onPreferenceStartFragment(
+            caller: PreferenceFragmentCompat,
+            pref: Preference
+    ): Boolean {
+        // Instantiate the new Fragment
+        val args = pref.extras
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
+                classLoader,
+                pref.fragment
+        ).apply {
+            arguments = args
+            setTargetFragment(caller, 0)
+        }
+        // Replace the existing Fragment with the new Fragment
+        supportFragmentManager.beginTransaction()
+                .replace(R.id.settings, fragment)
+                .addToBackStack(null)
+                .commit()
+        title = pref.title
+        supportActionBar?.title = title
+        return true
+    }
+
+    class MainPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_main, rootKey)
+        }
+    }
+
+    class GeneralPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_general, rootKey)
+
+            val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
+            editTextPreference?.setOnBindEditTextListener { editText ->
+                editText.inputType = InputType.TYPE_CLASS_NUMBER
+                editText.filters = arrayOf(
+                        InputFilter { source, _, _, dest, _, _ ->
+                            try {
+                                val input: Int = (dest.toString() + source.toString()).toInt()
+                                if (input in 1..200) return@InputFilter null
+                            } catch (nfe: NumberFormatException) {
+                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
+                            }
+                            ""
+                        }
+                )
+            }
+        }
+    }
+
+    class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_viewer, rootKey)
+
+            val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
+            fontSize?.setOnBindEditTextListener { editText ->
+                editText.inputType = InputType.TYPE_CLASS_NUMBER
+                editText.addTextChangedListener { object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun afterTextChanged(editable: Editable) {
+                        try {
+                            editText.textSize = editable.toString().toInt().toFloat()
+                        } catch (e: NumberFormatException) {
+                        }
+                    }
+                } }
+                editText.filters = arrayOf(
+                        InputFilter { source, _, _, dest, _, _ ->
+                            try {
+                                val input = (dest.toString() + source.toString()).toInt()
+                                if (input > 0) return@InputFilter null
+                            } catch (nfe: NumberFormatException) {
+                            }
+                            ""
+                        }
+                )
+            }
+        }
+    }
+
+    class OfflinePreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_offline, rootKey)
+        }
+    }
+
+    class ThemePreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_theme, rootKey)
+            setHasOptionsMenu(true)
+        }
+
+        override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+            super.onCreateOptionsMenu(menu, inflater)
+            inflater.inflate(R.menu.settings_theme, menu)
+        }
+
+        override fun onOptionsItemSelected(item: MenuItem): Boolean {
+            val id = item.itemId
+            if (id == R.id.clear) {
+                val pref = PreferenceManager.getDefaultSharedPreferences(activity)
+                val editor = pref.edit()
+                editor.remove("color_primary")
+                editor.remove("color_primary_dark")
+                editor.remove("color_accent")
+                editor.remove("color_accent_dark")
+                editor.remove("dark_theme")
+                editor.apply()
+                requireActivity().recreate()
+            }
+            return super.onOptionsItemSelected(item)
+        }
+    }
+
+    class LinksPreferenceFragment : PreferenceFragmentCompat() {
+        private fun openUrl(uri: Uri?) {
+            val browserIntent = Intent(Intent.ACTION_VIEW, uri)
+            startActivity(browserIntent)
+        }
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_links, rootKey)
+
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.trackerUrl))
+                true
+            }
+
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.sourceUrl))
+                false
+            }
+
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.translationUrl))
+                false
+            }
+        }
+    }
+
+    class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_experimental, rootKey)
+        }
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/AppColors.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/AppColors.kt
new file mode 100644
index 0000000..321c400
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/AppColors.kt
@@ -0,0 +1,61 @@
+package bou.amine.apps.readerforselfossv2.android.themes
+
+import android.app.Activity
+import androidx.annotation.ColorInt
+import androidx.preference.PreferenceManager
+import bou.amine.apps.readerforselfossv2.android.R
+
+class AppColors(a: Activity) {
+
+    @ColorInt val colorPrimary: Int
+    @ColorInt val colorPrimaryDark: Int
+    @ColorInt val colorAccent: Int
+    @ColorInt val colorAccentDark: Int
+    @ColorInt val colorBackground: Int
+    @ColorInt val textColor: Int
+    val isDarkTheme: Boolean
+
+    init {
+        val sharedPref = PreferenceManager.getDefaultSharedPreferences(a)
+
+        colorPrimary =
+                sharedPref.getInt(
+                    "color_primary",
+                    a.resources.getColor(R.color.colorPrimary)
+                )
+        colorPrimaryDark =
+                sharedPref.getInt(
+                    "color_primary_dark",
+                    a.resources.getColor(R.color.colorPrimaryDark)
+                )
+        colorAccent =
+                sharedPref.getInt(
+                    "color_accent",
+                    a.resources.getColor(R.color.colorAccent)
+                )
+        colorAccentDark =
+                sharedPref.getInt(
+                    "color_accent_dark",
+                    a.resources.getColor(R.color.colorAccentDark)
+                )
+        isDarkTheme =
+                sharedPref.getBoolean(
+                    "dark_theme",
+                    false
+                )
+
+        colorBackground = if (isDarkTheme) {
+            a.setTheme(R.style.NoBarDark)
+            R.color.darkBackground
+        } else {
+            a.setTheme(R.style.NoBar)
+            R.color.grey_50
+        }
+
+        textColor = if (isDarkTheme) {
+            R.color.white
+        } else {
+            R.color.grey_900
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/Toppings.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/Toppings.kt
new file mode 100644
index 0000000..ecda680
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/themes/Toppings.kt
@@ -0,0 +1,8 @@
+package bou.amine.apps.readerforselfossv2.android.themes
+
+enum class Toppings(val value: Int) {
+    PRIMARY(1),
+    PRIMARY_DARK(2),
+    ACCENT(3),
+    ACCENT_DARK(4)
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ApiUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ApiUtils.kt
new file mode 100644
index 0000000..51a9458
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ApiUtils.kt
@@ -0,0 +1,7 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SuccessResponse
+import retrofit2.Response
+
+fun Response<SuccessResponse>.succeeded(): Boolean =
+    this.code() === 200 && this.body() != null && this.body()!!.isSuccess
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/AppUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/AppUtils.kt
new file mode 100644
index 0000000..045b1d7
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/AppUtils.kt
@@ -0,0 +1,41 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.content.Context
+import android.content.Intent
+import bou.amine.apps.readerforselfossv2.android.R
+
+fun String?.isEmptyOrNullOrNullString(): Boolean =
+    this == null || this == "null" || this.isEmpty()
+
+fun String.longHash(): Long {
+    var h = 98764321261L
+    val l = this.length
+    val chars = this.toCharArray()
+
+    for (i in 0 until l) {
+        h = 31 * h + chars[i].code.toLong()
+    }
+    return h
+}
+
+fun String.toStringUriWithHttp(): String =
+    if (!this.startsWith("https://") && !this.startsWith("http://")) {
+        "http://" + this
+    } else {
+        this
+    }
+
+fun Context.shareLink(itemUrl: String, itemTitle: String) {
+    val sendIntent = Intent()
+    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    sendIntent.action = Intent.ACTION_SEND
+    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
+    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
+    sendIntent.type = "text/plain"
+    startActivity(
+        Intent.createChooser(
+            sendIntent,
+            getString(R.string.share)
+        ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    )
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/Config.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/Config.kt
new file mode 100644
index 0000000..849c261
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/Config.kt
@@ -0,0 +1,64 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import bou.amine.apps.readerforselfossv2.android.LoginActivity
+
+class Config(c: Context) {
+
+    val settings: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(c)
+
+    val baseUrl: String
+        get() = settings.getString("url", "")!!
+
+    val userLogin: String
+        get() = settings.getString("login", "")!!
+
+    val userPassword: String
+        get() = settings.getString("password", "")!!
+
+    val httpUserLogin: String
+        get() = settings.getString("httpUserName", "")!!
+
+    val httpUserPassword: String
+        get() = settings.getString("httpPassword", "")!!
+
+    companion object {
+        const val settingsName = "paramsselfoss"
+
+        const val feedbackEmail = "aminecmi@gmail.com"
+
+        const val translationUrl = "https://crwd.in/readerforselfoss"
+
+        const val sourceUrl = "https://github.com/aminecmi/ReaderforSelfoss"
+
+        const val trackerUrl = "https://github.com/aminecmi/ReaderforSelfoss/issues"
+
+        const val syncChannelId = "sync-channel-id"
+
+        const val newItemsChannelId = "new-items-channel-id"
+
+        var apiVersion = 0
+
+        /* Execute logout and clear all settings to default */
+        fun logoutAndRedirect(
+            c: Context,
+            callingActivity: Activity,
+            editor: SharedPreferences.Editor,
+            baseUrlFail: Boolean = false
+        ): Boolean {
+            val settings = PreferenceManager.getDefaultSharedPreferences(c)
+            settings.edit().clear().commit()
+            val intent = Intent(c, LoginActivity::class.java)
+            if (baseUrlFail) {
+                intent.putExtra("baseUrlFail", baseUrlFail)
+            }
+            c.startActivity(intent)
+            callingActivity.finish()
+            return true
+        }
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/DateUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/DateUtils.kt
new file mode 100644
index 0000000..a6419d2
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/DateUtils.kt
@@ -0,0 +1,31 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.text.format.DateUtils
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+
+fun parseDate(dateString: String): Instant {
+
+    val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
+
+    return if (Config.apiVersion >= 4) {
+        OffsetDateTime.parse(dateString).toInstant()
+    } else {
+        LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(ZoneOffset.UTC)
+    }
+}
+
+fun parseRelativeDate(dateString: String): String {
+
+    val date = parseDate(dateString)
+
+    return " " + DateUtils.getRelativeTimeSpanString(
+            date.toEpochMilli(),
+            Instant.now().toEpochMilli(),
+            DateUtils.MINUTE_IN_MILLIS,
+            DateUtils.FORMAT_ABBREV_RELATIVE
+    )
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/HttpUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/HttpUtils.kt
new file mode 100644
index 0000000..46aa83f
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/HttpUtils.kt
@@ -0,0 +1,43 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import okhttp3.OkHttpClient
+import java.security.cert.CertificateException
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
+
+fun getUnsafeHttpClient(): OkHttpClient.Builder =
+    try {
+        // Create a trust manager that does not validate certificate chains
+        val trustAllCerts = arrayOf<TrustManager>(object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> =
+                arrayOf()
+
+            @Throws(CertificateException::class)
+            override fun checkClientTrusted(
+                chain: Array<java.security.cert.X509Certificate>,
+                authType: String
+            ) {
+            }
+
+            @Throws(CertificateException::class)
+            override fun checkServerTrusted(
+                chain: Array<java.security.cert.X509Certificate>,
+                authType: String
+            ) {
+            }
+        })
+
+        // Install the all-trusting trust manager
+        val sslContext = SSLContext.getInstance("SSL")
+        sslContext.init(null, trustAllCerts, java.security.SecureRandom())
+
+        val sslSocketFactory = sslContext.socketFactory
+
+        OkHttpClient.Builder()
+            .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
+            .hostnameVerifier { _, _ -> true }
+    } catch (e: Exception) {
+        throw RuntimeException(e)
+    }
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ItemsUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ItemsUtils.kt
new file mode 100644
index 0000000..3bae704
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/ItemsUtils.kt
@@ -0,0 +1,36 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.content.Context
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossTagType
+
+fun String.toTextDrawableString(c: Context): String {
+    val textDrawable = StringBuilder()
+    for (s in this.split(" ".toRegex()).filter { it.isNotEmpty() }.toTypedArray()) {
+        try {
+            textDrawable.append(s[0])
+        } catch (e: StringIndexOutOfBoundsException) {
+        }
+    }
+    return textDrawable.toString()
+}
+
+fun Item.sourceAndDateText(): String {
+    val formattedDate = parseRelativeDate(this.datetime)
+
+    return this.getSourceTitle() + formattedDate
+}
+
+fun Item.toggleStar(): Item {
+    this.starred = !this.starred
+    return this
+}
+
+fun List<Item>.flattenTags(): List<Item> =
+    this.flatMap {
+        val item = it
+        val tags: List<String> = it.tags.tags.split(",")
+        tags.map { t ->
+            item.copy(tags = SelfossTagType(t.trim()))
+        }
+    }
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt
new file mode 100644
index 0000000..01cf692
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt
@@ -0,0 +1,219 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Build
+import android.text.Spannable
+import android.text.style.ClickableSpan
+import androidx.browser.customtabs.CustomTabsIntent
+import android.util.Patterns
+import android.view.MotionEvent
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.ReaderActivity
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+
+fun Context.buildCustomTabsIntent(): CustomTabsIntent {
+
+    val actionIntent = Intent(Intent.ACTION_SEND)
+    actionIntent.type = "text/plain"
+    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        PendingIntent.FLAG_IMMUTABLE
+    } else {
+        0
+    }
+    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            actionIntent,
+            pflags
+        )
+
+    val intentBuilder = CustomTabsIntent.Builder()
+
+    // TODO: change to primary when it's possible to customize custom tabs title color
+    //intentBuilder.setToolbarColor(c.getResources().getColor(R.color.colorPrimary));
+    intentBuilder.setToolbarColor(resources.getColor(R.color.colorAccentDark))
+    intentBuilder.setShowTitle(true)
+
+
+    intentBuilder.setStartAnimations(
+        this,
+        R.anim.slide_in_right,
+        R.anim.slide_out_left
+    )
+    intentBuilder.setExitAnimations(
+        this,
+        android.R.anim.slide_in_left,
+        android.R.anim.slide_out_right
+    )
+
+    val closeicon = BitmapFactory.decodeResource(resources, R.drawable.ic_close_white_24dp)
+    intentBuilder.setCloseButtonIcon(closeicon)
+
+    val shareLabel = this.getString(R.string.label_share)
+    val icon = BitmapFactory.decodeResource(
+        resources,
+        R.drawable.ic_share_white_24dp
+    )
+    intentBuilder.setActionButton(icon, shareLabel, createPendingShareIntent)
+
+    return intentBuilder.build()
+}
+
+fun Context.openItemUrlInternally(
+    allItems: ArrayList<Item>,
+    currentItem: Int,
+    linkDecoded: String,
+    customTabsIntent: CustomTabsIntent,
+    articleViewer: Boolean,
+    app: Activity
+) {
+    if (articleViewer) {
+        ReaderActivity.allItems = allItems
+        SharedItems.position = currentItem
+        val intent = Intent(this, ReaderActivity::class.java)
+        intent.putExtra("currentItem", currentItem)
+        app.startActivity(intent)
+    } else {
+        this.openItemUrlInternalBrowser(
+                linkDecoded,
+                customTabsIntent,
+                app)
+    }
+}
+
+fun Context.openItemUrlInternalBrowser(
+        linkDecoded: String,
+        customTabsIntent: CustomTabsIntent,
+        app: Activity
+) {
+    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)
+    }
+}
+
+fun Context.openItemUrl(
+    allItems: ArrayList<Item>,
+    currentItem: Int,
+    linkDecoded: String,
+    customTabsIntent: CustomTabsIntent,
+    internalBrowser: Boolean,
+    articleViewer: Boolean,
+    app: Activity
+) {
+
+    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) {
+            this.openItemUrlInternally(
+                allItems,
+                currentItem,
+                linkDecoded,
+                customTabsIntent,
+                articleViewer,
+                app
+            )
+        } else {
+            this.openItemUrlInternalBrowser(
+                    linkDecoded,
+                    customTabsIntent,
+                    app
+            )
+        }
+    }
+}
+
+private fun openInBrowser(linkDecoded: String, app: Activity) {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.data = Uri.parse(linkDecoded)
+    try {
+        app.startActivity(intent)
+    } catch (e: ActivityNotFoundException) {
+        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
+    }
+}
+
+fun String.isUrlValid(): Boolean =
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+
+fun String.isBaseUrlValid(ctx: Context): Boolean {
+    val baseUrl = this.toHttpUrlOrNull()
+    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)
+}
+
+class LinkOnTouchListener: View.OnTouchListener {
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        var ret = false
+        val widget: TextView = v as TextView
+        val text: CharSequence = widget.text
+        val stext = Spannable.Factory.getInstance().newSpannable(text)
+
+        val action = event!!.action
+
+        if (action == MotionEvent.ACTION_UP ||
+            action == MotionEvent.ACTION_DOWN) {
+            var x: Float = event.x
+            var y: Float = event.y
+
+            x -= widget.totalPaddingLeft
+            y -= widget.totalPaddingTop
+
+            x += widget.scrollX
+            y += widget.scrollY
+
+            val layout = widget.layout
+            val line = layout.getLineForVertical(y.toInt())
+            val off = layout.getOffsetForHorizontal(line, x)
+
+            val link = stext.getSpans(off, off, ClickableSpan::class.java)
+
+            if (link.isNotEmpty()) {
+                if (action == MotionEvent.ACTION_UP) {
+                    link[0].onClick(widget)
+                }
+                ret = true
+            }
+        }
+        return ret
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SharedItems.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SharedItems.kt
new file mode 100644
index 0000000..c8e7dda
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SharedItems.kt
@@ -0,0 +1,403 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.content.Context
+import android.widget.Toast
+import bou.amine.apps.readerforselfossv2.android.R
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossApi
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SuccessResponse
+import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
+import bou.amine.apps.readerforselfossv2.android.utils.persistence.toEntity
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
+import bou.amine.apps.readerforselfossv2.android.utils.persistence.toView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlin.concurrent.thread
+
+/*
+* Singleton class that contains the articles fetched from Selfoss, it allows sharing the items list
+* between Activities and Fragments
+*/
+object SharedItems {
+    var items: ArrayList<Item> = arrayListOf<Item>()
+        get() {
+            return ArrayList(field)
+        }
+        set(value) {
+            field = ArrayList(value)
+        }
+    var focusedItems: ArrayList<Item> = arrayListOf<Item>()
+        get() {
+            return ArrayList(field)
+        }
+        set(value) {
+            field = ArrayList(value)
+        }
+    var position = 0
+        set(value) {
+            field = when {
+                value < 0 -> 0
+                value > items.size -> items.size
+                else -> value
+            }
+        }
+    var displayedItems: String = "unread"
+        set(value) {
+            field = when (value) {
+                "all" -> "all"
+                "unread" -> "unread"
+                "read" -> "read"
+                "starred" -> "starred"
+                else -> "all"
+            }
+        }
+
+    var searchFilter: String? = null
+    var sourceIDFilter: Long? = null
+    var sourceFilter: String? = null
+    var tagFilter: String? = null
+    var itemsCaching = false
+
+    var fetchedUnread = false
+    var fetchedAll = false
+    var fetchedStarred = false
+
+    var badgeUnread = -1
+    var badgeAll = -1
+    var badgeStarred = -1
+
+    /**
+     * Add new items to the SharedItems list
+     *
+     * The new items are considered more updated than the ones already in the list.
+     * The old items present in the new list are discarded and replaced by the new ones.
+     * Items are compared according to the selfoss id, which should always be unique.
+     */
+    fun appendNewItems(newItems: ArrayList<Item>) {
+        var tmpItems = items
+        if (tmpItems != newItems) {
+            tmpItems = tmpItems.filter { item -> newItems.find { it.id == item.id } == null } as ArrayList<Item>
+            tmpItems.addAll(newItems)
+            items = tmpItems
+
+            sortItems()
+            getFocusedItems()
+        }
+    }
+
+    fun refreshFocusedItems(newItems: ArrayList<Item>) {
+        val tmpItems = items
+        tmpItems.removeAll(focusedItems)
+
+        appendNewItems(newItems)
+    }
+
+    suspend fun clearDBItems(db: AppDatabase) {
+        db.itemsDao().deleteAllItems()
+    }
+
+    suspend fun updateDatabase(db: AppDatabase) {
+        if (itemsCaching) {
+            if (items.isEmpty()) {
+                getFromDB(db)
+            }
+            db.itemsDao().deleteAllItems()
+            db.itemsDao().insertAllItems(*(items.map { it.toEntity() }).toTypedArray())
+        }
+    }
+
+    fun filter() {
+        fun filterSearch(item: Item): Boolean {
+            return if (!searchFilter.isEmptyOrNullOrNullString()) {
+                var matched = item.title.contains(searchFilter.toString(), true)
+                matched = matched || item.content.contains(searchFilter.toString(), true)
+                matched = matched || item.sourcetitle.contains(searchFilter.toString(), true)
+                matched
+            } else {
+                true
+            }
+        }
+
+        var tmpItems = focusedItems
+        if (tagFilter != null) {
+            tmpItems = tmpItems.filter { it.tags.tags.contains(tagFilter.toString()) } as ArrayList<Item>
+        }
+        if (searchFilter != null) {
+            tmpItems = tmpItems.filter { filterSearch(it) } as ArrayList<Item>
+        }
+        if (sourceFilter != null) {
+            tmpItems = tmpItems.filter { it.sourcetitle == sourceFilter } as ArrayList<Item>
+        }
+        focusedItems = tmpItems
+    }
+
+    private fun getFocusedItems() {
+        when (displayedItems) {
+            "all" -> getAll()
+            "unread" -> getUnRead()
+            "read" -> getRead()
+            "starred" -> getStarred()
+            else -> getUnRead()
+        }
+    }
+
+    fun getUnRead() {
+        displayedItems = "unread"
+        focusedItems = items.filter { item -> item.unread } as ArrayList<Item>
+        filter()
+    }
+
+    fun getRead() {
+        displayedItems = "read"
+        focusedItems = items.filter { item -> !item.unread } as ArrayList<Item>
+        filter()
+    }
+
+    fun getStarred() {
+        displayedItems = "starred"
+        focusedItems = items.filter { item -> item.starred } as ArrayList<Item>
+        filter()
+    }
+
+    fun getAll() {
+        displayedItems = "all"
+        focusedItems = items
+        filter()
+    }
+
+    suspend fun getFromDB(db: AppDatabase) {
+        if (itemsCaching) {
+                    val dbItems = db.itemsDao().items().map { it.toView() } as ArrayList<Item>
+                    appendNewItems(dbItems)
+        }
+    }
+
+    private fun removeItemAtIndex(index: Int) {
+        val i = focusedItems[index]
+        val tmpItems = focusedItems
+        tmpItems.remove(i)
+        focusedItems = tmpItems
+    }
+
+    fun addItemAtIndex(newItem: Item, index: Int) {
+        val tmpItems = focusedItems
+        tmpItems.add(index, newItem)
+        focusedItems = tmpItems
+    }
+
+    fun readItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
+        if (items.contains(item)) {
+            position = items.indexOf(item)
+            readItemAtPosition(app, api, db)
+        }
+    }
+
+    fun readItems(db: AppDatabase, ids: List<String>) {
+        for (id in ids) {
+            val match = items.filter { it -> it.id == id }
+            if (match.isNotEmpty() && match.size == 1) {
+                position = items.indexOf(match[0])
+                val tmpItems = items
+                tmpItems[position].unread = false
+                items = tmpItems
+                resetDBItem(db)
+                badgeUnread--
+            }
+        }
+    }
+
+    private fun readItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
+        val i = items[position]
+
+        if (app.isNetworkAccessible(null)) {
+            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    val tmpItems = items
+                    tmpItems[position].unread = false
+                    items = tmpItems
+
+                    resetDBItem(db)
+                    getFocusedItems()
+                    badgeUnread--
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                            app,
+                            app.getString(R.string.cant_mark_read),
+                            Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
+        } else if (itemsCaching) {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+            }
+        }
+
+        if (position > items.size) {
+            position -= 1
+        }
+    }
+
+    fun unreadItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
+        if (items.contains(item) && !item.unread) {
+            position = items.indexOf(item)
+            unreadItemAtPosition(app, api, db)
+        }
+    }
+
+    private fun unreadItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
+        val i = items[position]
+
+        if (app.isNetworkAccessible(null)) {
+            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+
+                    val tmpItems = items
+                    tmpItems[position].unread = true
+                    items = tmpItems
+
+                    resetDBItem(db)
+                    getFocusedItems()
+                    badgeUnread++
+                }
+
+                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_unread),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
+        } else if (itemsCaching) {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+            }
+        }
+    }
+
+    fun starItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
+        if (items.contains(item) && !item.starred) {
+            position = items.indexOf(item)
+            starItemAtPosition(app, api, db)
+        }
+    }
+
+    private fun starItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
+        val i = items[position]
+
+        if (app.isNetworkAccessible(null)) {
+            api.starrItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+                    val tmpItems = items
+                    tmpItems[position].starred = true
+                    items = tmpItems
+
+                    resetDBItem(db)
+                    getFocusedItems()
+                    badgeStarred++
+                }
+
+                override fun onFailure(
+                    call: Call<SuccessResponse>,
+                    t: Throwable
+                ) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_favortie),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, false, false, true, false))
+            }
+        }
+    }
+
+    fun unstarItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
+        if (items.contains(item) && item.starred) {
+            position = items.indexOf(item)
+            unstarItemAtPosition(app, api, db)
+        }
+    }
+
+    private fun unstarItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
+        val i = items[position]
+
+        if (app.isNetworkAccessible(null)) {
+            api.unstarrItem(i.id).enqueue(object : Callback<SuccessResponse> {
+                override fun onResponse(
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+                ) {
+                    val tmpItems = items
+                    tmpItems[position].starred = false
+                    items = tmpItems
+
+                    resetDBItem(db)
+                    getFocusedItems()
+                    badgeStarred--
+                }
+
+                override fun onFailure(
+                    call: Call<SuccessResponse>,
+                    t: Throwable
+                ) {
+                    Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_unmark_favortie),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, false, false, false, true))
+            }
+        }
+    }
+
+    private fun resetDBItem(db: AppDatabase) {
+        if (itemsCaching) {
+            val i = items[position]
+            CoroutineScope(Dispatchers.IO).launch {
+                db.itemsDao().delete(i.toEntity())
+                db.itemsDao().insertAllItems(i.toEntity())
+            }
+        }
+    }
+
+    fun unreadItemStatusAtIndex(position: Int): Boolean {
+        return focusedItems[position].unread
+    }
+
+    fun computeBadges() {
+        badgeUnread = items.filter { item -> item.unread }.size
+        badgeStarred = items.filter { item -> item.starred }.size
+        badgeAll = items.size
+    }
+
+    private fun sortItems() {
+        val tmpItems = ArrayList(items.sortedByDescending { parseDate(it.datetime) })
+        items = tmpItems
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SizeUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SizeUtils.kt
new file mode 100644
index 0000000..1bf44e3
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/SizeUtils.kt
@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android.utils
+
+import android.content.res.Resources
+
+val Int.toPx: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
+
+val Int.toDp: Int
+    get() = (this / Resources.getSystem().displayMetrics.density).toInt()
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/bottombar/BottomBarUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/bottombar/BottomBarUtils.kt
new file mode 100644
index 0000000..155a35c
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/bottombar/BottomBarUtils.kt
@@ -0,0 +1,12 @@
+package bou.amine.apps.readerforselfossv2.android.utils.bottombar
+
+import com.ashokvarma.bottomnavigation.TextBadgeItem
+
+fun TextBadgeItem.removeBadge(): TextBadgeItem {
+    this.setText("")
+    this.hide()
+    return this
+}
+
+fun TextBadgeItem.maybeShow(): TextBadgeItem =
+    if (this.isHidden) this.show() else this
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabActivityHelper.java b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabActivityHelper.java
new file mode 100644
index 0000000..cfdd8d8
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabActivityHelper.java
@@ -0,0 +1,153 @@
+package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
+
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsSession;
+
+import java.util.List;
+
+/**
+ * This is a helper class to manage the connection to the Custom Tabs Service.
+ */
+public class CustomTabActivityHelper implements ServiceConnectionCallback {
+    private CustomTabsSession mCustomTabsSession;
+    private CustomTabsClient mClient;
+    private CustomTabsServiceConnection mConnection;
+    private ConnectionCallback mConnectionCallback;
+
+    /**
+     * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
+     *
+     * @param activity         The host activity.
+     * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
+     * @param uri              the Uri to be opened.
+     * @param fallback         a CustomTabFallback to be used if Custom Tabs is not available.
+     */
+    public static void openCustomTab(Activity activity,
+                                     CustomTabsIntent customTabsIntent,
+                                     Uri uri,
+                                     CustomTabFallback fallback) {
+        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
+
+        //If we cant find a package name, it means theres no browser that supports
+        //Chrome Custom Tabs installed. So, we fallback to the webview
+        if (packageName == null) {
+            if (fallback != null) {
+                fallback.openUri(activity, uri);
+            }
+        } else {
+            customTabsIntent.intent.setPackage(packageName);
+            customTabsIntent.launchUrl(activity, uri);
+        }
+    }
+
+    /**
+     * Unbinds the Activity from the Custom Tabs Service.
+     *
+     * @param activity the activity that is connected to the service.
+     */
+    public void unbindCustomTabsService(Activity activity) {
+        if (mConnection == null) return;
+        activity.unbindService(mConnection);
+        mClient = null;
+        mCustomTabsSession = null;
+        mConnection = null;
+    }
+
+    /**
+     * Creates or retrieves an exiting CustomTabsSession.
+     *
+     * @return a CustomTabsSession.
+     */
+    public CustomTabsSession getSession() {
+        if (mClient == null) {
+            mCustomTabsSession = null;
+        } else if (mCustomTabsSession == null) {
+            mCustomTabsSession = mClient.newSession(null);
+        }
+        return mCustomTabsSession;
+    }
+
+    /**
+     * Register a Callback to be called when connected or disconnected from the Custom Tabs Service.
+     *
+     * @param connectionCallback
+     */
+    public void setConnectionCallback(ConnectionCallback connectionCallback) {
+        this.mConnectionCallback = connectionCallback;
+    }
+
+    /**
+     * Binds the Activity to the Custom Tabs Service.
+     *
+     * @param activity the activity to be binded to the service.
+     */
+    public void bindCustomTabsService(Activity activity) {
+        if (mClient != null) return;
+
+        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
+        if (packageName == null) return;
+
+        mConnection = new ServiceConnection(this);
+        CustomTabsClient.bindCustomTabsService(activity, packageName, mConnection);
+    }
+
+    /**
+     * @return true if call to mayLaunchUrl was accepted.
+     * @see {@link CustomTabsSession#mayLaunchUrl(Uri, Bundle, List)}.
+     */
+    public boolean mayLaunchUrl(Uri uri, Bundle extras, List<Bundle> otherLikelyBundles) {
+        if (mClient == null) return false;
+
+        CustomTabsSession session = getSession();
+        return session != null && session.mayLaunchUrl(uri, extras, otherLikelyBundles);
+
+    }
+
+    @Override
+    public void onServiceConnected(CustomTabsClient client) {
+        mClient = client;
+        mClient.warmup(0L);
+        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsConnected();
+    }
+
+    @Override
+    public void onServiceDisconnected() {
+        mClient = null;
+        mCustomTabsSession = null;
+        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsDisconnected();
+    }
+
+    /**
+     * A Callback for when the service is connected or disconnected. Use those callbacks to
+     * handle UI changes when the service is connected or disconnected.
+     */
+    public interface ConnectionCallback {
+        /**
+         * Called when the service is connected.
+         */
+        void onCustomTabsConnected();
+
+        /**
+         * Called when the service is disconnected.
+         */
+        void onCustomTabsDisconnected();
+    }
+
+    /**
+     * To be used as a fallback to open the Uri when Custom Tabs is not available.
+     */
+    public interface CustomTabFallback {
+        /**
+         * @param activity The Activity that wants to open the Uri.
+         * @param uri      The uri to be opened by the fallback.
+         */
+        void openUri(Activity activity, Uri uri);
+    }
+
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabsHelper.java b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabsHelper.java
new file mode 100644
index 0000000..5f07408
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/CustomTabsHelper.java
@@ -0,0 +1,130 @@
+package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import androidx.browser.customtabs.CustomTabsService;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers.KeepAliveService;
+
+@SuppressWarnings("ALL")
+class CustomTabsHelper {
+    private static final String TAG = "CustomTabsHelper";
+    private static final String STABLE_PACKAGE = "com.android.chrome";
+    private static final String BETA_PACKAGE = "com.chrome.beta";
+    private static final String DEV_PACKAGE = "com.chrome.dev";
+    private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
+    private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
+            "android.support.customtabs.extra.KEEP_ALIVE";
+
+    private static String sPackageNameToUse;
+
+    private CustomTabsHelper() {
+    }
+
+    public static void addKeepAliveExtra(Context context, Intent intent) {
+        Intent keepAliveIntent = new Intent().setClassName(
+                context.getPackageName(), KeepAliveService.class.getCanonicalName());
+        intent.putExtra(EXTRA_CUSTOM_TABS_KEEP_ALIVE, keepAliveIntent);
+    }
+
+    /**
+     * Goes through all apps that handle VIEW intents and have a warmup service. Picks
+     * the one chosen by the user if there is one, otherwise makes a best effort to return a
+     * valid package name.
+     * <p>
+     * This is <strong>not</strong> threadsafe.
+     *
+     * @param context {@link Context} to use for accessing {@link PackageManager}.
+     * @return The package name recommended to use for connecting to custom tabs related components.
+     */
+    public static String getPackageNameToUse(Context context) {
+        if (sPackageNameToUse != null) return sPackageNameToUse;
+
+        PackageManager pm = context.getPackageManager();
+        // Get default VIEW intent handler.
+        Intent activityIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"));
+        ResolveInfo defaultViewHandlerInfo = pm.resolveActivity(activityIntent, 0);
+        String defaultViewHandlerPackageName = null;
+        if (defaultViewHandlerInfo != null) {
+            defaultViewHandlerPackageName = defaultViewHandlerInfo.activityInfo.packageName;
+        }
+
+        // Get all apps that can handle VIEW intents.
+        List<ResolveInfo> resolvedActivityList = pm.queryIntentActivities(activityIntent, 0);
+        List<String> packagesSupportingCustomTabs = new ArrayList<>();
+        for (ResolveInfo info : resolvedActivityList) {
+            Intent serviceIntent = new Intent();
+            serviceIntent.setAction(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
+            serviceIntent.setPackage(info.activityInfo.packageName);
+            if (pm.resolveService(serviceIntent, 0) != null) {
+                packagesSupportingCustomTabs.add(info.activityInfo.packageName);
+            }
+        }
+
+        // Now packagesSupportingCustomTabs contains all apps that can handle both VIEW intents
+        // and service calls.
+        if (packagesSupportingCustomTabs.isEmpty()) {
+            sPackageNameToUse = null;
+        } else if (packagesSupportingCustomTabs.size() == 1) {
+            sPackageNameToUse = packagesSupportingCustomTabs.get(0);
+        } else if (!TextUtils.isEmpty(defaultViewHandlerPackageName)
+                && !hasSpecializedHandlerIntents(context, activityIntent)
+                && packagesSupportingCustomTabs.contains(defaultViewHandlerPackageName)) {
+            sPackageNameToUse = defaultViewHandlerPackageName;
+        } else if (packagesSupportingCustomTabs.contains(STABLE_PACKAGE)) {
+            sPackageNameToUse = STABLE_PACKAGE;
+        } else if (packagesSupportingCustomTabs.contains(BETA_PACKAGE)) {
+            sPackageNameToUse = BETA_PACKAGE;
+        } else if (packagesSupportingCustomTabs.contains(DEV_PACKAGE)) {
+            sPackageNameToUse = DEV_PACKAGE;
+        } else if (packagesSupportingCustomTabs.contains(LOCAL_PACKAGE)) {
+            sPackageNameToUse = LOCAL_PACKAGE;
+        }
+        return sPackageNameToUse;
+    }
+
+    /**
+     * Used to check whether there is a specialized handler for a given intent.
+     *
+     * @param intent The intent to check with.
+     * @return Whether there is a specialized handler for the given intent.
+     */
+    private static boolean hasSpecializedHandlerIntents(Context context, Intent intent) {
+        try {
+            PackageManager pm = context.getPackageManager();
+            List<ResolveInfo> handlers = pm.queryIntentActivities(
+                    intent,
+                    PackageManager.GET_RESOLVED_FILTER);
+            if (handlers == null || handlers.isEmpty()) {
+                return false;
+            }
+            for (ResolveInfo resolveInfo : handlers) {
+                IntentFilter filter = resolveInfo.filter;
+                if (filter == null) continue;
+                if (filter.countDataAuthorities() == 0 || filter.countDataPaths() == 0) continue;
+                if (resolveInfo.activityInfo == null) continue;
+                return true;
+            }
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Runtime exception while getting specialized handlers");
+        }
+        return false;
+    }
+
+    /**
+     * @return All possible chrome package names that provide custom tabs feature.
+     */
+    public static String[] getPackages() {
+        return new String[]{"", STABLE_PACKAGE, BETA_PACKAGE, DEV_PACKAGE, LOCAL_PACKAGE};
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnection.java b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnection.java
new file mode 100644
index 0000000..f1c2214
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnection.java
@@ -0,0 +1,33 @@
+package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
+
+
+import android.content.ComponentName;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Implementation for the CustomTabsServiceConnection that avoids leaking the
+ * ServiceConnectionCallback
+ */
+public class ServiceConnection extends CustomTabsServiceConnection {
+    // A weak reference to the ServiceConnectionCallback to avoid leaking it.
+    private WeakReference<ServiceConnectionCallback> mConnectionCallback;
+
+    public ServiceConnection(ServiceConnectionCallback connectionCallback) {
+        mConnectionCallback = new WeakReference<>(connectionCallback);
+    }
+
+    @Override
+    public void onCustomTabsServiceConnected(ComponentName name, CustomTabsClient client) {
+        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
+        if (connectionCallback != null) connectionCallback.onServiceConnected(client);
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
+        if (connectionCallback != null) connectionCallback.onServiceDisconnected();
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnectionCallback.java b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnectionCallback.java
new file mode 100644
index 0000000..78a34fa
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/ServiceConnectionCallback.java
@@ -0,0 +1,19 @@
+package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
+
+
+import androidx.browser.customtabs.CustomTabsClient;
+
+
+public interface ServiceConnectionCallback {
+    /**
+     * Called when the service is connected.
+     *
+     * @param client a CustomTabsClient
+     */
+    void onServiceConnected(CustomTabsClient client);
+
+    /**
+     * Called when the service is disconnected.
+     */
+    void onServiceDisconnected();
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/helpers/KeepAliveService.java b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/helpers/KeepAliveService.java
new file mode 100644
index 0000000..c754941
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/customtabs/helpers/KeepAliveService.java
@@ -0,0 +1,15 @@
+package bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+public class KeepAliveService extends Service {
+    private static final Binder sBinder = new Binder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return sBinder;
+    }
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/drawer/CustomBaseViewHolder.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/drawer/CustomBaseViewHolder.kt
new file mode 100644
index 0000000..1bc0f86
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/drawer/CustomBaseViewHolder.kt
@@ -0,0 +1,15 @@
+/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */
+package bou.amine.apps.readerforselfossv2.android.utils.drawer
+
+import androidx.recyclerview.widget.RecyclerView
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+
+import bou.amine.apps.readerforselfossv2.android.R
+
+open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
+    var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
+    var name: TextView = view.findViewById(R.id.material_drawer_name)
+    var description: TextView = view.findViewById(R.id.material_drawer_description)
+}
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt
new file mode 100644
index 0000000..be63485
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/GlideUtils.kt
@@ -0,0 +1,69 @@
+package bou.amine.apps.readerforselfossv2.android.utils.glide
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.util.Base64
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import android.widget.ImageView
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.LazyHeaders
+import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.BitmapImageViewTarget
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
+    Glide.with(this)
+        .asBitmap()
+        .loadMaybeBasicAuth(config, url)
+        .apply(RequestOptions.centerCropTransform())
+        .into(iv)
+
+fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
+    Glide.with(this)
+        .asBitmap()
+        .loadMaybeBasicAuth(config, url)
+        .apply(RequestOptions.centerCropTransform())
+        .into(object : BitmapImageViewTarget(iv) {
+            override fun setResource(resource: Bitmap?) {
+                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
+                    resources,
+                    resource
+                )
+                circularBitmapDrawable.isCircular = true
+                iv.setImageDrawable(circularBitmapDrawable)
+            }
+        })
+
+fun RequestBuilder<Bitmap>.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Bitmap> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
+
+fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Drawable> {
+    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
+    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
+        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
+        builder.addHeader("Authorization", basicAuth)
+    }
+    val glideUrl = GlideUrl(url, builder.build())
+    return this.load(glideUrl)
+}
+
+fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
+    val byteArrayOutputStream = ByteArrayOutputStream()
+    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
+    val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
+    return ByteArrayInputStream(bitmapData)
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/SelfSignedGlideModule.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/SelfSignedGlideModule.kt
new file mode 100644
index 0000000..8449013
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/glide/SelfSignedGlideModule.kt
@@ -0,0 +1,33 @@
+package bou.amine.apps.readerforselfossv2.android.utils.glide
+
+import android.content.Context
+import bou.amine.apps.readerforselfossv2.android.utils.Config
+import bou.amine.apps.readerforselfossv2.android.utils.getUnsafeHttpClient
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.module.GlideModule
+import java.io.InputStream
+
+class SelfSignedGlideModule : GlideModule {
+
+    override fun applyOptions(context: Context?, builder: GlideBuilder?) {
+    }
+
+    override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
+
+        if (context != null) {
+            val pref = context?.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            if (pref.getBoolean("isSelfSignedCert", false)) {
+                val client = getUnsafeHttpClient().build()
+
+                registry?.append(
+                    GlideUrl::class.java,
+                    InputStream::class.java,
+                    com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader.Factory(client)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/network/NetworkUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/network/NetworkUtils.kt
new file mode 100644
index 0000000..9f7cf2e
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/network/NetworkUtils.kt
@@ -0,0 +1,64 @@
+package bou.amine.apps.readerforselfossv2.android.utils.network
+
+import android.content.Context
+import android.graphics.Color
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
+import android.view.View
+import android.widget.TextView
+import bou.amine.apps.readerforselfossv2.android.R
+import com.google.android.material.snackbar.Snackbar
+
+var snackBarShown = false
+var view: View? = null
+lateinit var s: Snackbar
+
+fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
+    val networkIsAccessible = isNetworkAvailable(this)
+
+    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
+        view = v
+        s = Snackbar
+            .make(
+                v,
+                R.string.no_network_connectivity,
+                Snackbar.LENGTH_INDEFINITE
+            )
+
+        s.setAction(android.R.string.ok) {
+            snackBarShown = false
+            s.dismiss()
+        }
+
+        val view = s.view
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
+        tv.setTextColor(Color.WHITE)
+        s.show()
+        snackBarShown = true
+    }
+    if (snackBarShown && networkIsAccessible && !overrideOffline) {
+        s.dismiss()
+    }
+    return if(overrideOffline) overrideOffline else networkIsAccessible
+}
+
+fun isNetworkAvailable(context: Context): Boolean {
+    val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+         val network = connectivityManager.activeNetwork ?: return false
+         val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+
+         return when {
+             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
+             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+             else -> false
+         }
+    } else {
+        val network = connectivityManager.activeNetworkInfo ?: return false
+         return network.isConnectedOrConnecting
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/persistence/EntitiesUtils.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/persistence/EntitiesUtils.kt
new file mode 100644
index 0000000..4faaf44
--- /dev/null
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/persistence/EntitiesUtils.kt
@@ -0,0 +1,73 @@
+package bou.amine.apps.readerforselfossv2.android.utils.persistence
+
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Item
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.SelfossTagType
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Source
+import bou.amine.apps.readerforselfossv2.android.api.selfoss.Tag
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.ItemEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
+import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
+
+fun TagEntity.toView(): Tag =
+        Tag(
+            this.tag,
+            this.color,
+            this.unread
+        )
+
+fun SourceEntity.toView(): Source =
+        Source(
+            this.id,
+            this.title,
+            SelfossTagType(this.tags),
+            this.spout,
+            this.error,
+            this.icon
+        )
+
+fun Source.toEntity(): SourceEntity =
+        SourceEntity(
+            this.id,
+            this.getTitleDecoded(),
+            this.tags.tags,
+            this.spout,
+            this.error,
+            this.icon.orEmpty()
+        )
+
+fun Tag.toEntity(): TagEntity =
+        TagEntity(
+            this.tag,
+            this.color,
+            this.unread
+        )
+
+fun ItemEntity.toView(): Item =
+        Item(
+            this.id,
+            this.datetime,
+            this.title,
+            this.content,
+            this.unread,
+            this.starred,
+            this.thumbnail,
+            this.icon,
+            this.link,
+            this.sourcetitle,
+            SelfossTagType(this.tags)
+        )
+
+fun Item.toEntity(): ItemEntity =
+    ItemEntity(
+        this.id,
+        this.datetime,
+        this.getTitleDecoded(),
+        this.content,
+        this.unread,
+        this.starred,
+        this.thumbnail,
+        this.icon,
+        this.link,
+        this.getSourceTitle(),
+        this.tags.tags
+    )
\ No newline at end of file
diff --git a/androidApp/src/main/res/anim/slide_in_right.xml b/androidApp/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 0000000..3189c25
--- /dev/null
+++ b/androidApp/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved.
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+         http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="100%p" android:toXDelta="0"
+               android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/androidApp/src/main/res/anim/slide_out_left.xml b/androidApp/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 0000000..0ec7682
--- /dev/null
+++ b/androidApp/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 Google Inc. All Rights Reserved.
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+         http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="-100%p"
+               android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/androidApp/src/main/res/color/ic_menu_heart_color.xml b/androidApp/src/main/res/color/ic_menu_heart_color.xml
new file mode 100644
index 0000000..dd8fa5f
--- /dev/null
+++ b/androidApp/src/main/res/color/ic_menu_heart_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:color="@color/red"/>
+
+    <item android:state_selected="false"
+        android:color="?android:attr/textColorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/androidApp/src/main/res/drawable-anydpi/ic_format_align_justify.xml b/androidApp/src/main/res/drawable-anydpi/ic_format_align_justify.xml
new file mode 100644
index 0000000..0001f38
--- /dev/null
+++ b/androidApp/src/main/res/drawable-anydpi/ic_format_align_justify.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM3,17h18v-2L3,15v2zM3,13h18v-2L3,11v2zM3,9h18L21,7L3,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable-anydpi/ic_format_align_left.xml b/androidApp/src/main/res/drawable-anydpi/ic_format_align_left.xml
new file mode 100644
index 0000000..0e0782a
--- /dev/null
+++ b/androidApp/src/main/res/drawable-anydpi/ic_format_align_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/background_splash.xml b/androidApp/src/main/res/drawable/background_splash.xml
new file mode 100644
index 0000000..32241ec
--- /dev/null
+++ b/androidApp/src/main/res/drawable/background_splash.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@color/ic_launcher_background"/>
+
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/ic_launcher_foreground"/>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/androidApp/src/main/res/drawable/bg.png b/androidApp/src/main/res/drawable/bg.png
new file mode 100644
index 0000000..d93c122
Binary files /dev/null and b/androidApp/src/main/res/drawable/bg.png differ
diff --git a/androidApp/src/main/res/drawable/ic_add_white_24dp.xml b/androidApp/src/main/res/drawable/ic_add_white_24dp.xml
new file mode 100644
index 0000000..e3979cd
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_baseline_white_eye_24dp.xml b/androidApp/src/main/res/drawable/ic_baseline_white_eye_24dp.xml
new file mode 100644
index 0000000..b2add52
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_baseline_white_eye_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_bug_report_black_24dp.xml b/androidApp/src/main/res/drawable/ic_bug_report_black_24dp.xml
new file mode 100644
index 0000000..4d83902
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_bug_report_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_bug_report_white_24dp.xml b/androidApp/src/main/res/drawable/ic_bug_report_white_24dp.xml
new file mode 100644
index 0000000..5c8f5bc
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_bug_report_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml b/androidApp/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml
new file mode 100644
index 0000000..99b5867
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_chrome_reader_mode_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml b/androidApp/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml
new file mode 100644
index 0000000..43fd20a
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_chrome_reader_mode_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_close_white_24dp.xml b/androidApp/src/main/res/drawable/ic_close_white_24dp.xml
new file mode 100644
index 0000000..0c8775c
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_close_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_color_lens_black_24dp.xml b/androidApp/src/main/res/drawable/ic_color_lens_black_24dp.xml
new file mode 100644
index 0000000..f75e2fb
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_color_lens_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_color_lens_white_24dp.xml b/androidApp/src/main/res/drawable/ic_color_lens_white_24dp.xml
new file mode 100644
index 0000000..4abeea5
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_color_lens_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_history_white_24dp.xml b/androidApp/src/main/res/drawable/ic_history_white_24dp.xml
new file mode 100644
index 0000000..de25eb4
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_history_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_info_black_24dp.xml b/androidApp/src/main/res/drawable/ic_info_black_24dp.xml
new file mode 100644
index 0000000..cc94088
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_info_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_info_outline_white_24dp.xml b/androidApp/src/main/res/drawable/ic_info_outline_white_24dp.xml
new file mode 100644
index 0000000..af0d4d0
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_menu_done_all_white_24dp.xml b/androidApp/src/main/res/drawable/ic_menu_done_all_white_24dp.xml
new file mode 100644
index 0000000..2479e86
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_menu_done_all_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_menu_heart_60dp.xml b/androidApp/src/main/res/drawable/ic_menu_heart_60dp.xml
new file mode 100644
index 0000000..9cee08b
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_menu_heart_60dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="54.751434dp" android:viewportHeight="18.756023"
+    android:viewportWidth="20.554007" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF"
+        android:pathData="m5.7968,14.6109c-2.7907,-2.7367 -4.4957,-4.7131 -5.018,-5.8165 -2.102,-4.4408 0.2424,-8.7943 4.7357,-8.7943 1.635,0 2.7056,0.425 3.9688,1.5755l0.7937,0.723 0.7937,-0.723c1.2631,-1.1505 2.3337,-1.5755 3.9688,-1.5755 4.4933,0 6.8377,4.3535 4.7357,8.7943 -0.5223,1.1035 -2.2274,3.0799 -5.018,5.8165 -2.3248,2.2798 -4.3409,4.1451 -4.4802,4.1451 -0.1393,0 -2.1554,-1.8653 -4.4802,-4.1451z" android:strokeWidth="0.0933392"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_menu_refresh_white_24dp.xml b/androidApp/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
new file mode 100644
index 0000000..cc2d1e0
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_menu_refresh_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_menu_search_white_24dp.xml b/androidApp/src/main/res/drawable/ic_menu_search_white_24dp.xml
new file mode 100644
index 0000000..be5ad99
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_menu_search_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_open_in_browser_black_24dp.xml b/androidApp/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
new file mode 100644
index 0000000..3fb9799
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/androidApp/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
new file mode 100644
index 0000000..3fb9799
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml b/androidApp/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml
new file mode 100644
index 0000000..9af9456
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_settings_black_24dp.xml b/androidApp/src/main/res/drawable/ic_settings_black_24dp.xml
new file mode 100644
index 0000000..ace746c
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_share_black_24dp.xml b/androidApp/src/main/res/drawable/ic_share_black_24dp.xml
new file mode 100644
index 0000000..e3fe874
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_share_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_share_white_24dp.xml b/androidApp/src/main/res/drawable/ic_share_white_24dp.xml
new file mode 100644
index 0000000..045bbc0
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_share_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml b/androidApp/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
new file mode 100644
index 0000000..8339d79
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml b/androidApp/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml
new file mode 100644
index 0000000..261c312
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_stat_cloud_download_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_tab_archive_black_24dp.xml b/androidApp/src/main/res/drawable/ic_tab_archive_black_24dp.xml
new file mode 100644
index 0000000..8b18a9d
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_tab_archive_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_tab_favorite_black_24dp.xml b/androidApp/src/main/res/drawable/ic_tab_favorite_black_24dp.xml
new file mode 100644
index 0000000..cfba5d8
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_tab_favorite_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml b/androidApp/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml
new file mode 100644
index 0000000..6097dff
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_tab_fiber_new_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_widgets_black_24dp.xml b/androidApp/src/main/res/drawable/ic_widgets_black_24dp.xml
new file mode 100644
index 0000000..4abb823
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_widgets_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z"/>
+</vector>
diff --git a/androidApp/src/main/res/font/open_sans.xml b/androidApp/src/main/res/font/open_sans.xml
new file mode 100644
index 0000000..f9284b2
--- /dev/null
+++ b/androidApp/src/main/res/font/open_sans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Open Sans"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/androidApp/src/main/res/font/roboto.xml b/androidApp/src/main/res/font/roboto.xml
new file mode 100644
index 0000000..2641caf
--- /dev/null
+++ b/androidApp/src/main/res/font/roboto.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Roboto"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/androidApp/src/main/res/layout/activity_add_source.xml b/androidApp/src/main/res/layout/activity_add_source.xml
new file mode 100644
index 0000000..7bc31e1
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_add_source.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.AddSourceActivity">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:theme="@style/ToolBarStyle"
+                app:popupTheme="?attr/toolbarPopupTheme" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:id="@+id/formContainer"
+            android:visibility="gone"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintVertical_bias="0.0">
+
+            <TextView
+                android:text="@string/add_source"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/textView2"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                android:textAlignment="center"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintRight_toRightOf="parent"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginLeft="16dp"
+                android:gravity="center_horizontal" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:id="@+id/nameInput"
+                android:layout_marginTop="32dp"
+                app:layout_constraintTop_toBottomOf="@+id/textView2"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                android:inputType="text"
+                android:hint="@string/add_source_hint_name"
+                android:textColorHint="?android:textColorPrimary"
+                android:autofillHints="false" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textUri"
+                android:ems="10"
+                android:id="@+id/sourceUri"
+                android:hint="@string/add_source_hint_url"
+                android:textColorHint="?android:textColorPrimary"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/nameInput"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:autofillHints="false" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:id="@+id/tags"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
+                android:hint="@string/add_source_hint_tags"
+                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"
+                android:autofillHints="false" />
+
+            <Spinner
+                android:layout_width="match_parent"
+                android:id="@+id/spoutsSpinner"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/tags"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_height="40dp"
+                android:theme="@style/App.Spinner"/>
+
+            <Button
+                android:text="@string/add_source_save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/saveBtn"
+                android:elevation="5dp"
+                android:textColor="?attr/colorAccent"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintRight_toRightOf="parent"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintVertical_bias="0.0"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="gone" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/activity_home.xml b/androidApp/src/main/res/layout/activity_home.xml
new file mode 100644
index 0000000..7a84128
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_home.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawerContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
+    android:fitsSystemWindows="true"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/intern_coordLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <com.google.android.material.appbar.AppBarLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolBar"
+                        android:layout_width="match_parent"
+                        android:layout_height="?attr/actionBarSize"
+                        app:theme="@style/ToolBarStyle"
+                        app:popupTheme="?attr/toolbarPopupTheme" />
+
+                </com.google.android.material.appbar.AppBarLayout>
+
+                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                    android:id="@+id/swipeRefreshLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:background="?android:attr/windowBackground">
+
+                        <TextView
+                            android:id="@+id/emptyText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:paddingTop="100dp"
+                            android:text="@string/nothing_here"
+                            android:textAlignment="center"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                            android:background="@android:color/transparent"
+                            android:visibility="gone" />
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recyclerView"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@android:color/transparent"
+                            android:clipToPadding="false"
+                            android:paddingBottom="60dp"
+                            android:scrollbars="vertical"
+                            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                            tools:listitem="@layout/list_item"/>
+                    </LinearLayout>
+
+                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+            </LinearLayout>
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <com.ashokvarma.bottomnavigation.BottomNavigationBar
+            android:layout_gravity="bottom"
+            android:id="@+id/bottomBar"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
+        android:id="@+id/mainDrawer"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true" />
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/activity_image.xml b/androidApp/src/main/res/layout/activity_image.xml
new file mode 100644
index 0000000..d2d43ef
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_image.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:popupTheme="?attr/toolbarPopupTheme"
+            app:theme="@style/ToolBarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidApp/src/main/res/layout/activity_login.xml b/androidApp/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..7887f3d
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_login.xml
@@ -0,0 +1,138 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    tools:context="bou.amine.apps.readerforselfossv2.android.LoginActivity">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
+        <!-- Login progress -->
+        <ProgressBar
+            android:id="@+id/loginProgress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"/>
+
+        <ScrollView
+            android:id="@+id/loginForm"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/urlView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_url"
+                    android:imeOptions="actionUnspecified"
+                    android:importantForAutofill="no"
+                    android:inputType="textUri"
+                    android:maxLines="1" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:text="@string/withLoginSwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:id="@+id/withLogin"
+                    android:layout_weight="1"/>
+
+                <EditText
+                    android:id="@+id/loginView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_login"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:visibility="gone" />
+
+                <EditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_password"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:visibility="gone" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/withHttpLogin"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/withHttpLoginSwitch" />
+
+                <EditText
+                    android:id="@+id/httpLoginView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_http_login"
+                    android:inputType="text"
+                    android:visibility="gone" />
+
+                <EditText
+                    android:id="@+id/httpPasswordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_http_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/withSelfhostedCert"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_hosted_cert_switch" />
+
+                <TextView
+                    android:id="@+id/warningText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/self_signed_cert_warning"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/signInButton"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:text="@string/action_sign_in"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/androidApp/src/main/res/layout/activity_main.xml b/androidApp/src/main/res/layout/activity_main.xml
index 73626a6..83a3b21 100644
--- a/androidApp/src/main/res/layout/activity_main.xml
+++ b/androidApp/src/main/res/layout/activity_main.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.MainActivity">
 
-    <TextView
-        android:id="@+id/text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Hello World!" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidApp/src/main/res/layout/activity_reader.xml b/androidApp/src/main/res/layout/activity_reader.xml
new file mode 100644
index 0000000..b2cfa5a
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_reader.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:id="@+id/reader_activity_view"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:popupTheme="?attr/toolbarPopupTheme"
+            app:theme="@style/ToolBarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+
+
+    <me.relex.circleindicator.CircleIndicator3
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:background="#55000000"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/pager" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidApp/src/main/res/layout/activity_settings.xml b/androidApp/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..f8bf459
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,22 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:theme="@style/ToolBarStyle" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/activity_sources.xml b/androidApp/src/main/res/layout/activity_sources.xml
new file mode 100644
index 0000000..2896dc4
--- /dev/null
+++ b/androidApp/src/main/res/layout/activity_sources.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.SourcesActivity">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom|end"
+        app:srcCompat="@drawable/ic_add_white_24dp"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@string/add_source" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/androidApp/src/main/res/layout/card_item.xml b/androidApp/src/main/res/layout/card_item.xml
new file mode 100644
index 0000000..7b6863d
--- /dev/null
+++ b/androidApp/src/main/res/layout/card_item.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.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"
+    app:cardBackgroundColor="?cardBackgroundColor">
+
+    <androidx.constraintlayout.widget.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" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            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: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"
+                android:textColor="?android:textColorPrimary"
+                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"
+                android:textColor="?android:textColorPrimary"
+                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">
+
+                <ImageButton
+                    android:id="@+id/favButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    android:scaleType="centerCrop"
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />
+
+                <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"
+                    app:srcCompat="@drawable/ic_share_black_24dp"
+                    app: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"
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />
+
+            </RelativeLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/fragment_article.xml b/androidApp/src/main/res/layout/fragment_article.xml
new file mode 100644
index 0000000..0b5327f
--- /dev/null
+++ b/androidApp/src/main/res/layout/fragment_article.xml
@@ -0,0 +1,129 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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="match_parent"
+    android:background="?android:colorBackground"
+    android:descendantFocusability="blocksDescendants">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                android:scaleType="centerCrop"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+
+            <TextView
+                android:id="@+id/source"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginRight="16dp"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/titleView" />
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+
+            <WebView
+                android:id="@+id/webcontent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textColorLink="?attr/colorAccent"
+                android:visibility="gone"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="24dp"
+                android:paddingBottom="48dp"
+                android:background="?android:colorBackground"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/source"
+                tools:visibility="visible" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_gravity="end|bottom|right">
+
+        <com.github.rubensousa.floatingtoolbar.FloatingToolbar
+            android:id="@+id/floatingToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_gravity="bottom"
+            app:floatingMenu="@menu/reader_toolbar" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom|right"
+            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:src="@drawable/ic_add_white_24dp"
+            app:backgroundTint="?attr/colorAccent"
+            app:fabSize="mini"
+            app:rippleColor="?attr/colorAccentDark" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:animateLayoutChanges="true"
+        android:alpha="0.8"
+        android:background="@color/black"
+        android:clickable="false">
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:progressTint="?attr/colorAccent" />
+    </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/fragment_image.xml b/androidApp/src/main/res/layout/fragment_image.xml
new file mode 100644
index 0000000..ae2c7a8
--- /dev/null
+++ b/androidApp/src/main/res/layout/fragment_image.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/photoView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"
+        android:background="@android:color/black"
+        app:srcCompat="@android:drawable/screen_background_dark" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/list_item.xml b/androidApp/src/main/res/layout/list_item.xml
new file mode 100644
index 0000000..6f3bef8
--- /dev/null
+++ b/androidApp/src/main/res/layout/list_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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="88dp">
+
+    <ImageView
+        android:id="@+id/itemImage"
+        android:layout_width="46dp"
+        android:layout_height="46dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="21dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="8dp" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:fontFamily="sans-serif"
+        android:gravity="start"
+        android:maxLines="3"
+        android:textAlignment="viewStart"
+        android:textAllCaps="false"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Titre"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
+
+    <TextView
+        android:id="@+id/sourceTitleAndDate"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="66dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textSize="14sp"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Google Actualité Il y a 5h"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/source_list_item.xml b/androidApp/src/main/res/layout/source_list_item.xml
new file mode 100644
index 0000000..1671514
--- /dev/null
+++ b/androidApp/src/main/res/layout/source_list_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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="48dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/itemImage"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/sourceTitle"
+        android:layout_width="0dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textAlignment="textStart"
+        android:textSize="13sp"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="source title" />
+
+    <Button
+        android:id="@+id/deleteBtn"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/ic_remove_circle_outline_black_24dp"
+        android:backgroundTint="?android:textColorSecondary"
+        android:elevation="4dp"
+        android:contentDescription="@string/remove_source"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/menu/home_menu.xml b/androidApp/src/main/res/menu/home_menu.xml
new file mode 100644
index 0000000..537909c
--- /dev/null
+++ b/androidApp/src/main/res/menu/home_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/action_search"
+        android:title="@string/menu_home_search"
+        android:icon="@drawable/ic_menu_search_white_24dp"
+        app:showAsAction="ifRoom|collapseActionView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+
+    <item android:id="@+id/readAll"
+          android:icon="@drawable/ic_menu_done_all_white_24dp"
+          android:title="@string/readAll"
+          android:orderInCategory="1"
+          app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/refresh"
+        android:icon="@drawable/ic_menu_refresh_white_24dp"
+        android:orderInCategory="99"
+        android:title="@string/menu_home_refresh" />
+
+    <item android:id="@+id/action_disconnect"
+          android:title="@string/action_disconnect"
+          android:orderInCategory="104"
+          app:showAsAction="never"/>
+</menu>
diff --git a/androidApp/src/main/res/menu/login_menu.xml b/androidApp/src/main/res/menu/login_menu.xml
new file mode 100644
index 0000000..06347b3
--- /dev/null
+++ b/androidApp/src/main/res/menu/login_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+    <item android:id="@+id/about"
+          android:title="@string/action_about"
+          android:orderInCategory="102"
+          app:showAsAction="never"/>
+</menu>
diff --git a/androidApp/src/main/res/menu/reader_menu.xml b/androidApp/src/main/res/menu/reader_menu.xml
new file mode 100644
index 0000000..d811be3
--- /dev/null
+++ b/androidApp/src/main/res/menu/reader_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/align_left"
+        android:icon="@drawable/ic_format_align_left"
+        android:visible="true"
+        app:showAsAction="ifRoom"
+        android:title="@string/reader_text_align_left" />
+
+    <item android:id="@+id/align_justify"
+        android:icon="@drawable/ic_format_align_justify"
+        android:visible="true"
+        app:showAsAction="ifRoom"
+        android:title="@string/reader_text_align_justify" />
+
+    <item
+        android:id="@+id/star"
+        android:icon="@drawable/ic_menu_heart_60dp"
+        android:title="@string/add_to_favs_reader"
+        android:visible="true"
+        app:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/androidApp/src/main/res/menu/reader_toolbar.xml b/androidApp/src/main/res/menu/reader_toolbar.xml
new file mode 100644
index 0000000..38a1d3b
--- /dev/null
+++ b/androidApp/src/main/res/menu/reader_toolbar.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/unread_action"
+        android:icon="@drawable/ic_baseline_white_eye_24dp"
+        android:title="@string/unmark"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/more_action"
+        android:icon="@drawable/ic_chrome_reader_mode_white_24dp"
+        android:title="@string/reader_action_more"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/open_action"
+        android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:title="@string/reader_action_open"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/share_action"
+        android:icon="@drawable/ic_share_white_24dp"
+        android:title="@string/reader_action_share"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/androidApp/src/main/res/menu/settings_theme.xml b/androidApp/src/main/res/menu/settings_theme.xml
new file mode 100644
index 0000000..09bfc20
--- /dev/null
+++ b/androidApp/src/main/res/menu/settings_theme.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/clear"
+        android:icon="@drawable/ic_history_white_24dp"
+        android:title="@string/drawer_action_clear"
+        app:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..036d09b
--- /dev/null
+++ b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..036d09b
--- /dev/null
+++ b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..1fc2f5f
Binary files /dev/null and b/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher_background.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..6ebce6a
Binary files /dev/null and b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/androidApp/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..d612d4f
Binary files /dev/null and b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..03cc375
Binary files /dev/null and b/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher_background.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..78e3920
Binary files /dev/null and b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/androidApp/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..ac706cc
Binary files /dev/null and b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..c163429
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..8a578a5
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..34d35e7
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..5c9bea5
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..da46328
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e164571
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..7848000
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..df3db4d
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..687cb6a
Binary files /dev/null and b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/androidApp/src/main/res/values-ca-rES/strings.xml b/androidApp/src/main/res/values-ca-rES/strings.xml
new file mode 100644
index 0000000..a66888e
--- /dev/null
+++ b/androidApp/src/main/res/values-ca-rES/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Lector per a Selfoss"</string>
+    <string name="title_activity_login">"Inicia la sessió"</string>
+    <string name="prompt_password">"Contrasenya"</string>
+    <string name="prompt_http_password">"Contrasenya HTTP"</string>
+    <string name="action_sign_in">"Vés-hi"</string>
+    <string name="error_invalid_password">"La contrasenya és massa curta"</string>
+    <string name="error_field_required">"Camp necessari"</string>
+    <string name="prompt_url">"URL"</string>
+    <string name="withLoginSwitch">"Autenticació (si és necessària)"</string>
+    <string name="withHttpLoginSwitch">"Autenticació HTTP (si és necessària)"</string>
+    <string name="login_url_problem">"Pot ser que falti una \"/\" al final de l'url."</string>
+    <string name="prompt_login">"Nom d'usuari"</string>
+    <string name="prompt_http_login">"Nom d'usuari HTTP"</string>
+    <string name="label_share">"Comparteix"</string>
+    <string name="readAll">"Llegeix-ho tot"</string>
+    <string name="action_disconnect">"Desconnecta't"</string>
+    <string name="title_activity_settings">"Configuració"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Etiqueta1, Etiqueta2, Etiqueta3"</string>
+    <string name="add_source_hint_url">"Enllaç"</string>
+    <string name="add_source_hint_name">"Nom"</string>
+    <string name="add_source">"Afegeix una font"</string>
+    <string name="add_source_save">"Desa"</string>
+    <string name="wrong_infos">"Torneu a comprovar la informació."</string>
+    <string name="all_posts_not_read">"No s'han llegit totes les publicacions"</string>
+    <string name="all_posts_read">"S'han llegit totes les publicacions"</string>
+    <string name="cant_get_favs">"No es poden obtenir preferits"</string>
+    <string name="cant_get_new_elements">"No es pot accedir als articles nous"</string>
+    <string name="cant_get_read">"No es poden llegir els articles"</string>
+    <string name="nothing_here">"No hi ha res"</string>
+    <string name="tab_new">"Nou"</string>
+    <string name="tab_read">"Tot"</string>
+    <string name="tab_favs">"Preferits"</string>
+    <string name="action_about">"Quant a"</string>
+    <string name="marked_as_read">"Element llegit"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Desfés"</string>
+    <string name="addStringNoUrl">"Inicieu la sessió per afegir fonts."</string>
+    <string name="cant_get_sources">"No es pot obtenir la llista de fonts."</string>
+    <string name="cant_create_source">"No es pot crear la font."</string>
+    <string name="cant_get_spouts">"No es pot obtenir la llista de canals."</string>
+    <string name="form_not_complete">"El formulari no està complet"</string>
+    <string name="pref_header_links">"Enllaços"</string>
+    <string name="issue_tracker_link">"Detector de problemes"</string>
+    <string name="issue_tracker_summary">"Informa d'un error o pregunta sobre funcions noves"</string>
+    <string name="warning_wrong_url">"ADVERTÈNCIA"</string>
+    <string name="pref_switch_card_view_title">"Visualització de targeta"</string>
+    <string name="cant_mark_favortie">"No es pot marcar l'article com a preferit"</string>
+    <string name="cant_unmark_favortie">"No es pot treure l'element de preferits"</string>
+    <string name="share">"Comparteix"</string>
+    <string name="rating_prompt_title">"Us agrada l'aplicació?"</string>
+    <string name="rating_prompt_yes">"Sí."</string>
+    <string name="rating_prompt_no">"No gaire…"</string>
+    <string name="rating_prompt_feedback_title">"Ens podeu dir per què?"</string>
+    <string name="rating_prompt_feedback_yes">"D'acord."</string>
+    <string name="rating_prompt_feedback_no">"Ara no."</string>
+    <string name="rating_prompt_rating_title">"Perfecte! Ens podeu puntuar a la Botiga?"</string>
+    <string name="rating_prompt_rating_yes">"Sí."</string>
+    <string name="rating_prompt_rating_no">"Ara no."</string>
+    <string name="rating_prompt_thanks">"Gràcies. La vostra opinió ens ajuda a millorar l'aplicació."</string>
+    <string name="switch_unread_count">"Mostra el recompte d'articles no llegits amb un distintiu a la barra inferior."</string>
+    <string name="switch_unread_count_title">"Recompte d'articles no llegits"</string>
+    <string name="display_all_counts_title">"Recompte d'articles llegits i preferits"</string>
+    <string name="text_wrong_url">"Sembla que esteu utilitzant un URL no vàlid. Assegureu-vos que és correcte, i si el problema persisteix, poseu-vos en contacte amb mi (a través de l'enllaç de contacte que hi ha a la Botiga). Tingueu en compte que per utilitzar aquesta aplicació cal que també utilitzeu Selfoss. Si no, no podreu accedir a canals RSS."</string>
+    <string name="pref_general_internal_browser_title">"Obre els enllaços dins de l'aplicació"</string>
+    <string name="pref_general_internal_browser_on">"Els articles s'obriran dins de l'aplicació"</string>
+    <string name="pref_general_internal_browser_off">"Els articles s'obriran amb el navegador predeterminat"</string>
+    <string name="prefer_article_viewer_title">"Obre el visualitzador d'articles"</string>
+    <string name="prefer_article_viewer_on">"S'obrirà el visualitzador d'articles en lloc del navegador intern"</string>
+    <string name="prefer_article_viewer_off">"S'obrirà el navegador intern en lloc del visualitzador d'articles"</string>
+    <string name="pref_general_category_links">"Gestió d'enllaços"</string>
+    <string name="pref_general_category_displaying">"Visualització"</string>
+    <string name="pref_switch_card_view_on">"Els articles es mostraran com a targetes"</string>
+    <string name="pref_switch_card_view_off">"Els articles es mostraran en forma de llista"</string>
+    <string name="menu_home_refresh">"Actualitza l'accés remot"</string>
+    <string name="refresh_success_response">"S'ha actualitzat el remot. Torneu a carregar la llista d'articles"</string>
+    <string name="refresh_failer_message">"L'actualització no ha funcionat. Torneu a provar-ho més tard o consulteu els registres de Selfoss."</string>
+    <string name="refresh_in_progress">"S'està actualitzant"</string>
+    <string name="card_height_title">Alçada completa de les targetes</string>
+    <string name="card_height_on">L\'alçada de les targetes s\'ajustarà al seu contingut</string>
+    <string name="card_height_off">L\'alçada de les targetes serà fixa</string>
+    <string name="source_code">Codi font</string>
+    <string name="cant_mark_read">No es pot marcar l\'article com a llegit</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">S\'ha produït un error en carregar les etiquetes</string>
+    <string name="drawer_error_loading_sources">S\'ha produït un error en carregar les fonts</string>
+    <string name="drawer_item_filters">Filtres</string>
+    <string name="drawer_action_clear">Esborra</string>
+    <string name="drawer_item_tags">Etiquetes</string>
+    <string name="drawer_item_sources">Fonts</string>
+    <string name="drawer_action_edit">Edita</string>
+    <string name="no_tags_loaded">No s\'ha carregat cap etiqueta</string>
+    <string name="no_sources_loaded">No s\'ha carregat cap font</string>
+    <string name="drawer_loading">S\'està carregant…</string>
+    <string name="menu_home_search">Cerca</string>
+    <string name="can_delete_source">No es pot suprimir la font</string>
+    <string name="base_url_error">S\'ha produït un error en comunicar-se amb la instància de Selfoss. Si el problema persisteix, posa\'t en contacte amb mi.</string>
+    <string name="pref_header_theme">Temes</string>
+    <string name="default_theme">Predeterminat</string>
+    <string name="default_dark_theme">Predeterminat/Fosc</string>
+    <string name="pref_header_debug">Depuració</string>
+    <string name="self_hosted_cert_switch">Utilitzeu un certificat autoallotjat?</string>
+    <string name="self_signed_cert_warning">Per raons de seguretat, els certificats autosignats no seran compatibles per defecte. En activar aquesta opció, sereu responsable de qualsevol problema de seguretat que es pugui produir.</string>
+    <string name="pref_selfoss_category">API de Selfoss</string>
+    <string name="pref_api_items_number_title">Nombre d\'elements carregats</string>
+    <string name="pref_hidden_tags">Etiquetes ocultes</string>
+    <string name="summary_debug_identifier">Identificador de depuració</string>
+    <string name="unique_id_to_clipboard">S\'ha copiat l\'identificador al porta-retalls</string>
+    <string name="display_header_drawer_summary">Mostra una capçalera amb la instància URL de Selfoss al panell lateral.</string>
+    <string name="display_header_drawer_title">Capçalera de menú</string>
+    <string name="pref_general_infinite_loading_title">Carrega articles en desplaçar</string>
+    <string name="translation">Traducció</string>
+    <string name="cant_open_invalid_url">L\'element URL no és vàlid. Estic intentant solucionar aquest problema perquè l\'aplicació no falli.</string>
+    <string name="drawer_report_bug">Informa d\'un error</string>
+    <string name="items_number_should_be_number">El nombre d\'elements ha de ser enter.</string>
+    <string name="reader_action_more">Més informació</string>
+    <string name="reader_action_open">Obre al navegador</string>
+    <string name="reader_action_share">Comparteix</string>
+    <string name="pref_switch_actions_pager_scroll_on">Es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
+    <string name="add_to_favs_reader">Afegeix als preferits</string>
+    <string name="remove_to_favs_reader">Suprimeix dels preferits</string>
+    <string name="pref_content_reader_font_size">Mida de la lletra del lector d’articles</string>
+    <string name="pref_header_viewer">Visualitzador d\'articles</string>
+    <string name="refresh_dialog_message">Aquesta acció actualitzarà la vostra instància de Selfoss.</string>
+    <string name="markall_dialog_message">Aquesta acció marcarà els elements com a llegits.</string>
+    <string name="pref_switch_actions_pager_scroll">Marca com a llegit en lliscar el dit</string>
+    <string name="pref_switch_actions_pager_scroll_off">No es marcaran els articles com a llegits en lliscar el dit d\'un article a l\'altre.</string>
+    <string name="pref_acra_alwaysaccept">Envia informes d\'error automàtics</string>
+    <string name="pref_acra_alwaysaccept_enabled">S\'enviaran informes d\'error automàticament</string>
+    <string name="pref_acra_alwaysaccept_disabled">Us preguntarem abans d\'enviar un informe d\'error.</string>
+    <string name="pref_debug_crash_reports">Informes d\'error</string>
+    <string name="pref_debug_debug_logs">Registre de depuració (s\'enviarà automàticament)</string>
+    <string name="acra_login">Habilita el registre</string>
+    <string name="drawer_item_hidden_tags">Etiquetes ocultes</string>
+    <string name="unmark">Marca com no llegit</string>
+    <string name="pref_header_offline">Sense connexió i memòria clau</string>
+    <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
+    <string name="pref_switch_items_caching_on">Els articles es guardaran a la memòria del dispositiu i es podran utilitzar sense connexió.</string>
+    <string name="pref_switch_items_caching">Guarda els elements per utilitzar-los sense connexió</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Sense connexió!</string>
+    <string name="pref_switch_periodic_refresh">Sincronitza els articles</string>
+    <string name="pref_switch_periodic_refresh_off">Els articles no se sincronitzaran en segon pla</string>
+    <string name="pref_switch_periodic_refresh_on">Els articles se sincronitzaran periòdicament</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de sincronització ( >= 15 minuts)]]></string>
+    <string name="pref_switch_refresh_when_charging">Sincronitza només quan el telèfon s\'està carregant</string>
+    <string name="loading_notification_title">S\'està carregant...</string>
+    <string name="loading_notification_text">Selfoss està sincronitzant els articles</string>
+    <string name="notification_channel_sync">Notificació de sincronització</string>
+    <string name="new_items_channel_sync">Notificació d\'elements nous</string>
+    <string name="new_items_notification_title">Nous articles!</string>
+    <string name="new_items_notification_text">S\'han carregat %1$d articles nous.</string>
+    <string name="pref_switch_notify_new_items">Avisa\'m quan se sincronitzin articles nous.</string>
+    <string name="shortcut_offline">Sense connexió</string>
+    <string name="pref_api_timeout">S\'ha acabat el temps d\'espera de l\'API</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-de-rDE/strings.xml b/androidApp/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000..28f9894
--- /dev/null
+++ b/androidApp/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader für selfoss"</string>
+    <string name="title_activity_login">"Anmelden"</string>
+    <string name="prompt_password">"Passwort"</string>
+    <string name="prompt_http_password">"HTTP Passwort"</string>
+    <string name="action_sign_in">"Fortfahren"</string>
+    <string name="error_invalid_password">"Passwort ist nicht lang genug"</string>
+    <string name="error_field_required">"Pflichtfeld"</string>
+    <string name="prompt_url">"URL"</string>
+    <string name="withLoginSwitch">"Anmeldung erforderlich?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Anmeldung erforderlich?"</string>
+    <string name="login_url_problem">"Ups. Du musst eventuell ein \"/\" am Ende der URL anhängen."</string>
+    <string name="prompt_login">"Benutzername"</string>
+    <string name="prompt_http_login">"HTTP Benutzername"</string>
+    <string name="label_share">"Teilen"</string>
+    <string name="readAll">"Alle gelesen"</string>
+    <string name="action_disconnect">"Verbindung trennen"</string>
+    <string name="title_activity_settings">"Einstellungen"</string>
+    <string name="pref_header_general">"Allgemein"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Name"</string>
+    <string name="add_source">"Neue Quelle hinzufügen"</string>
+    <string name="add_source_save">"Speichern"</string>
+    <string name="wrong_infos">"Überprüfe deine Angaben noch einmal."</string>
+    <string name="all_posts_not_read">"Nicht alle Beiträge wurden gelesen"</string>
+    <string name="all_posts_read">"Alle Beiträge wurden gelesen"</string>
+    <string name="cant_get_favs">"Favoriten können nicht abgerufen werden"</string>
+    <string name="cant_get_new_elements">"Neue Artikel können nicht abgerufen werden"</string>
+    <string name="cant_get_read">"Gelese Artikel können nicht abgerufen werden"</string>
+    <string name="nothing_here">"Keine Einträge vorhanden"</string>
+    <string name="tab_new">"Neu"</string>
+    <string name="tab_read">"Alle"</string>
+    <string name="tab_favs">"Favoriten"</string>
+    <string name="action_about">"Über"</string>
+    <string name="marked_as_read">"Artikel gelesen"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Rückgängig"</string>
+    <string name="addStringNoUrl">"Melde dich an um Quellen hinzuzufügen."</string>
+    <string name="cant_get_sources">"Quellen können nicht abgerufen werden."</string>
+    <string name="cant_create_source">"Quelle kann nicht gespeichert werden."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"Das Formular ist nicht vollständig"</string>
+    <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_wrong_url">"WARNUNG"</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>
+    <string name="rating_prompt_title">"Gefällt Dir die App?"</string>
+    <string name="rating_prompt_yes">"Ja!"</string>
+    <string name="rating_prompt_no">"Nicht wirklich…"</string>
+    <string name="rating_prompt_feedback_title">"Magst du uns sagen warum?"</string>
+    <string name="rating_prompt_feedback_yes">"OK!"</string>
+    <string name="rating_prompt_feedback_no">"Nicht jetzt."</string>
+    <string name="rating_prompt_rating_title">"Wunderbar! Magst du uns im Play Store bewerten?"</string>
+    <string name="rating_prompt_rating_yes">"Sicher!"</string>
+    <string name="rating_prompt_rating_no">"Nicht jetzt."</string>
+    <string name="rating_prompt_thanks">"Vielen Dank, dein Feedback hilft die App zu verbessern!"</string>
+    <string name="switch_unread_count">"Zeige die Zahl ungelesener Artikel in der unteren Leiste."</string>
+    <string name="switch_unread_count_title">"Zeige Anzahl ungelesener Artikel"</string>
+    <string name="display_all_counts_title">"Zeige Anzahl der Favoriten und gelesenen Artikel"</string>
+    <string name="text_wrong_url">"Sie scheinen eine ungültige URL verwenden. Stellen Sie sicher, dass die URL richtig ist. Sollte das Problem weiterhin bestehen kontaktieren Sie mich (über den Playstore-Kontakt-Link). Bitte beachten Sie, dass Sie Selfoss benötigen um RSS-Feeds zu lesen."</string>
+    <string name="pref_general_internal_browser_title">"Öffne Links innerhalb der App"</string>
+    <string name="pref_general_internal_browser_on">"Artikel werden innerhalb der App geöffnet"</string>
+    <string name="pref_general_internal_browser_off">"Artikel werden mit deinem Standard-Browser geöffnet"</string>
+    <string name="prefer_article_viewer_title">"Verwenden Sie den Artikel-viewer"</string>
+    <string name="prefer_article_viewer_on">"Artikel-Viewer wird anstelle des internen Browser verwendet"</string>
+    <string name="prefer_article_viewer_off">"Der internen Browser wird anstelle des Artikel-Viewer verwendet"</string>
+    <string name="pref_general_category_links">"Umgang mit Links"</string>
+    <string name="pref_general_category_displaying">"Ansicht"</string>
+    <string name="pref_switch_card_view_on">"Artikel werden als Kacheln angezeigt"</string>
+    <string name="pref_switch_card_view_off">"Artikel werden als Liste angezeigt"</string>
+    <string name="menu_home_refresh">"Remote-Aktualisierung"</string>
+    <string name="refresh_success_response">"Selfoss wird aktualisiert, du kannst jetzt die Artikel laden"</string>
+    <string name="refresh_failer_message">"Das Update hat nicht funktioniert, versuche es erneut oder überprüfe die Protokolle von Selfoss."</string>
+    <string name="refresh_in_progress">"Aktualisierung läuft"</string>
+    <string name="card_height_title">Maximale Kartenhöhe</string>
+    <string name="card_height_on">Kartenhöhe passt sich Inhalt an</string>
+    <string name="card_height_off">Kartenhöhe ist fix</string>
+    <string name="source_code">Quellcode</string>
+    <string name="cant_mark_read">Artikel kann nicht als gelesen markiert werden</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Fehler beim Laden der Tags…</string>
+    <string name="drawer_error_loading_sources">Fehler beim Laden der Quellen…</string>
+    <string name="drawer_item_filters">Filter</string>
+    <string name="drawer_action_clear">leeren</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Quellen</string>
+    <string name="drawer_action_edit">bearbeiten</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <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">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>
+    <string name="default_dark_theme">Standard (Dunkel)</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Verwenden Sie einen selbst gehostetes Zertifikat?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">selfoss API</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">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">Melde einen Fehler</string>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Im Browser öffnen</string>
+    <string name="reader_action_share">Teilen</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Zu Favoriten hinzufügen</string>
+    <string name="remove_to_favs_reader">Aus Favoriten entfernen</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">Dies wird alle Elemente als gelesen markieren.</string>
+    <string name="pref_switch_actions_pager_scroll">Beim Wischen als gelesen markieren</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Fehlerberichte werden automatisch gesendet</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Fehlerberichte</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Protokollierung aktivieren</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Eintrag als ungelesen markieren</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Nicht verbunden !</string>
+    <string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
+    <string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
+    <string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Nur aktualisieren, wenn das Telefon aufgeladen wird</string>
+    <string name="loading_notification_title">Lädt...</string>
+    <string name="loading_notification_text">Selfoss synchronisiert Ihre Artikel</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">API-Zeitüberschreitung</string>
+    <string name="pref_header_experimental">Experimentell</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-es-rES/strings.xml b/androidApp/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000..4563ac1
--- /dev/null
+++ b/androidApp/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Lector para Selfoss"</string>
+    <string name="title_activity_login">"Iniciar sesión"</string>
+    <string name="prompt_password">"Contraseña"</string>
+    <string name="prompt_http_password">"Contraseña HTTP"</string>
+    <string name="action_sign_in">"Empezar"</string>
+    <string name="error_invalid_password">"La contraseña no es suficientemente larga"</string>
+    <string name="error_field_required">"Campo requerido"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Inicio de sesión requerido ?"</string>
+    <string name="withHttpLoginSwitch">"Inicio de sesión HTTP requerido ?"</string>
+    <string name="login_url_problem">"Oops. Puede que necesite añadir un \"/\" al final de la url."</string>
+    <string name="prompt_login">"Nombre de usuario"</string>
+    <string name="prompt_http_login">"Nombre de usuario HTTP"</string>
+    <string name="label_share">"Compartir"</string>
+    <string name="readAll">"Leer todo"</string>
+    <string name="action_disconnect">"Desconectar"</string>
+    <string name="title_activity_settings">"Configuración"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Etiqueta1, Etiqueta2, Etiqueta3"</string>
+    <string name="add_source_hint_url">"Enlace"</string>
+    <string name="add_source_hint_name">"Nombre"</string>
+    <string name="add_source">"Añadir una fuente"</string>
+    <string name="add_source_save">"Guardar"</string>
+    <string name="wrong_infos">"Revise sus datos de nuevo."</string>
+    <string name="all_posts_not_read">"No todas las publicaciones fueron leídas"</string>
+    <string name="all_posts_read">"Todas las publicaciones fueron leídas"</string>
+    <string name="cant_get_favs">"No se pueden obtener favoritos"</string>
+    <string name="cant_get_new_elements">"No puede recibir nuevos artículos"</string>
+    <string name="cant_get_read">"No puede recibir artículos leídos"</string>
+    <string name="nothing_here">"Nada aquí"</string>
+    <string name="tab_new">"Nuevo"</string>
+    <string name="tab_read">"Todo"</string>
+    <string name="tab_favs">"Favoritos"</string>
+    <string name="action_about">"Acerca de"</string>
+    <string name="marked_as_read">"Artículo leído"</string>
+    <string name="marked_as_unread">"Artículo no leído"</string>
+    <string name="undo_string">"Deshacer"</string>
+    <string name="addStringNoUrl">"Iniciar sesión para añadir fuentes."</string>
+    <string name="cant_get_sources">"No se puede obtener la lista de fuentes."</string>
+    <string name="cant_create_source">"No se puede crear la fuente."</string>
+    <string name="cant_get_spouts">"No se puede obtener la lista de fuentes."</string>
+    <string name="form_not_complete">"El formulario no está completo"</string>
+    <string name="pref_header_links">"Enlaces"</string>
+    <string name="issue_tracker_link">"Rastreador de Incidencias"</string>
+    <string name="issue_tracker_summary">"Reportar un error o solicitar una nueva función"</string>
+    <string name="warning_wrong_url">"ADVERTENCIA"</string>
+    <string name="pref_switch_card_view_title">"Vista de la tarjeta"</string>
+    <string name="cant_mark_favortie">"No puede marcar el artículo como favorito"</string>
+    <string name="cant_unmark_favortie">"No se puede quitar el artículo de favoritos"</string>
+    <string name="share">"Compartir"</string>
+    <string name="rating_prompt_title">"¿Disfrutando la aplicación?"</string>
+    <string name="rating_prompt_yes">"¡Sí!"</string>
+    <string name="rating_prompt_no">"La verdad es que no…"</string>
+    <string name="rating_prompt_feedback_title">"¿Puede decirnos por qué?"</string>
+    <string name="rating_prompt_feedback_yes">"¡Vale!"</string>
+    <string name="rating_prompt_feedback_no">"Ahora no."</string>
+    <string name="rating_prompt_rating_title">"¡Excelente! ¿Puede valorarnos en la tienda?"</string>
+    <string name="rating_prompt_rating_yes">"¡Claro!"</string>
+    <string name="rating_prompt_rating_no">"No en este momento."</string>
+    <string name="rating_prompt_thanks">"¡Gracias, sus comentarios ayudan a mejorar la aplicación!"</string>
+    <string name="switch_unread_count">"Mostrar el recuento no leído como una insignia de la barra inferior."</string>
+    <string name="switch_unread_count_title">"Mostrar recuento no leído"</string>
+    <string name="display_all_counts_title">"Mostrar recuento de favoritos y leídos"</string>
+    <string name="text_wrong_url">"Parece estar tratando de utilizar una dirección URL inválida. Asegúrese de que sea correcta y si el problema persiste, póngase en contacto conmigo (mediante el enlace de contacto de la tienda). Tenga en cuenta que la aplicación necesita utilizar Selfoss. No se puede acceder al contenido RSS sin él."</string>
+    <string name="pref_general_internal_browser_title">"Abrir enlaces dentro de la aplicación"</string>
+    <string name="pref_general_internal_browser_on">"Los artículos se abrirán dentro de la aplicación"</string>
+    <string name="pref_general_internal_browser_off">"Los artículos se abrirán con tu navegador predeterminado"</string>
+    <string name="prefer_article_viewer_title">"Utilizar el visor de artículo"</string>
+    <string name="prefer_article_viewer_on">"Se usará el visor de artículos en lugar del navegador interno"</string>
+    <string name="prefer_article_viewer_off">"Se utilizará el navegador interno en lugar del visor de artículo"</string>
+    <string name="pref_general_category_links">"Control de enlaces"</string>
+    <string name="pref_general_category_displaying">"Mostrando"</string>
+    <string name="pref_switch_card_view_on">"Los artículos se mostrarán como tarjetas"</string>
+    <string name="pref_switch_card_view_off">"Los artículos se mostrarán como una lista"</string>
+    <string name="menu_home_refresh">"Actualizar remoto"</string>
+    <string name="refresh_success_response">"Se actualizó el remoto, ahora puede recargar la lista de artículos"</string>
+    <string name="refresh_failer_message">"La actualización no funcionó, inténtalo más tarde o compruebe los registros de selfoss."</string>
+    <string name="refresh_in_progress">"Actualización en progreso"</string>
+    <string name="card_height_title">Tarjetas de altura completas</string>
+    <string name="card_height_on">Altura de tarjetas se ajustará a su contenido</string>
+    <string name="card_height_off">Se fijará la altura de la tarjeta</string>
+    <string name="source_code">Código fuente</string>
+    <string name="cant_mark_read">No puede marcar el artículo como leído</string>
+    <string name="cant_mark_unread">No se puede marcar el artículo como no leído</string>
+    <string name="drawer_error_loading_tags">Error al cargar etiquetas…</string>
+    <string name="drawer_error_loading_sources">Error al cargar fuentes…</string>
+    <string name="drawer_item_filters">Filtros</string>
+    <string name="drawer_action_clear">limpiar</string>
+    <string name="drawer_item_tags">Etiquetas</string>
+    <string name="drawer_item_sources">Fuentes</string>
+    <string name="drawer_action_edit">editar</string>
+    <string name="no_tags_loaded">No hay etiquetas cargadas</string>
+    <string name="no_sources_loaded">No hay fuentes cargadas</string>
+    <string name="drawer_loading">Cargando…</string>
+    <string name="menu_home_search">Buscar</string>
+    <string name="can_delete_source">No se puede eliminar la fuente…</string>
+    <string name="base_url_error">Hubo un problema al intentar comunicarse con su instancia de Selfoss. Si el problema persiste, póngase en contacto conmigo.</string>
+    <string name="pref_header_theme">Temas</string>
+    <string name="default_theme">Predeterminado</string>
+    <string name="default_dark_theme">Predeterminado/Oscuro</string>
+    <string name="pref_header_debug">Depurar</string>
+    <string name="self_hosted_cert_switch">Utilizando un certificado alojado propiamente ?</string>
+    <string name="self_signed_cert_warning">Por razones de seguridad, los certificados propios no son compatibles por defecto. Activando esto, no seré responsable de cualquier problema de seguridad que encuentre.</string>
+    <string name="pref_selfoss_category">Api de Selfoss</string>
+    <string name="pref_api_items_number_title">Número de artículos cargados</string>
+    <string name="pref_hidden_tags">Etiquetas ocultas</string>
+    <string name="summary_debug_identifier">Identificador de depuración</string>
+    <string name="unique_id_to_clipboard">Identificador copiado a su portapapeles</string>
+    <string name="display_header_drawer_summary">Mostrar una cabecera con la url de instancia de selfoss en el cajón lateral.</string>
+    <string name="display_header_drawer_title">Cabecera de cuenta</string>
+    <string name="pref_general_infinite_loading_title">Cargar más artículos en desplazamiento</string>
+    <string name="translation">Traducción</string>
+    <string name="cant_open_invalid_url">La url del elemento no es válida. Estoy buscando resolver este problema para que la aplicación no colapse.</string>
+    <string name="drawer_report_bug">Reportar un error</string>
+    <string name="items_number_should_be_number">El número de artículos debe ser un número entero.</string>
+    <string name="reader_action_more">Leer más</string>
+    <string name="reader_action_open">Abrir en el navegador</string>
+    <string name="reader_action_share">Compartir</string>
+    <string name="pref_switch_actions_pager_scroll_on">Marcar artículos como leidos al desplazarse entre ellos.</string>
+    <string name="add_to_favs_reader">Añadir a Favoritos</string>
+    <string name="remove_to_favs_reader">Eliminar de favoritos</string>
+    <string name="pref_content_reader_font_size">Tamaño de la fuente del lector</string>
+    <string name="pref_header_viewer">Visor de artículos</string>
+    <string name="refresh_dialog_message">Esto actualizará su instancia de Selfoss.</string>
+    <string name="markall_dialog_message">Esto marcará todos los artículos como leídos.</string>
+    <string name="pref_switch_actions_pager_scroll">Marcar artículos como leídos al deslizar con el dedo hacia los lados</string>
+    <string name="pref_switch_actions_pager_scroll_off">No marcar artículos como leídos al deslizar con el dedo hacia los lados.</string>
+    <string name="pref_acra_alwaysaccept">Enviar automáticamente informe de fallos</string>
+    <string name="pref_acra_alwaysaccept_enabled">Se enviaran automáticamente los informes de fallos</string>
+    <string name="pref_acra_alwaysaccept_disabled">Le preguntará al enviar informes de fallos.</string>
+    <string name="pref_debug_crash_reports">Informe de fallos</string>
+    <string name="pref_debug_debug_logs">Registro de depuración (éstos se enviarán sin diálogo)</string>
+    <string name="acra_login">Habilitar el registro</string>
+    <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+    <string name="unmark">Marcar artículo como no leído</string>
+    <string name="pref_header_offline">Sin conexión y caché</string>
+    <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
+    <string name="pref_switch_items_caching_on">Los artículos se guardarán en la memoria del dispositivo y se utilizarán para el uso sin conexión.</string>
+    <string name="pref_switch_items_caching">Guardar elementos para uso sin conexión</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Sin conexión!</string>
+    <string name="pref_switch_periodic_refresh">Sincronizar artículos</string>
+    <string name="pref_switch_periodic_refresh_off">Los artículos no se sincronizarán en segundo plano</string>
+    <string name="pref_switch_periodic_refresh_on">Los artículos se sincronizarán periódicamente</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
+    <string name="pref_switch_refresh_when_charging">Sólo refrescar cuando el teléfono está cargando</string>
+    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
+    <string name="new_items_channel_sync">Notificación de elementos nuevos</string>
+    <string name="new_items_notification_title">¡Nuevos artículos!</string>
+    <string name="new_items_notification_text">%1$d artículos cargados.</string>
+    <string name="pref_switch_notify_new_items">Notificarme cuando se sincronicen nuevos artículos.</string>
+    <string name="shortcut_offline">Sin conexión</string>
+    <string name="pref_api_timeout">Se acabó el tiempo de espera de la API</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Visor web no disponible. Desactivando el visor de artículo para evitar cualquier futuro problema. Se cargarán artículos en el navegador de ahora en adelante.</string>
+    <string name="webview_dialog_issue_title">Problema con el visor web</string>
+    <string name="reader_text_align_left">Alinear a la izquierda</string>
+    <string name="reader_text_align_justify">Justificado</string>
+    <string name="settings_reader_font">Modo lectura</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-fa-rIR/strings.xml b/androidApp/src/main/res/values-fa-rIR/strings.xml
new file mode 100644
index 0000000..a6ab39e
--- /dev/null
+++ b/androidApp/src/main/res/values-fa-rIR/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Log in"</string>
+    <string name="prompt_password">"Password"</string>
+    <string name="prompt_http_password">"HTTP Password"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"Password not long enough"</string>
+    <string name="error_field_required">"Field required"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Login required ?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+    <string name="prompt_login">"Username"</string>
+    <string name="prompt_http_login">"HTTP Username"</string>
+    <string name="label_share">"Share"</string>
+    <string name="readAll">"Read all"</string>
+    <string name="action_disconnect">"Disconnect"</string>
+    <string name="title_activity_settings">"Settings"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Name"</string>
+    <string name="add_source">"Add a source"</string>
+    <string name="add_source_save">"Save"</string>
+    <string name="wrong_infos">"Check your details again."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"All posts were read"</string>
+    <string name="cant_get_favs">"Can't get favorites"</string>
+    <string name="cant_get_new_elements">"Can't get new articles"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Nothing here"</string>
+    <string name="tab_new">"New"</string>
+    <string name="tab_read">"All"</string>
+    <string name="tab_favs">"Favorites"</string>
+    <string name="action_about">"About"</string>
+    <string name="marked_as_read">"Item read"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Undo"</string>
+    <string name="addStringNoUrl">"Log in to add sources."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"The form is not complete"</string>
+    <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_wrong_url">"WARNING"</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>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <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="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>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">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>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-fr-rFR/strings.xml b/androidApp/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000..d475599
--- /dev/null
+++ b/androidApp/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Login"</string>
+    <string name="prompt_password">"Mot de passe"</string>
+    <string name="prompt_http_password">"Mot de passe HTTP"</string>
+    <string name="action_sign_in">"Valider"</string>
+    <string name="error_invalid_password">"Mot de passe trop court"</string>
+    <string name="error_field_required">"Champ requis"</string>
+    <string name="prompt_url">"Url Selfoss"</string>
+    <string name="withLoginSwitch">"Avec login ?"</string>
+    <string name="withHttpLoginSwitch">"Avec login HTTP ?"</string>
+    <string name="login_url_problem">"Petit souci. Il manque peut être un / à la fin ?"</string>
+    <string name="prompt_login">"Utilisateur"</string>
+    <string name="prompt_http_login">"Utilisateur HTTP"</string>
+    <string name="label_share">"Partager"</string>
+    <string name="readAll">"Tout lire"</string>
+    <string name="action_disconnect">"Déconnecter"</string>
+    <string name="title_activity_settings">"Paramètres"</string>
+    <string name="pref_header_general">"Général"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Lien"</string>
+    <string name="add_source_hint_name">"Nom"</string>
+    <string name="add_source">"Ajouter une source"</string>
+    <string name="add_source_save">"Enregistrer"</string>
+    <string name="wrong_infos">"Vérifiez vos informations."</string>
+    <string name="all_posts_not_read">"Tous les posts n'ont pas été lus"</string>
+    <string name="all_posts_read">"Tous les posts sont lus"</string>
+    <string name="cant_get_favs">"Impossible de récupérer les éléments favoris."</string>
+    <string name="cant_get_new_elements">"Impossible de récupérer les nouveaux éléments."</string>
+    <string name="cant_get_read">"Impossible de récupérer les éléments lus."</string>
+    <string name="nothing_here">"Il n'y a rien ici !"</string>
+    <string name="tab_new">"Non lus"</string>
+    <string name="tab_read">"Tous"</string>
+    <string name="tab_favs">"Favoris"</string>
+    <string name="action_about">"À propos"</string>
+    <string name="marked_as_read">"Marqué comme lu"</string>
+    <string name="marked_as_unread">"Marqué comme non lu"</string>
+    <string name="undo_string">"Annuler"</string>
+    <string name="addStringNoUrl">"Identifiez-vous pour ajouter une source."</string>
+    <string name="cant_get_sources">"Impossible de récupérer la liste des sources"</string>
+    <string name="cant_create_source">"Impossible de créer la source."</string>
+    <string name="cant_get_spouts">"Impossible de récupérer vos Spouts pour rajouter des sources"</string>
+    <string name="form_not_complete">"Il manque des données. Terminez le formulaire."</string>
+    <string name="pref_header_links">"Liens utiles"</string>
+    <string name="issue_tracker_link">"Suivi des problèmes"</string>
+    <string name="issue_tracker_summary">"Pour signaler un bug ou demander une nouvelle fonctionnalité"</string>
+    <string name="warning_wrong_url">"ATTENTION"</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>
+    <string name="rating_prompt_title">"Vous aimez l'application ?"</string>
+    <string name="rating_prompt_yes">"Oui."</string>
+    <string name="rating_prompt_no">"Pas vraiment …"</string>
+    <string name="rating_prompt_feedback_title">"Pouvez-vous nous dire pourquoi ?"</string>
+    <string name="rating_prompt_feedback_yes">"Oui !"</string>
+    <string name="rating_prompt_feedback_no">"Pas maintenant."</string>
+    <string name="rating_prompt_rating_title">"Super ! Pouvez-vous nous noter sur le store ?"</string>
+    <string name="rating_prompt_rating_yes">"D'accord !"</string>
+    <string name="rating_prompt_rating_no">"Peut-être plus tard."</string>
+    <string name="rating_prompt_thanks">"Merci, cela nous aide à améliorer l'application !"</string>
+    <string name="switch_unread_count">"Afficher le nombre d'articles non lus sur la barre en bas de l'écran"</string>
+    <string name="switch_unread_count_title">"Afficher le nombre de non lus"</string>
+    <string name="display_all_counts_title">"Afficher le nombre de favoris et d'articles lus"</string>
+    <string name="text_wrong_url">"Vous semblez essayer de vous connecter avec une URL invalide. Assurez-vous que c'est la bonne, et si le problème persiste, contactez-moi via le lien du play store. Notez aussi que l'application ne peut fonctionner sans l'application web Selfoss. Vous ne pouvez pas utiliser l'application pour accéder directement aux flux RSS."</string>
+    <string name="pref_general_internal_browser_title">"Ouvrir les liens dans l'application"</string>
+    <string name="pref_general_internal_browser_on">"Les articles s'ouvriront dans l'application"</string>
+    <string name="pref_general_internal_browser_off">"Les articles s'ouvriront dans votre naviguateur par défaut"</string>
+    <string name="prefer_article_viewer_title">"Utiliser le visionneur d'articles"</string>
+    <string name="prefer_article_viewer_on">"Utiliser le naviguateur interne"</string>
+    <string name="prefer_article_viewer_off">"Utiliser le naviguateur interne au lieu du visionneur d'articles"</string>
+    <string name="pref_general_category_links">"Gestion des liens"</string>
+    <string name="pref_general_category_displaying">"Affichage"</string>
+    <string name="pref_switch_card_view_on">"Les articles seront affichés en forme de carte"</string>
+    <string name="pref_switch_card_view_off">"Les articles seront affichés en liste"</string>
+    <string name="menu_home_refresh">"Mettre à jour"</string>
+    <string name="refresh_success_response">"Mise à jour effectuée."</string>
+    <string name="refresh_failer_message">"La mise à jour n'a pas fonctionné. Vérifiez vos logs selfoss."</string>
+    <string name="refresh_in_progress">"Mise à jour en cours"</string>
+    <string name="card_height_title">Taille dynamique des cartes</string>
+    <string name="card_height_on">La taille de la carte s\'adaptera au contenu</string>
+    <string name="card_height_off">La taille de la carte sera fixe</string>
+    <string name="source_code">Code source</string>
+    <string name="cant_mark_read">Impossible de marquer l\'article comme lu</string>
+    <string name="cant_mark_unread">Impossible de marquer l\'article comme non lu</string>
+    <string name="drawer_error_loading_tags">Erreur lors du chargement des tags…</string>
+    <string name="drawer_error_loading_sources">Erreur lors du chargement des sources…</string>
+    <string name="drawer_item_filters">Filtres</string>
+    <string name="drawer_action_clear">raz</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">éditer</string>
+    <string name="no_tags_loaded">Pas de tags chargés</string>
+    <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">Impossible de supprimer la 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>
+    <string name="default_dark_theme">Par défaut/Foncé</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Certificat auto-signé ?</string>
+    <string name="self_signed_cert_warning">Pour des raisons de sécurité, les certificats auto-signés sont désactivés par défaut. En les activant, je ne serais pas responsable de quelconques problèmes de sécurité rencontrés.</string>
+    <string name="pref_selfoss_category">Api Selfoss</string>
+    <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
+    <string name="pref_hidden_tags">Tags Cachés</string>
+    <string name="summary_debug_identifier">Identifiant de debug</string>
+    <string name="unique_id_to_clipboard">Texte copié</string>
+    <string name="display_header_drawer_summary">Afficher une entête avec l\'url de votre instance de Selfoss en haut du drawer lateral.</string>
+    <string name="display_header_drawer_title">Entête de compte</string>
+    <string name="pref_general_infinite_loading_title">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>
+    <string name="items_number_should_be_number">Le nombre d\'articles doit être un entier.</string>
+    <string name="reader_action_more">Lire plus</string>
+    <string name="reader_action_open">Ouvrir</string>
+    <string name="reader_action_share">Partager</string>
+    <string name="pref_switch_actions_pager_scroll_on">Marquer les articles comme lus à la navigation dans le lecteur d\'article.</string>
+    <string name="add_to_favs_reader">Ajouter aux favoris</string>
+    <string name="remove_to_favs_reader">Supprimer des favoris</string>
+    <string name="pref_content_reader_font_size">Taille du texte du contenu du lecteur d\'articles</string>
+    <string name="pref_header_viewer">Lecteur d\'articles</string>
+    <string name="refresh_dialog_message">En validant, votre instance Selfoss sera mise à jour.</string>
+    <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
+    <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
+    <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
+    <string name="pref_acra_alwaysaccept">Envoyer automatiquement les rapports d\'erreur</string>
+    <string name="pref_acra_alwaysaccept_enabled">Enverra automatiquement les rapports d\'erreur</string>
+    <string name="pref_acra_alwaysaccept_disabled">Demandera une confirmation à chaque incident.</string>
+    <string name="pref_debug_crash_reports">Rapport d\'erreur</string>
+    <string name="pref_debug_debug_logs">Log de debug (seront envoyés automatiquement)</string>
+    <string name="acra_login">Activer les logs</string>
+    <string name="drawer_item_hidden_tags">Tags Cachés</string>
+    <string name="unmark">Marquer l\'article comme non lu</string>
+    <string name="pref_header_offline">Hors ligne et cache</string>
+    <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
+    <string name="pref_switch_items_caching_on">Les articles seront enregistrés et l\'application sera utilisable hors ligne.</string>
+    <string name="pref_switch_items_caching">Sauvegarder les articles pour une utilisation hors ligne</string>
+    <string name="pref_switch_update_sources">Vérifier les nouvelles sources et tags</string>
+    <string name="pref_switch_update_sources_summary">Désactivez cette option si votre serveur reçoit trop de requêtes.</string>
+    <string name="no_network_connectivity">Hors connexion !</string>
+    <string name="pref_switch_periodic_refresh">Synchroniser les articles</string>
+    <string name="pref_switch_periodic_refresh_off">Les articles ne seront pas synchronisés en arrière plan</string>
+    <string name="pref_switch_periodic_refresh_on">Articles seront périodiquement synchronisées</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Interval de synchronisation ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Synchroniser uniquement lorsque le téléphone est en charge</string>
+    <string name="loading_notification_title">Chargement ...</string>
+    <string name="loading_notification_text">Selfoss synchronise vos articles</string>
+    <string name="notification_channel_sync">Notification de synchronisation</string>
+    <string name="new_items_channel_sync">Notification de nouveaux articles</string>
+    <string name="new_items_notification_title">Nouveaux articles !</string>
+    <string name="new_items_notification_text">%1$d nouveaux articles synchronisés.</string>
+    <string name="pref_switch_notify_new_items">Notification quand des nouveaux articles sont synchronisés.</string>
+    <string name="shortcut_offline">Hors ligne</string>
+    <string name="pref_api_timeout">Timeout de l\'api</string>
+    <string name="pref_header_experimental">Expérimental</string>
+    <string name="webview_dialog_issue_message">Pas de Webview disponible. Désactivation du lecteur d\'article pour éviter les futures erreurs. Les articles seront lu via votre navigateur à l\'avenir.</string>
+    <string name="webview_dialog_issue_title">Problème de Webview</string>
+    <string name="reader_text_align_left">Aligner à gauche</string>
+    <string name="reader_text_align_justify">Justifier le texte</string>
+    <string name="settings_reader_font">Police du lecteur d\'articles</string>
+    <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string>
+    <string name="reader_static_bar_on">La barre sera affichée</string>
+    <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-gl-rES/strings.xml b/androidApp/src/main/res/values-gl-rES/strings.xml
new file mode 100644
index 0000000..1035038
--- /dev/null
+++ b/androidApp/src/main/res/values-gl-rES/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Lector para selfoss"</string>
+    <string name="title_activity_login">"Conectar"</string>
+    <string name="prompt_password">"Contrasinal"</string>
+    <string name="prompt_http_password">"Contrasinal HTTP"</string>
+    <string name="action_sign_in">"Ir"</string>
+    <string name="error_invalid_password">"O contrasinal non é suficientemente longo"</string>
+    <string name="error_field_required">"Campo requirido"</string>
+    <string name="prompt_url">"URL"</string>
+    <string name="withLoginSwitch">"É preciso iniciar sesión?"</string>
+    <string name="withHttpLoginSwitch">"É preciso iniciar sesión?"</string>
+    <string name="login_url_problem">"Ups! Pode que precises engadir un \"/\" o final da URL."</string>
+    <string name="prompt_login">"Nome de usuario"</string>
+    <string name="prompt_http_login">"Nome de usuario HTTP"</string>
+    <string name="label_share">"Compartir"</string>
+    <string name="readAll">"Ler todos"</string>
+    <string name="action_disconnect">"Desconectar"</string>
+    <string name="title_activity_settings">"Axustes"</string>
+    <string name="pref_header_general">"Xeral"</string>
+    <string name="add_source_hint_tags">"Etiqueta1, Etiqueta2, Etiqueta3"</string>
+    <string name="add_source_hint_url">"Ligazón"</string>
+    <string name="add_source_hint_name">"Nome"</string>
+    <string name="add_source">"Engadir unha fonte"</string>
+    <string name="add_source_save">"Gardar"</string>
+    <string name="wrong_infos">"Comprobar os teus detalles de novo."</string>
+    <string name="all_posts_not_read">"Non se leron todas as publicacións"</string>
+    <string name="all_posts_read">"Leronse todas as publicacións"</string>
+    <string name="cant_get_favs">"Non se poden obter os favoritos"</string>
+    <string name="cant_get_new_elements">"Non se poden recibir os novos artigos"</string>
+    <string name="cant_get_read">"Non se poden recibir os artigos lidos"</string>
+    <string name="nothing_here">"Non hai nada aquí"</string>
+    <string name="tab_new">"Novo"</string>
+    <string name="tab_read">"Todos"</string>
+    <string name="tab_favs">"Favoritos"</string>
+    <string name="action_about">"Acerca de"</string>
+    <string name="marked_as_read">"Elemento lido"</string>
+    <string name="marked_as_unread">"Elemento non lido"</string>
+    <string name="undo_string">"Desfacer"</string>
+    <string name="addStringNoUrl">"Accede pra engadir fontes."</string>
+    <string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
+    <string name="cant_create_source">"Non se pode crear unha fonte."</string>
+    <string name="cant_get_spouts">"Non se pode obter a lista de fontes."</string>
+    <string name="form_not_complete">"O formulario non está completo"</string>
+    <string name="pref_header_links">"Ligazóns"</string>
+    <string name="issue_tracker_link">"Rastrexador de Incidencias"</string>
+    <string name="issue_tracker_summary">"Informar dun erro ou pedir unha nova característica"</string>
+    <string name="warning_wrong_url">"AVISO"</string>
+    <string name="pref_switch_card_view_title">"Vista de tarxeta"</string>
+    <string name="cant_mark_favortie">"Non se pode marcar o artigo como favorito"</string>
+    <string name="cant_unmark_favortie">"Non se pode eliminar o elemento dos favoritos"</string>
+    <string name="share">"Compartir"</string>
+    <string name="rating_prompt_title">"Estás gozando coa aplicación?"</string>
+    <string name="rating_prompt_yes">"Si !"</string>
+    <string name="rating_prompt_no">"Non moito …"</string>
+    <string name="rating_prompt_feedback_title">"Podes dicirnos por qué?"</string>
+    <string name="rating_prompt_feedback_yes">"Dacordo!"</string>
+    <string name="rating_prompt_feedback_no">"Agora non."</string>
+    <string name="rating_prompt_rating_title">"Xenial! Podes puntuarnos na tenda?"</string>
+    <string name="rating_prompt_rating_yes">"Claro!"</string>
+    <string name="rating_prompt_rating_no">"Agora mesmo non."</string>
+    <string name="rating_prompt_thanks">"Grazas, a túa opinión axudanos a mellorar a aplicación!"</string>
+    <string name="switch_unread_count">"Mostrar o reconto de artigos non lidos cunha insignia na barra inferior."</string>
+    <string name="switch_unread_count_title">"Mostrar reconto de artigos non lidos"</string>
+    <string name="display_all_counts_title">"Mostrar reconto de artigos lidos e favoritos"</string>
+    <string name="text_wrong_url">"Semella que intentas usar unha URL non válida. Asegúrate de que é correcta, e se o problema persiste, ponte en contacto conmigo (a través da ligazón de contacto na tenda). Por favor ten en conta que a aplicación precisa que uses Selfoss. Non podes acceder a canles RSS se non o tes."</string>
+    <string name="pref_general_internal_browser_title">"Abrir ligazóns dentro da aplicación"</string>
+    <string name="pref_general_internal_browser_on">"Os artigos abriranse dentro da aplicación"</string>
+    <string name="pref_general_internal_browser_off">"Os artigos abriranse co teu navegador prederminado"</string>
+    <string name="prefer_article_viewer_title">"Usar o visor de artigos"</string>
+    <string name="prefer_article_viewer_on">"Usarase o visor de artigos en lugar do navegador interno"</string>
+    <string name="prefer_article_viewer_off">"Usarase o navegador interno en lugar do visor de artigos"</string>
+    <string name="pref_general_category_links">"Xestión de ligazóns"</string>
+    <string name="pref_general_category_displaying">"Visualización"</string>
+    <string name="pref_switch_card_view_on">"Os artigos amosaranse coma tarxetas"</string>
+    <string name="pref_switch_card_view_off">"Os artigos amosaranse coma unha lista"</string>
+    <string name="menu_home_refresh">"Actualizar o remoto"</string>
+    <string name="refresh_success_response">"O remoto foi actualizado, xa podes refrescar a lista de artigos"</string>
+    <string name="refresh_failer_message">"A actualización non funcionou, proba de novo máis tarde ou comproba os teus rexistros de Selfoss."</string>
+    <string name="refresh_in_progress">"Actualizazación en progreso"</string>
+    <string name="card_height_title">Tarxetas de altura completa</string>
+    <string name="card_height_on">A altura das tarxetas axustarase ao seu contido</string>
+    <string name="card_height_off">A altura das tarxetas será fixa</string>
+    <string name="source_code">Código fonte</string>
+    <string name="cant_mark_read">Non se pode marcar o artigo como lido</string>
+    <string name="cant_mark_unread">Non se pode marcar o artigo como non lido</string>
+    <string name="drawer_error_loading_tags">Produciuse un erro ao cargar as etiquetas…</string>
+    <string name="drawer_error_loading_sources">Produciuse un erro ao cargar as fontes…</string>
+    <string name="drawer_item_filters">Filtros</string>
+    <string name="drawer_action_clear">limpar</string>
+    <string name="drawer_item_tags">Etiquetas</string>
+    <string name="drawer_item_sources">Fontes</string>
+    <string name="drawer_action_edit">editar</string>
+    <string name="no_tags_loaded">Non se cargou ningunha etiqueta</string>
+    <string name="no_sources_loaded">Non se cargou ningunha fonte</string>
+    <string name="drawer_loading">Cargando…</string>
+    <string name="menu_home_search">Procurar</string>
+    <string name="can_delete_source">Non se puido eliminar a fonte…</string>
+    <string name="base_url_error">Houno unha incidencia ao tratar de comunicarse coa túa instancia de Selfoss. Se o problema persiste, prégolle que se poña en contacto conmigo.</string>
+    <string name="pref_header_theme">Temas</string>
+    <string name="default_theme">Predeterminado</string>
+    <string name="default_dark_theme">Predeterminado/Escuro</string>
+    <string name="pref_header_debug">Depuración</string>
+    <string name="self_hosted_cert_switch">Utilizas un certificado autoaloxado?</string>
+    <string name="self_signed_cert_warning">Por razóns de seguridade, por defecto non se permiten os certificados autoasinados. Activando isto, non serei responsable de calquera problema de seguridade que atopes.</string>
+    <string name="pref_selfoss_category">API de Selfoss</string>
+    <string name="pref_api_items_number_title">Número de elementos cargados</string>
+    <string name="pref_hidden_tags">Etiquetas ocultas</string>
+    <string name="summary_debug_identifier">Identificador de depuración</string>
+    <string name="unique_id_to_clipboard">Copiouse o identificador ao portapapeis</string>
+    <string name="display_header_drawer_summary">Amosar unha cabeceira coa URL da instancia de Selfoss no panel lateral.</string>
+    <string name="display_header_drawer_title">Cabeceira da conta</string>
+    <string name="pref_general_infinite_loading_title">Cargar máis artigos ao desprazarse</string>
+    <string name="translation">Traducción</string>
+    <string name="cant_open_invalid_url">A URL do elemento non é válida. Estou tratando de solucionar isto pra que a aplicación non falle.</string>
+    <string name="drawer_report_bug">Informar dun erro</string>
+    <string name="items_number_should_be_number">O número de elementos debería ser un enteiro.</string>
+    <string name="reader_action_more">Ler máis</string>
+    <string name="reader_action_open">Abrir no navegador</string>
+    <string name="reader_action_share">Compartir</string>
+    <string name="pref_switch_actions_pager_scroll_on">Marcar artigos como lidos cando se desliza o dedo dun a outro.</string>
+    <string name="add_to_favs_reader">Engadir a favoritos</string>
+    <string name="remove_to_favs_reader">Eliminar dos favoritos</string>
+    <string name="pref_content_reader_font_size">Tamaño da fonte do lector</string>
+    <string name="pref_header_viewer">Visor de artigos</string>
+    <string name="refresh_dialog_message">Isto actualizará a súa instancia de Selfoss.</string>
+    <string name="markall_dialog_message">Isto marcara todos os elementos como lidos.</string>
+    <string name="pref_switch_actions_pager_scroll">Marcar artigos como lidos ao deslizar co dedo cara os lados</string>
+    <string name="pref_switch_actions_pager_scroll_off">Non marcar artigos como lidos ao deslizar co dedo cara os lados.</string>
+    <string name="pref_acra_alwaysaccept">Enviar automáticamente informes de erros</string>
+    <string name="pref_acra_alwaysaccept_enabled">Enviaranse automáticamente os informes de erros</string>
+    <string name="pref_acra_alwaysaccept_disabled">Preguntarase cada vez pra enviar os informes de erros.</string>
+    <string name="pref_debug_crash_reports">Informes de erros</string>
+    <string name="pref_debug_debug_logs">Rexistro de depuración (Estes enviaranse automáticamente)</string>
+    <string name="acra_login">Habilitar o rexistro</string>
+    <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+    <string name="unmark">Marcar artículo como non lido</string>
+    <string name="pref_header_offline">Sen conexión e caché</string>
+    <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
+    <string name="pref_switch_items_caching_on">Os artigos gardaranse na memoria do dispositivo e estarán dispoñibles sen conexión.</string>
+    <string name="pref_switch_items_caching">Gardar elementos para uso sen conexión</string>
+    <string name="pref_switch_update_sources">Comproba novas fontes e etiquetas</string>
+    <string name="pref_switch_update_sources_summary">Deshabilita isto se o teu servidor está recibindo demasiadas peticións de base de datos.</string>
+    <string name="no_network_connectivity">Non conectado!</string>
+    <string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
+    <string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>
+    <string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
+    <string name="pref_switch_refresh_when_charging">Só refrescar cando o teléfono se está a cargar</string>
+    <string name="loading_notification_title">Cargando...</string>
+    <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
+    <string name="new_items_channel_sync">Notificación de actualizacións</string>
+    <string name="new_items_notification_title">Novo(s) elemento(s)!</string>
+    <string name="new_items_notification_text">%1$d novos elementos cargados.</string>
+    <string name="pref_switch_notify_new_items">Notificarme cando se sincronicen novos elementos.</string>
+    <string name="shortcut_offline">Sen conexión</string>
+    <string name="pref_api_timeout">Acabouse o tempo de espera da API</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Visor web non dispoñible. Desactivando o visor de artigos pra evitar futuros problemas. Cargaranse os artigos dende o navegador de agora en adiante.</string>
+    <string name="webview_dialog_issue_title">Problema co visor web</string>
+    <string name="reader_text_align_left">Aliñar á esquerda</string>
+    <string name="reader_text_align_justify">Xustificado</string>
+    <string name="settings_reader_font">Modo lector</string>
+    <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string>
+    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
+    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
+    <string name="remove_source">Eliminar fonte</string>
+</resources>
diff --git a/androidApp/src/main/res/values-in-rID/strings.xml b/androidApp/src/main/res/values-in-rID/strings.xml
new file mode 100644
index 0000000..0a397e7
--- /dev/null
+++ b/androidApp/src/main/res/values-in-rID/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Masuk"</string>
+    <string name="prompt_password">"Kata sandi"</string>
+    <string name="prompt_http_password">"Kata sandi HTTP"</string>
+    <string name="action_sign_in">"Mulai"</string>
+    <string name="error_invalid_password">"Kata sandinya tidak cukup panjang"</string>
+    <string name="error_field_required">"Kolom wajib diisi"</string>
+    <string name="prompt_url">"URL"</string>
+    <string name="withLoginSwitch">"Harus masuk?"</string>
+    <string name="withHttpLoginSwitch">"Otentikasi HTTP diperlukan?"</string>
+    <string name="login_url_problem">"Ups. Anda mungkin harus menambahkan \"/\" di akhir url."</string>
+    <string name="prompt_login">"Nama pengguna"</string>
+    <string name="prompt_http_login">"Nama pengguna HTTP"</string>
+    <string name="label_share">"Bagikan"</string>
+    <string name="readAll">"Baca semua"</string>
+    <string name="action_disconnect">"Putuskan sambungan"</string>
+    <string name="title_activity_settings">"Pengaturan"</string>
+    <string name="pref_header_general">"Umum"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag 3"</string>
+    <string name="add_source_hint_url">"Tautan"</string>
+    <string name="add_source_hint_name">"Nama"</string>
+    <string name="add_source">"Tambahkan sumber"</string>
+    <string name="add_source_save">"Simpan"</string>
+    <string name="wrong_infos">"Periksa kembali detail Anda."</string>
+    <string name="all_posts_not_read">"Semua pos belum dibaca"</string>
+    <string name="all_posts_read">"Semua pos sudah dibaca"</string>
+    <string name="cant_get_favs">"Gagal menuju favorit"</string>
+    <string name="cant_get_new_elements">"Gagal ke artikel baru"</string>
+    <string name="cant_get_read">"Gagal ke artikel yang dibaca"</string>
+    <string name="nothing_here">"Tidak ada di sini"</string>
+    <string name="tab_new">"Baru"</string>
+    <string name="tab_read">"Semua"</string>
+    <string name="tab_favs">"Favorit"</string>
+    <string name="action_about">"Tentang"</string>
+    <string name="marked_as_read">"Membaca item"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Urung"</string>
+    <string name="addStringNoUrl">"Masuk untuk menambah sumber."</string>
+    <string name="cant_get_sources">"Tidak bisa mendapatkan daftar sumber."</string>
+    <string name="cant_create_source">"Tidak dapat membuat sumber."</string>
+    <string name="cant_get_spouts">"Tidak bisa masuk ke daftar Spouts."</string>
+    <string name="form_not_complete">"Formulirnya belum selesai"</string>
+    <string name="pref_header_links">"Tautan"</string>
+    <string name="issue_tracker_link">"Pelacak Masalah"</string>
+    <string name="issue_tracker_summary">"Laporkan bug atau meminta fitur baru"</string>
+    <string name="warning_wrong_url">"PERINGATAN"</string>
+    <string name="pref_switch_card_view_title">"Tampilan Kartu"</string>
+    <string name="cant_mark_favortie">"Tidak dapat menandai artikel sebagai favorit"</string>
+    <string name="cant_unmark_favortie">"Tidak dapat melepas item dari favorit"</string>
+    <string name="share">"Bagikan"</string>
+    <string name="rating_prompt_title">"Suka aplikasi ini?"</string>
+    <string name="rating_prompt_yes">"Ya !"</string>
+    <string name="rating_prompt_no">"Tidak suka …"</string>
+    <string name="rating_prompt_feedback_title">"Bisakah Anda memberitahu kami alasannya?"</string>
+    <string name="rating_prompt_feedback_yes">"Oke !"</string>
+    <string name="rating_prompt_feedback_no">"Tidak sekarang."</string>
+    <string name="rating_prompt_rating_title">"Bagus! Dapatkah Anda memberi nilai kami di Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Tentu saja !"</string>
+    <string name="rating_prompt_rating_no">"Jangan sekarang."</string>
+    <string name="rating_prompt_thanks">"Terima kasih, umpan balik Anda membantu pengembangan aplikasi !"</string>
+    <string name="switch_unread_count">"Tampilkan jumlah item yang belum dibaca di bilah bawah."</string>
+    <string name="switch_unread_count_title">"Tampilkan jumlah item yang belum dibaca"</string>
+    <string name="display_all_counts_title">"Tampilkan jumlah item untuk favorit dan sudah dibaca"</string>
+    <string name="text_wrong_url">"Sepertinya Anda mencoba menggunakan URL yang tidak valid. Pastikan itu benar, jika masalah terus berlanjut, hubungi saya (melalui link kontak toko). Harap dicatat bahwa aplikasi ini mengharuskan Anda menggunakan Selfoss. Tanpa itu, Anda tidak bisa mengakses umpan RSS."</string>
+    <string name="pref_general_internal_browser_title">"Buka tautan dalam aplikasi"</string>
+    <string name="pref_general_internal_browser_on">"Artikel akan dibuka di dalam aplikasi"</string>
+    <string name="pref_general_internal_browser_off">"Artikel akan dibuka dalam peramban bawaan Anda"</string>
+    <string name="prefer_article_viewer_title">"Gunakan pratinjau artikel"</string>
+    <string name="prefer_article_viewer_on">"Lihat artikel di penampil daripada peramban internal"</string>
+    <string name="prefer_article_viewer_off">"Gunakan peramban internal dan bukan penampil artikel"</string>
+    <string name="pref_general_category_links">"Pengolahan tautan"</string>
+    <string name="pref_general_category_displaying">"Tampilan"</string>
+    <string name="pref_switch_card_view_on">"Artikel ini akan ditampilkan dalam bentuk kartu"</string>
+    <string name="pref_switch_card_view_off">"Artikel ini akan ditampilkan sebagai daftar"</string>
+    <string name="menu_home_refresh">"Pemutakhiran jarak jauh"</string>
+    <string name="refresh_success_response">"Selfoss sedang diperbarui, kini Anda bisa menyegarkan daftar artikel"</string>
+    <string name="refresh_failer_message">"Pembaruan tidak berhasil, coba lagi atau periksa log Selfoss."</string>
+    <string name="refresh_in_progress">"Dlam proses menyegarkan"</string>
+    <string name="card_height_title">Peta tinggi penuh</string>
+    <string name="card_height_on">Tinggi kartu akan disesuaikan dengan konten</string>
+    <string name="card_height_off">Ukuran kartu akan tetap</string>
+    <string name="source_code">Kode sumber</string>
+    <string name="cant_mark_read">Tidak dapat menandai artikel sebagai telah dibaca</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Kesalahan saat memuat tag…</string>
+    <string name="drawer_error_loading_sources">Kesalahan saat memuat sumber…</string>
+    <string name="drawer_item_filters">Filter</string>
+    <string name="drawer_action_clear">kosongkan</string>
+    <string name="drawer_item_tags">Tag</string>
+    <string name="drawer_item_sources">Sumber</string>
+    <string name="drawer_action_edit">suntung</string>
+    <string name="no_tags_loaded">Tidak ada tag yang dimuat</string>
+    <string name="no_sources_loaded">Tak ada sumber yang dimuat</string>
+    <string name="drawer_loading">Memuat …</string>
+    <string name="menu_home_search">Cari</string>
+    <string name="can_delete_source">Tidak dapat menghapus sumber…</string>
+    <string name="base_url_error">Ada masalah saat berkomunikasi dengan Selfoss Anda. Jika masalah berlanjut, tolong hubungi saya.</string>
+    <string name="pref_header_theme">Tema</string>
+    <string name="default_theme">Bawaan</string>
+    <string name="default_dark_theme">Bawaan/Gelap</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Sertifikat yang ditandatangani sendiri?</string>
+    <string name="self_signed_cert_warning">Untuk alasan keamanan, sertifikat yang ditandatangani sendiri tidak didukung secara bawaan. Jika Anda mengaktifkan item ini, saya tidak akan bertanggung jawab atas masalah keamanan yang Anda hadapi.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Item nomor dimuat</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Identifikasi debug</string>
+    <string name="unique_id_to_clipboard">Salin pengenal ke papan klip Anda</string>
+    <string name="display_header_drawer_summary">Kop dengan alamat link Selfoss ditampilkan di laci lateral.</string>
+    <string name="display_header_drawer_title">Kop akun</string>
+    <string name="pref_general_infinite_loading_title">Muat lebih banyak artikel saat membalik halaman</string>
+    <string name="translation">Terjemahan</string>
+    <string name="cant_open_invalid_url">Alamat tautan proyek tidak valid. Saya mencoba memecahkan masalah ini untuk menghindari aplikasi berhenti.</string>
+    <string name="drawer_report_bug">Laporkan bug</string>
+    <string name="items_number_should_be_number">Jumlah item harus berupa bilangan bulat.</string>
+    <string name="reader_action_more">Baca lebih lanjut</string>
+    <string name="reader_action_open">Buka di peramban</string>
+    <string name="reader_action_share">Bagikan</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-it-rIT/strings.xml b/androidApp/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000..cd80ec1
--- /dev/null
+++ b/androidApp/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Lettore RSS per Selfoss"</string>
+    <string name="title_activity_login">"Accedi"</string>
+    <string name="prompt_password">"Password"</string>
+    <string name="prompt_http_password">"Password HTTP"</string>
+    <string name="action_sign_in">"Vai"</string>
+    <string name="error_invalid_password">"La password non è sufficientemente lunga"</string>
+    <string name="error_field_required">"Campo obbligatorio"</string>
+    <string name="prompt_url">"URL"</string>
+    <string name="withLoginSwitch">"È richiesto l'accesso?"</string>
+    <string name="withHttpLoginSwitch">"Accesso HTTP necessario?"</string>
+    <string name="login_url_problem">"Oops. Potrebbe essere necessario aggiungere un \"/\" alla fine dell'url."</string>
+    <string name="prompt_login">"Nome utente"</string>
+    <string name="prompt_http_login">"Nome utente HTTP"</string>
+    <string name="label_share">"Condividi"</string>
+    <string name="readAll">"Segna tutte come lette"</string>
+    <string name="action_disconnect">"Scollegati"</string>
+    <string name="title_activity_settings">"Impostazioni"</string>
+    <string name="pref_header_general">"Generali"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Nome"</string>
+    <string name="add_source">"Aggiungi una fonte"</string>
+    <string name="add_source_save">"Salva"</string>
+    <string name="wrong_infos">"Controlla nuovamente i dati."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"Tutti i messaggi sono stati letti"</string>
+    <string name="cant_get_favs">"Non è possibile ottenere i preferiti"</string>
+    <string name="cant_get_new_elements">"Non è possibile ottenere nuovi articoli"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Non c'è niente qui"</string>
+    <string name="tab_new">"Nuovi"</string>
+    <string name="tab_read">"Tutti"</string>
+    <string name="tab_favs">"Preferiti"</string>
+    <string name="action_about">"Informazioni"</string>
+    <string name="marked_as_read">"Articolo letto"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Annulla"</string>
+    <string name="addStringNoUrl">"Autenticati per aggiungere fonti."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"Il modulo non è completo"</string>
+    <string name="pref_header_links">"Links"</string>
+    <string name="issue_tracker_link">"Traccia problemi"</string>
+    <string name="issue_tracker_summary">"Segnalare un bug o richiedere una nuova funzionalità"</string>
+    <string name="warning_wrong_url">"ATTENZIONE"</string>
+    <string name="pref_switch_card_view_title">"Visualizzazione a schede"</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>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Schede a piena altezza</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Codice sorgente</string>
+    <string name="cant_mark_read">Impossibile contrassegnare l\'articolo come già letto</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Errore nel caricamento dei tag…</string>
+    <string name="drawer_error_loading_sources">Errore nel caricamento delle fonti…</string>
+    <string name="drawer_item_filters">Filtri</string>
+    <string name="drawer_action_clear">cancella</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Fonti</string>
+    <string name="drawer_action_edit">modifica</string>
+    <string name="no_tags_loaded">Nessun tag caricato</string>
+    <string name="no_sources_loaded">No sources loaded</string>
+    <string name="drawer_loading">Caricamento…</string>
+    <string name="menu_home_search">Cerca</string>
+    <string name="can_delete_source">Non è possibile eliminare la fonte…</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">Temi</string>
+    <string name="default_theme">Predefinito</string>
+    <string name="default_dark_theme">Predefinito (Scuro)</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Api di Selfoss</string>
+    <string name="pref_api_items_number_title">Numero di elementi caricati</string>
+    <string name="pref_hidden_tags">Tag nascosti</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
+    <string name="translation">Traduzioni</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">Segnala un bug</string>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Segna come non letto</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-ko-rKR/strings.xml b/androidApp/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000..efe4f41
--- /dev/null
+++ b/androidApp/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"로그인"</string>
+    <string name="prompt_password">"비밀번호"</string>
+    <string name="prompt_http_password">"HTTP 암호"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"패스워드가 짧습니다."</string>
+    <string name="error_field_required">"필수 항목"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"로그인이 필요합니까?"</string>
+    <string name="withHttpLoginSwitch">"HTTP 로그인이 필요 합니까?"</string>
+    <string name="login_url_problem">"죄송합니다. Url의 끝에 \"/\"를 추가할 필요가 있습니다."</string>
+    <string name="prompt_login">"사용자 이름"</string>
+    <string name="prompt_http_login">"HTTP 사용자 이름"</string>
+    <string name="label_share">"공유"</string>
+    <string name="readAll">"모두 읽기"</string>
+    <string name="action_disconnect">"연결 해제"</string>
+    <string name="title_activity_settings">"설정"</string>
+    <string name="pref_header_general">"일반"</string>
+    <string name="add_source_hint_tags">"태그1, 태그2, 태그3"</string>
+    <string name="add_source_hint_url">"링크"</string>
+    <string name="add_source_hint_name">"이름"</string>
+    <string name="add_source">"소스 추가"</string>
+    <string name="add_source_save">"저장"</string>
+    <string name="wrong_infos">"세부 정보를 다시 확인하세요."</string>
+    <string name="all_posts_not_read">"모든 게시물을 읽지 않았습니다."</string>
+    <string name="all_posts_read">"모든 게시물을 읽었습니다."</string>
+    <string name="cant_get_favs">"즐겨찾기를 가져올 수 없습니다."</string>
+    <string name="cant_get_new_elements">"새로운 기사를 가져올 수 없습니다."</string>
+    <string name="cant_get_read">"읽은 기사를 가져올 수 없습니다."</string>
+    <string name="nothing_here">"비어있음"</string>
+    <string name="tab_new">"새로운"</string>
+    <string name="tab_read">"전체"</string>
+    <string name="tab_favs">"즐겨찾기"</string>
+    <string name="action_about">"정보"</string>
+    <string name="marked_as_read">"항목 읽기"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"실행 취소"</string>
+    <string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
+    <string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
+    <string name="cant_create_source">"소스를 만들 수 없습니다."</string>
+    <string name="cant_get_spouts">"Spouts 목록을 가져올 수 없습니다."</string>
+    <string name="form_not_complete">"양식이 완료되지 않았습니다."</string>
+    <string name="pref_header_links">"링크"</string>
+    <string name="issue_tracker_link">"이슈 트래커"</string>
+    <string name="issue_tracker_summary">"버그를 보고 하거나 새기능에 대해 요청하세요."</string>
+    <string name="warning_wrong_url">"경고"</string>
+    <string name="pref_switch_card_view_title">"카드 형식 보기"</string>
+    <string name="cant_mark_favortie">"좋아하는 문서를 마크할 수 없습니다."</string>
+    <string name="cant_unmark_favortie">"좋아하는 항목에서 제거할 수 없습니다."</string>
+    <string name="share">"공유"</string>
+    <string name="rating_prompt_title">"이 앱에 만족하십니까?"</string>
+    <string name="rating_prompt_yes">"예!"</string>
+    <string name="rating_prompt_no">"설마..."</string>
+    <string name="rating_prompt_feedback_title">"이유를 우리에게 말해줄 수 있습니까?"</string>
+    <string name="rating_prompt_feedback_yes">"OK!"</string>
+    <string name="rating_prompt_feedback_no">"나중에"</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <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="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>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">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>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-nl-rNL/strings.xml b/androidApp/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000..60b37ae
--- /dev/null
+++ b/androidApp/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Selfoss Reader"</string>
+    <string name="title_activity_login">"Inloggen"</string>
+    <string name="prompt_password">"Wachtwoord"</string>
+    <string name="prompt_http_password">"HTTP Wachtwoord"</string>
+    <string name="action_sign_in">"Inloggen"</string>
+    <string name="error_invalid_password">"Wachtwoord niet lang genoeg"</string>
+    <string name="error_field_required">"Dit veld is verplicht"</string>
+    <string name="prompt_url">"Selfoss server"</string>
+    <string name="withLoginSwitch">"Authenticatie vereist?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Authenticatie vereist?"</string>
+    <string name="login_url_problem">"Oeps, ben je soms de \"/\" vergeten aan het eind?"</string>
+    <string name="prompt_login">"Gebruikersnaam"</string>
+    <string name="prompt_http_login">"HTTP Gebruikersnaam"</string>
+    <string name="label_share">"Delen"</string>
+    <string name="readAll">"Alles lezen"</string>
+    <string name="action_disconnect">"Verbinding verbreken"</string>
+    <string name="title_activity_settings">"Instellingen"</string>
+    <string name="pref_header_general">"Algemeen"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Naam"</string>
+    <string name="add_source">"Bron toevoegen"</string>
+    <string name="add_source_save">"Opslaan"</string>
+    <string name="wrong_infos">"Controleer de gegevens nogmaals."</string>
+    <string name="all_posts_not_read">"Fout bij markeren als gelezen"</string>
+    <string name="all_posts_read">"Alle artikelen gemarkeerd als gelezen"</string>
+    <string name="cant_get_favs">"Ophalen favorieten mislukt"</string>
+    <string name="cant_get_new_elements">"Ophalen nieuwe artikelen mislukt"</string>
+    <string name="cant_get_read">"Ophalen reeds gelezen artikelen mislukt"</string>
+    <string name="nothing_here">"Niets gevonden"</string>
+    <string name="tab_new">"Nieuw"</string>
+    <string name="tab_read">"Alle"</string>
+    <string name="tab_favs">"Favorieten"</string>
+    <string name="action_about">"Over"</string>
+    <string name="marked_as_read">"Artikel gelezen"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Ongedaan maken"</string>
+    <string name="addStringNoUrl">"Login om bronnen toe te voegen"</string>
+    <string name="cant_get_sources">"Kan de lijst met bronnen niet ophalen"</string>
+    <string name="cant_create_source">"Kan bron niet creëeren"</string>
+    <string name="cant_get_spouts">"Ophalen spouts mislukt"</string>
+    <string name="form_not_complete">"Formulier is niet volledig ingevuld"</string>
+    <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_wrong_url">"WAARSCHUWING"</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>
+    <string name="rating_prompt_title">"Bevalt deze app?"</string>
+    <string name="rating_prompt_yes">"Ja!"</string>
+    <string name="rating_prompt_no">"Niet echt…"</string>
+    <string name="rating_prompt_feedback_title">"Kun je ons vertellen waarom?"</string>
+    <string name="rating_prompt_feedback_yes">"OK!"</string>
+    <string name="rating_prompt_feedback_no">"Niet nu."</string>
+    <string name="rating_prompt_rating_title">"Fantastisch! Wil je een review achter laten in de Store?"</string>
+    <string name="rating_prompt_rating_yes">"Vanzelfsprekend"</string>
+    <string name="rating_prompt_rating_no">"Niet op dit moment"</string>
+    <string name="rating_prompt_thanks">"Bedankt, jouw feedback helpt ons de app te verbeteren"</string>
+    <string name="switch_unread_count">"Geef het aantal ongelezen artikelen weer in de balk onderaan"</string>
+    <string name="switch_unread_count_title">"Geef aantal ongelezen weer"</string>
+    <string name="display_all_counts_title">"Geef aantal weer bij favorieten en gelezen"</string>
+    <string name="text_wrong_url">"De gebruikte link lijkt onjuist. Controleer deze. Mocht het probleem blijven, neem dan contact met me op (via de contact link in de store). Om deze app te kunnen gebruiken heb je Selfoss nodig."</string>
+    <string name="pref_general_internal_browser_title">"Links opnemen in interne browser"</string>
+    <string name="pref_general_internal_browser_on">"Artikelen worden in de interne browser geopend"</string>
+    <string name="pref_general_internal_browser_off">"Artikelen worden geopend in de standaard browser"</string>
+    <string name="prefer_article_viewer_title">"Gebruik artikel viewer"</string>
+    <string name="prefer_article_viewer_on">"Artikelen in viewer weergeven in plaats van de interne browser"</string>
+    <string name="prefer_article_viewer_off">"Artikelen in interne browser weergeven in plaats van viewer"</string>
+    <string name="pref_general_category_links">"Links"</string>
+    <string name="pref_general_category_displaying">"Weergave"</string>
+    <string name="pref_switch_card_view_on">"De artikelen worden als kaarten weergegeven"</string>
+    <string name="pref_switch_card_view_off">"De artikelen worden als lijst weergegeven"</string>
+    <string name="menu_home_refresh">"Selfoss verversen"</string>
+    <string name="refresh_success_response">"Selfoss update uitgevoerd. Je kunt nu de artikellijst verversen"</string>
+    <string name="refresh_failer_message">"Selfoss update mislukt. Probeer het later nog eens of controleer de logbestanden."</string>
+    <string name="refresh_in_progress">"Bezig met verversen"</string>
+    <string name="card_height_title">Volledige hoogte kaarten</string>
+    <string name="card_height_on">Hoogte aanpassen aan de hand van kaartinhoud</string>
+    <string name="card_height_off">Vaste hoogte</string>
+    <string name="source_code">Broncode</string>
+    <string name="cant_mark_read">Impossible de marquer l\'article comme lu</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Fout bij het laden van tags…</string>
+    <string name="drawer_error_loading_sources">Fout bij laden van bronnen…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">wissen</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Bronnen</string>
+    <string name="drawer_action_edit">bewerken</string>
+    <string name="no_tags_loaded">Geen tags geladen</string>
+    <string name="no_sources_loaded">Geen bronnen geladen</string>
+    <string name="drawer_loading">Bezig met laden …</string>
+    <string name="menu_home_search">Zoeken</string>
+    <string name="can_delete_source">Kan de bron niet verwijderen…</string>
+    <string name="base_url_error">Er was een probleem bij het communiceren met uw Selfoss Instance. Als het probleem blijft, neem dan contact met mij op.</string>
+    <string name="pref_header_theme">Thema \'s</string>
+    <string name="default_theme">Standaard</string>
+    <string name="default_dark_theme">Standaard/Donker</string>
+    <string name="pref_header_debug">Fout opsporen</string>
+    <string name="self_hosted_cert_switch">Gebruik een zelf gehost certificaat?</string>
+    <string name="self_signed_cert_warning">Vanwege veiligheidsredenen worden zelfondertekende certificaten niet standaard ondersteund. Door dit te activeren, ben ik niet verantwoordelijk voor beveiligingsproblemen die u tegenkomt.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Geladen items nummer</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">ID voor foutopsporing</string>
+    <string name="unique_id_to_clipboard">ID naar uw klembord gekopieerd</string>
+    <string name="display_header_drawer_summary">Laat een koptekst weergeven met de url van de selfoss instantie in de zijlade.</string>
+    <string name="display_header_drawer_title">Account titel</string>
+    <string name="pref_general_infinite_loading_title">Laad meer artikelen door te bladeren</string>
+    <string name="translation">Vertaling</string>
+    <string name="cant_open_invalid_url">De URL is ongeldig. Ik probeer dit probleem op te lossen, zodat de toepassing niet wordt afgesloten.</string>
+    <string name="drawer_report_bug">Een fout melden</string>
+    <string name="items_number_should_be_number">Het aantal items moet een geheel getal zijn.</string>
+    <string name="reader_action_more">Lees meer</string>
+    <string name="reader_action_open">Openen in browser</string>
+    <string name="reader_action_share">Delen</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-pt-rBR/strings.xml b/androidApp/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..f6c6ede
--- /dev/null
+++ b/androidApp/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Entrar"</string>
+    <string name="prompt_password">"Senha"</string>
+    <string name="prompt_http_password">"Senha HTTP"</string>
+    <string name="action_sign_in">"Vamos lá"</string>
+    <string name="error_invalid_password">"Senha muito pequena"</string>
+    <string name="error_field_required">"Campo obrigatório"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"É necessário o login ?"</string>
+    <string name="withHttpLoginSwitch">"É necessário o login HTTP ?"</string>
+    <string name="login_url_problem">"Oops. Talvez você precise adicionar uma \"/\" no final da url."</string>
+    <string name="prompt_login">"Usuário"</string>
+    <string name="prompt_http_login">"Usuário HTTP"</string>
+    <string name="label_share">"Compartilhar"</string>
+    <string name="readAll">"Ler todos"</string>
+    <string name="action_disconnect">"Desconectar"</string>
+    <string name="title_activity_settings">"Configurações"</string>
+    <string name="pref_header_general">"Geral"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Nome"</string>
+    <string name="add_source">"Adicionar uma fonte"</string>
+    <string name="add_source_save">"Salvar"</string>
+    <string name="wrong_infos">"Verifique os detalhes novamente."</string>
+    <string name="all_posts_not_read">"Nenhum post foi lido"</string>
+    <string name="all_posts_read">"Todos os posts foram lidos"</string>
+    <string name="cant_get_favs">"Não consigo obter os favoritos"</string>
+    <string name="cant_get_new_elements">"Não consigo obter novos artigos"</string>
+    <string name="cant_get_read">"Não consigo ler artigos"</string>
+    <string name="nothing_here">"Nada aqui"</string>
+    <string name="tab_new">"Novo"</string>
+    <string name="tab_read">"Todos"</string>
+    <string name="tab_favs">"Favoritos"</string>
+    <string name="action_about">"Sobre"</string>
+    <string name="marked_as_read">"Item lido"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Desfazer"</string>
+    <string name="addStringNoUrl">"Faça login para adicionar fontes."</string>
+    <string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
+    <string name="cant_create_source">"Não é possível criar fonte."</string>
+    <string name="cant_get_spouts">"Não é possível obter a lista de spouts."</string>
+    <string name="form_not_complete">"O formulário não está completo"</string>
+    <string name="pref_header_links">"Links"</string>
+    <string name="issue_tracker_link">"Rastreador de problemas"</string>
+    <string name="issue_tracker_summary">"Informe um erro ou peça um novo recurso"</string>
+    <string name="warning_wrong_url">"ATENÇÃO"</string>
+    <string name="pref_switch_card_view_title">"Card View"</string>
+    <string name="cant_mark_favortie">"Não é possível marcar o artigo como favorito"</string>
+    <string name="cant_unmark_favortie">"Não é possível remover o item do favorito"</string>
+    <string name="share">"Compartilhar"</string>
+    <string name="rating_prompt_title">"Aproveitando o app ?"</string>
+    <string name="rating_prompt_yes">"Sim !"</string>
+    <string name="rating_prompt_no">"Na verdade não …"</string>
+    <string name="rating_prompt_feedback_title">"Você pode nos dizer o porquê ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Não agora."</string>
+    <string name="rating_prompt_rating_title">"Ótimo ! Você pode nos avaliar na loja ?"</string>
+    <string name="rating_prompt_rating_yes">"Com certeza !"</string>
+    <string name="rating_prompt_rating_no">"Não agora."</string>
+    <string name="rating_prompt_thanks">"Obrigado, seu comentário ajuda a melhorar o app !"</string>
+    <string name="switch_unread_count">"Exibir a contagem de artigos não lidos como um badge na barra inferior."</string>
+    <string name="switch_unread_count_title">"Exibir contagem de artigos não lidos"</string>
+    <string name="display_all_counts_title">"Exibir contagem de lidos e favoritos"</string>
+    <string name="text_wrong_url">"Parece que você está tentando utilizar uma URL inválida. Certifique-se de que está correto, e se o problema persistir, entre em contato comigo (através do link de contato da loja). Por favor, note que o aplicativo precisa que você esteja usando o Selfoss. Você não pode acessar feeds RSS sem ele."</string>
+    <string name="pref_general_internal_browser_title">"Abrir links dentro do aplicativo"</string>
+    <string name="pref_general_internal_browser_on">"Os artigos serão abertos dentro do aplicativo"</string>
+    <string name="pref_general_internal_browser_off">"Os artigos serão abertos com seu navegador padrão"</string>
+    <string name="prefer_article_viewer_title">"Use o visualizador de artigos"</string>
+    <string name="prefer_article_viewer_on">"Usará o visualizador de artigos em vez do navegador"</string>
+    <string name="prefer_article_viewer_off">"Utilizará o navegador em vez do visualizador de artigos"</string>
+    <string name="pref_general_category_links">"Manipulação de links"</string>
+    <string name="pref_general_category_displaying">"Mostrando"</string>
+    <string name="pref_switch_card_view_on">"Os artigos serão exibidos no formato de cards"</string>
+    <string name="pref_switch_card_view_off">"Os artigos serão exibidos em lista"</string>
+    <string name="menu_home_refresh">"Atualizar controle remoto"</string>
+    <string name="refresh_success_response">"O controle remoto foi atualizado, agora você pode recarregar a lista de artigos"</string>
+    <string name="refresh_failer_message">"A atualização não funcionou, tente novamente mais tarde ou verifique seus logs do Selfoss."</string>
+    <string name="refresh_in_progress">"Atualização em progresso"</string>
+    <string name="card_height_title">Cards com altura total</string>
+    <string name="card_height_on">Cards com altura ajustáveis de acordo com o conteúdo</string>
+    <string name="card_height_off">Cards com altura de tamanho fixo</string>
+    <string name="source_code">Código fonte</string>
+    <string name="cant_mark_read">Não é possível marcar o artigo como lido</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Erro ao carregar as tags…</string>
+    <string name="drawer_error_loading_sources">Erro ao carregar as fontes…</string>
+    <string name="drawer_item_filters">Filtros</string>
+    <string name="drawer_action_clear">limpar</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Fontes</string>
+    <string name="drawer_action_edit">editar</string>
+    <string name="no_tags_loaded">Nenhuma tag carregada</string>
+    <string name="no_sources_loaded">Nenhuma fonte carregada</string>
+    <string name="drawer_loading">Carregando …</string>
+    <string name="menu_home_search">Procurar</string>
+    <string name="can_delete_source">Não foi possível apagar a fonte…</string>
+    <string name="base_url_error">Houve um problema ao tentar se comunicar com o seu Selfoss. Se o problema persistir, entre em contato comigo.</string>
+    <string name="pref_header_theme">Temas</string>
+    <string name="default_theme">Padrão</string>
+    <string name="default_dark_theme">Padrão/Escuro</string>
+    <string name="pref_header_debug">Depurar</string>
+    <string name="self_hosted_cert_switch">Usando um certificado autônomo ?</string>
+    <string name="self_signed_cert_warning">Por motivos de segurança, certificados autônomos não são suportados por padrão. Ao ativar, não serei responsável por qualquer problema de segurança que você encontre.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Identificador de depuração</string>
+    <string name="unique_id_to_clipboard">Identificador copiado para a área de transferência</string>
+    <string name="display_header_drawer_summary">Exibir um cabeçalho com o URL da instância do Selfoss na barra lateral.</string>
+    <string name="display_header_drawer_title">Cabeçalho da conta</string>
+    <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
+    <string name="translation">Traduções</string>
+    <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
+    <string name="drawer_report_bug">Reportar erro</string>
+    <string name="items_number_should_be_number">O número dos itens deve ser um número inteiro.</string>
+    <string name="reader_action_more">Leia mais</string>
+    <string name="reader_action_open">Abrir no navegador</string>
+    <string name="reader_action_share">Compartilhar</string>
+    <string name="pref_switch_actions_pager_scroll_on">Se esta configuração estiver ativada, os artigos serão marcados como lidos ao deslizar para a esquerda e para a direita no leitor do artigo.</string>
+    <string name="add_to_favs_reader">Adicionar aos favoritos</string>
+    <string name="remove_to_favs_reader">Remover dos favoritos</string>
+    <string name="pref_content_reader_font_size">Tamanho da fonte do conteúdo do leitor de artigos</string>
+    <string name="pref_header_viewer">Visualizador de artigos</string>
+    <string name="refresh_dialog_message">Isso atualizará sua instância do Selfoss.</string>
+    <string name="markall_dialog_message">Isso marcará todos os itens como lidos.</string>
+    <string name="pref_switch_actions_pager_scroll">Marcar Como Lida ao Abrir</string>
+    <string name="pref_switch_actions_pager_scroll_off">Não marca artigos como lido quando abrir.</string>
+    <string name="pref_acra_alwaysaccept">Envia relatórios de erros automaticamente</string>
+    <string name="pref_acra_alwaysaccept_enabled">Enviar relatórios de erro automaticamente</string>
+    <string name="pref_acra_alwaysaccept_disabled">Perguntar sempre, ao enviar relatórios de erro.</string>
+    <string name="pref_debug_crash_reports">Relatório de erro</string>
+    <string name="pref_debug_debug_logs">Log de depuração (Serão enviados sem uma caixa de diálogo)</string>
+    <string name="acra_login">Ativar registro de erros</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-pt-rPT/strings.xml b/androidApp/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..ae411ad
--- /dev/null
+++ b/androidApp/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Leitor para Selfoss"</string>
+    <string name="title_activity_login">"Iniciar sessão"</string>
+    <string name="prompt_password">"Palavra passe"</string>
+    <string name="prompt_http_password">"Senha HTTP"</string>
+    <string name="action_sign_in">"Ir"</string>
+    <string name="error_invalid_password">"Senha não é longa o suficiente"</string>
+    <string name="error_field_required">"Campo obrigatório"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"É necessário fazer login?"</string>
+    <string name="withHttpLoginSwitch">"É necessário fazer login on HTTP?"</string>
+    <string name="login_url_problem">"Uups. Você pode precisar adicionar uma \"/\" no final da url."</string>
+    <string name="prompt_login">"Nome do usuário"</string>
+    <string name="prompt_http_login">"Nome de utilizador HTTP"</string>
+    <string name="label_share">"Compartilhar"</string>
+    <string name="readAll">"Ler tudo"</string>
+    <string name="action_disconnect">"Desligar"</string>
+    <string name="title_activity_settings">"Configurações"</string>
+    <string name="pref_header_general">"Geral"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Nome"</string>
+    <string name="add_source">"Adicionar uma fonte"</string>
+    <string name="add_source_save">"Salvar"</string>
+    <string name="wrong_infos">"Verifique seus dados novamente."</string>
+    <string name="all_posts_not_read">"Todas as postagens não foram lidas"</string>
+    <string name="all_posts_read">"Todas as postagens foram lidas"</string>
+    <string name="cant_get_favs">"Não é possível obter favoritos"</string>
+    <string name="cant_get_new_elements">"Não é possível obter novos artigos"</string>
+    <string name="cant_get_read">"Não é possível ler artigos"</string>
+    <string name="nothing_here">"Nada aqui"</string>
+    <string name="tab_new">"Novo"</string>
+    <string name="tab_read">"Tudo"</string>
+    <string name="tab_favs">"Favoritos"</string>
+    <string name="action_about">"Sobre"</string>
+    <string name="marked_as_read">"Item lido"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Desfazer"</string>
+    <string name="addStringNoUrl">"Logar para adicionar fontes."</string>
+    <string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
+    <string name="cant_create_source">"Não é possível criar a fonte."</string>
+    <string name="cant_get_spouts">"Não é possível obter a lista de bicos."</string>
+    <string name="form_not_complete">"O formulário não está completo"</string>
+    <string name="pref_header_links">"Links"</string>
+    <string name="issue_tracker_link">"Rastreador de problemas"</string>
+    <string name="issue_tracker_summary">"Relatar um bug ou pedir um novo recurso"</string>
+    <string name="warning_wrong_url">"AVISO"</string>
+    <string name="pref_switch_card_view_title">"Vista de cartão"</string>
+    <string name="cant_mark_favortie">"Não é possível marcar o artigo como favorito"</string>
+    <string name="cant_unmark_favortie">"Não pode remover o item do favorito"</string>
+    <string name="share">"Compartilhar"</string>
+    <string name="rating_prompt_title">"Gosta da aplicação?"</string>
+    <string name="rating_prompt_yes">"Sim!"</string>
+    <string name="rating_prompt_no">"Não realmente…"</string>
+    <string name="rating_prompt_feedback_title">"Pode nos dizer por que?"</string>
+    <string name="rating_prompt_feedback_yes">"Okey!"</string>
+    <string name="rating_prompt_feedback_no">"Agora não."</string>
+    <string name="rating_prompt_rating_title">"Legal! Você pode classificar-na loja?"</string>
+    <string name="rating_prompt_rating_yes">"Claro!"</string>
+    <string name="rating_prompt_rating_no">"Agora não."</string>
+    <string name="rating_prompt_thanks">"Obrigado, seu feedback ajudar a realçar o app!"</string>
+    <string name="switch_unread_count">"Exibir a contagem não lida como um emblema para a barra inferior."</string>
+    <string name="switch_unread_count_title">"Exibir a contagem não lida"</string>
+    <string name="display_all_counts_title">"Exibir a contagem para o favorito e leitura"</string>
+    <string name="text_wrong_url">"Você parece estar tentando usar um URL inválido. Certifique-se de que está correto, e se o problema persistir, entre em contato comigo (através do link de contato da loja). Por favor, note que o aplicativo precisa que você esteja usando o Selfoss. Você não pode acessar feeds RSS sem ele."</string>
+    <string name="pref_general_internal_browser_title">"Abrir links dentro do app"</string>
+    <string name="pref_general_internal_browser_on">"Artigos serão aberto dentro do aplicativo"</string>
+    <string name="pref_general_internal_browser_off">"Artigos serão aberto com o seu navegador padrão"</string>
+    <string name="prefer_article_viewer_title">"Use o Visualizador de artigo"</string>
+    <string name="prefer_article_viewer_on">"Vai usar o Visualizador de artigo em vez do navegador interno"</string>
+    <string name="prefer_article_viewer_off">"Vai usar o navegador interno em vez do Visualizador de artigo"</string>
+    <string name="pref_general_category_links">"Manipulação de ligações"</string>
+    <string name="pref_general_category_displaying">"Mostrando"</string>
+    <string name="pref_switch_card_view_on">"Os artigos serão exibidos como cartões"</string>
+    <string name="pref_switch_card_view_off">"Os artigos serão exibidos como lista"</string>
+    <string name="menu_home_refresh">"Atualização remota"</string>
+    <string name="refresh_success_response">"O remoto é atualizado, você agora pode recarregar a lista de artigos"</string>
+    <string name="refresh_failer_message">"A atualização não funcionar, tente novamente mais tarde ou verifique seus logs de selfoss."</string>
+    <string name="refresh_in_progress">"Atualização em curso"</string>
+    <string name="card_height_title">Cartões de altura total</string>
+    <string name="card_height_on">Altura de cartas irá ajustar ao seu conteúdo</string>
+    <string name="card_height_off">Altura do cartão será corrigida</string>
+    <string name="source_code">Código fonte</string>
+    <string name="cant_mark_read">Não pode marcar o artigo como lido</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Erro ao carregar etiquetas…</string>
+    <string name="drawer_error_loading_sources">Erro ao carregar fontes…</string>
+    <string name="drawer_item_filters">Filtros</string>
+    <string name="drawer_action_clear">limpar</string>
+    <string name="drawer_item_tags">Etiquetas</string>
+    <string name="drawer_item_sources">Fontes</string>
+    <string name="drawer_action_edit">editar</string>
+    <string name="no_tags_loaded">Não tags carregado</string>
+    <string name="no_sources_loaded">Não há fontes carregadas</string>
+    <string name="drawer_loading">A carregar…</string>
+    <string name="menu_home_search">Buscar</string>
+    <string name="can_delete_source">Não é possível excluir a fonte…</string>
+    <string name="base_url_error">Houve um problema ao tentar se comunicar com sua instância de Selfoss. Se o problema persistir, por favor entre em contato comigo.</string>
+    <string name="pref_header_theme">Temas</string>
+    <string name="default_theme">Predefinição</string>
+    <string name="default_dark_theme">Padrão/escuro</string>
+    <string name="pref_header_debug">Depurar</string>
+    <string name="self_hosted_cert_switch">Usando um certificado hospedado?</string>
+    <string name="self_signed_cert_warning">Devido a razões de segurança, auto certificados auto-assinados não são suportados por padrão. Ao activar isto, eu não vou ser responsável de qualquer problema de segurança que você encontrar.</string>
+    <string name="pref_selfoss_category">Api de Selfoss</string>
+    <string name="pref_api_items_number_title">Número de itens carregados</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Depurar o identificador</string>
+    <string name="unique_id_to_clipboard">Identificador de copiados para a área de transferência</string>
+    <string name="display_header_drawer_summary">Exibir um cabeçalho com o url de instância de selfoss na gaveta lateral.</string>
+    <string name="display_header_drawer_title">Cabeçalho de conta</string>
+    <string name="pref_general_infinite_loading_title">Carregar mais artigos no pergaminho</string>
+    <string name="translation">Tradução</string>
+    <string name="cant_open_invalid_url">A url do item é inválido. Eu estou olhando para resolver esta questão, para que o app não vai falhar.</string>
+    <string name="drawer_report_bug">Reportar falha</string>
+    <string name="items_number_should_be_number">O número de itens deve ser um número inteiro.</string>
+    <string name="reader_action_more">Ler mais</string>
+    <string name="reader_action_open">Abrir no browser</string>
+    <string name="reader_action_share">Compartilhar</string>
+    <string name="pref_switch_actions_pager_scroll_on">Artigos de marca como lida quando passar entre artigos.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-si-rLK/strings.xml b/androidApp/src/main/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..1581ed2
--- /dev/null
+++ b/androidApp/src/main/res/values-si-rLK/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"පිවිසෙන්න"</string>
+    <string name="prompt_password">"මුර පදය"</string>
+    <string name="prompt_http_password">"HTTP Password"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"Password not long enough"</string>
+    <string name="error_field_required">"Field required"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Login required ?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+    <string name="prompt_login">"පරිශීලක නාමය"</string>
+    <string name="prompt_http_login">"HTTP Username"</string>
+    <string name="label_share">"Share"</string>
+    <string name="readAll">"Read all"</string>
+    <string name="action_disconnect">"Disconnect"</string>
+    <string name="title_activity_settings">"සැකසුම්"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"නම"</string>
+    <string name="add_source">"Add a source"</string>
+    <string name="add_source_save">"සුරකින්න"</string>
+    <string name="wrong_infos">"Check your details again."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"All posts were read"</string>
+    <string name="cant_get_favs">"Can't get favorites"</string>
+    <string name="cant_get_new_elements">"Can't get new articles"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Nothing here"</string>
+    <string name="tab_new">"New"</string>
+    <string name="tab_read">"සියල්ල"</string>
+    <string name="tab_favs">"Favorites"</string>
+    <string name="action_about">"මේ ගැන"</string>
+    <string name="marked_as_read">"Item read"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Undo"</string>
+    <string name="addStringNoUrl">"Log in to add sources."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"The form is not complete"</string>
+    <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_wrong_url">"WARNING"</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>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <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="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>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">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>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-tr-rTR/strings.xml b/androidApp/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000..40ba0a3
--- /dev/null
+++ b/androidApp/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Selfoss için okuyucu"</string>
+    <string name="title_activity_login">"Giriş"</string>
+    <string name="prompt_password">"Şifre"</string>
+    <string name="prompt_http_password">"HTTP şifresi"</string>
+    <string name="action_sign_in">"Git"</string>
+    <string name="error_invalid_password">"Parola yeterince uzun değil"</string>
+    <string name="error_field_required">"Alan gereklidir"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Kullanıcı Girişi Gerekli?"</string>
+    <string name="withHttpLoginSwitch">"HTTP üyelik gerekmektedir?"</string>
+    <string name="login_url_problem">"Oops. Url'nin sonuna \"/\" eklemek gerekebilir."</string>
+    <string name="prompt_login">"Kullanıcı adı"</string>
+    <string name="prompt_http_login">"HTTP kullanıcı adı"</string>
+    <string name="label_share">"Paylaş"</string>
+    <string name="readAll">"Tümünü oku"</string>
+    <string name="action_disconnect">"Bağlantıyı kes"</string>
+    <string name="title_activity_settings">"Ayarlar"</string>
+    <string name="pref_header_general">"Genel"</string>
+    <string name="add_source_hint_tags">"Etiket1, etiket2, etiket3"</string>
+    <string name="add_source_hint_url">"Bağlantı"</string>
+    <string name="add_source_hint_name">"İsim"</string>
+    <string name="add_source">"Yeni Kaynak Ekle"</string>
+    <string name="add_source_save">"Kaydet"</string>
+    <string name="wrong_infos">"Detaylarınızı tekrar kontrol edin."</string>
+    <string name="all_posts_not_read">"Tüm mesajlar okunmadı"</string>
+    <string name="all_posts_read">"Tüm mesajlar okundu"</string>
+    <string name="cant_get_favs">"Sık ullanılanlara ulaşılamıyor"</string>
+    <string name="cant_get_new_elements">"Yeni makalelere ulaşılamıyor"</string>
+    <string name="cant_get_read">"Yeni makaleler okunamıyor"</string>
+    <string name="nothing_here">"Burada hiçbir şey yok"</string>
+    <string name="tab_new">"Yeni"</string>
+    <string name="tab_read">"Tüm"</string>
+    <string name="tab_favs">"Favoriler"</string>
+    <string name="action_about">"Hakkında"</string>
+    <string name="marked_as_read">"Öğeleri oku"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Geri al"</string>
+    <string name="addStringNoUrl">"Kaynakları eklemek için giriş yapın."</string>
+    <string name="cant_get_sources">"Kaynakları listesi alınamıyor."</string>
+    <string name="cant_create_source">"Kaynak oluşturulamıyor."</string>
+    <string name="cant_get_spouts">"Spouts listesine girilemiyor."</string>
+    <string name="form_not_complete">"Form tamamlanamadı"</string>
+    <string name="pref_header_links">"Bağlantılar"</string>
+    <string name="issue_tracker_link">"Sorun İzleyici"</string>
+    <string name="issue_tracker_summary">"Bir hatayı bildir veya yeni bir özellik iste"</string>
+    <string name="warning_wrong_url">"UYARI"</string>
+    <string name="pref_switch_card_view_title">"Kart görünümü"</string>
+    <string name="cant_mark_favortie">"Makale favori olarak işaretlenemez"</string>
+    <string name="cant_unmark_favortie">"Nesne favorilerden kaldırılamıyor"</string>
+    <string name="share">"Paylaş"</string>
+    <string name="rating_prompt_title">"Uygulamayı sevdiniz mi?"</string>
+    <string name="rating_prompt_yes">"Evet!"</string>
+    <string name="rating_prompt_no">"Aslında değil…"</string>
+    <string name="rating_prompt_feedback_title">"Nedenini bize söyleyebilir misiniz?"</string>
+    <string name="rating_prompt_feedback_yes">"Tamam!"</string>
+    <string name="rating_prompt_feedback_no">"Henüz değil."</string>
+    <string name="rating_prompt_rating_title">"Harika ! Bizi mağzada oylayabilir misin?"</string>
+    <string name="rating_prompt_rating_yes">"Tabii ki!"</string>
+    <string name="rating_prompt_rating_no">"Şimdi değil."</string>
+    <string name="rating_prompt_thanks">"Teşekkürler, geri dönüşünü uygulamayı geliştirmede yardımcı olur!"</string>
+    <string name="switch_unread_count">"Okunmamış sayıyı, alt çubuk için bir rozet olarak görüntüleyin."</string>
+    <string name="switch_unread_count_title">"Okunmamış sayıyı görüntüle"</string>
+    <string name="display_all_counts_title">"Favori ve okunan sayıları göster"</string>
+    <string name="text_wrong_url">"Geçersiz bir URL kullanmaya çalışıyormuş gibi görünüyorsunuz. Doğru olduğundan emin olun ve sorun devam ederse, bana ulaşın (mağaza iletişim bağlantısıyla). Uygulamanın, Selfoss'u kullanmanız gerektiğini lütfen unutmayın. RSS özet akışlarına olmadan erişemezsiniz."</string>
+    <string name="pref_general_internal_browser_title">"Uygulamadaki bağlantıları açın"</string>
+    <string name="pref_general_internal_browser_on">"Makale, uygulama içinde açılacaktır"</string>
+    <string name="pref_general_internal_browser_off">"Makaleler varsayılan tarayıcınızla açılır"</string>
+    <string name="prefer_article_viewer_title">"Makale görüntüleyiciyi kullanın"</string>
+    <string name="prefer_article_viewer_on">"Dahili tarayıcı yerine makale görüntüleyicisini kullanacak"</string>
+    <string name="prefer_article_viewer_off">"Makale görüntüleyicisi yerine dahili tarayıcıyı kullanacak"</string>
+    <string name="pref_general_category_links">"Bağlantı açma şekli"</string>
+    <string name="pref_general_category_displaying">"Gösteriliyor"</string>
+    <string name="pref_switch_card_view_on">"Makaleler kart olarak gösterilecek"</string>
+    <string name="pref_switch_card_view_off">"Makaleler liste olarak gösterilecek"</string>
+    <string name="menu_home_refresh">"Uzaktan güncelleştirme"</string>
+    <string name="refresh_success_response">"Uzaktan güncelleştirilir, şimdi makaleler listesi yeniden yükleyebilirsiniz"</string>
+    <string name="refresh_failer_message">"Güncelleme çalışmadı, daha sonra tekrar deneyin veya selfoss günlüklerinizi kontrol edin."</string>
+    <string name="refresh_in_progress">"Yenileme devam ediyor"</string>
+    <string name="card_height_title">Tam boy kartlar</string>
+    <string name="card_height_on">Kartların yüksekliği içeriğine göre ayarlanır</string>
+    <string name="card_height_off">Kart yüksekliği sabit olacak</string>
+    <string name="source_code">Kaynak kodu</string>
+    <string name="cant_mark_read">Makale favori olarak işaretlenemez</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Etiketler yükleme hatası…</string>
+    <string name="drawer_error_loading_sources">Kaynaklar yüklenirken hata oluştu…</string>
+    <string name="drawer_item_filters">Filtreler</string>
+    <string name="drawer_action_clear">temizle</string>
+    <string name="drawer_item_tags">Etiketler</string>
+    <string name="drawer_item_sources">Kaynaklar</string>
+    <string name="drawer_action_edit">düzenle</string>
+    <string name="no_tags_loaded">Yüklenen görüntü yok</string>
+    <string name="no_sources_loaded">Yüklenen kaynak yok</string>
+    <string name="drawer_loading">Yükleniyor…</string>
+    <string name="menu_home_search">Ara</string>
+    <string name="can_delete_source">Kaynak silinemiyor…</string>
+    <string name="base_url_error">Selfoss Örneğinizle iletişim kurmaya çalışırken bir sorun oluştu. Sorun devam ederse, lütfen benimle iletişime geçin.</string>
+    <string name="pref_header_theme">Temalar</string>
+    <string name="default_theme">Varsayılan</string>
+    <string name="default_dark_theme">Varsayılan/koyu</string>
+    <string name="pref_header_debug">Hata ayıklama</string>
+    <string name="self_hosted_cert_switch">Kendi kendine barındırılan bir sertifika mı kullanıyorsunuz?</string>
+    <string name="self_signed_cert_warning">Güvenlik nedeniyle, kendinden imzalı sertifikalar varsayılan olarak desteklenmez. Bunu etkinleştirerek karşılaştığınız herhangi bir güvenlik sorununun sorumluluğunu almayacağım.</string>
+    <string name="pref_selfoss_category">Selfoss Uygulaması</string>
+    <string name="pref_api_items_number_title">Yüklenen öğe numarası</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Hata ayıklama tanıtıcısı</string>
+    <string name="unique_id_to_clipboard">Tanımlayıcı panonuza kopyalanır</string>
+    <string name="display_header_drawer_summary">Selfoss örneği url\'li bir üstbilgi, yan çekmece üzerine gösterin.</string>
+    <string name="display_header_drawer_title">Hesap başlığı</string>
+    <string name="pref_general_infinite_loading_title">Kaydırma üzerine daha fazla makale yükleyin</string>
+    <string name="translation">Çeviri</string>
+    <string name="cant_open_invalid_url">Öğe url geçersiz. Uygulama çökmeyeceği için bu sorunu çözmeye çalışıyorum.</string>
+    <string name="drawer_report_bug">Hata bildir</string>
+    <string name="items_number_should_be_number">Öğe sayısı bir tamsayı olmalıdır.</string>
+    <string name="reader_action_more">Daha fazlasını görüntüle</string>
+    <string name="reader_action_open">Tarayıcıda aç</string>
+    <string name="reader_action_share">Paylaş</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values-zh-rCN/strings.xml b/androidApp/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e4fc66b
--- /dev/null
+++ b/androidApp/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Selfoss 阅读器"</string>
+    <string name="title_activity_login">"登录"</string>
+    <string name="prompt_password">"密码"</string>
+    <string name="prompt_http_password">"HTTP 密码"</string>
+    <string name="action_sign_in">"转至"</string>
+    <string name="error_invalid_password">"密码不够长"</string>
+    <string name="error_field_required">"必填字段"</string>
+    <string name="prompt_url">"网址"</string>
+    <string name="withLoginSwitch">"需要登录？"</string>
+    <string name="withHttpLoginSwitch">"请先登录网站"</string>
+    <string name="login_url_problem">"哎呀。您可能需要在网址的末尾添加一个 \"/\"。"</string>
+    <string name="prompt_login">"用户名"</string>
+    <string name="prompt_http_login">"HTTP 用户名"</string>
+    <string name="label_share">"分享"</string>
+    <string name="readAll">"全部阅读"</string>
+    <string name="action_disconnect">"断开连接"</string>
+    <string name="title_activity_settings">"设置"</string>
+    <string name="pref_header_general">"常用"</string>
+    <string name="add_source_hint_tags">"标签1,标签2,标签3"</string>
+    <string name="add_source_hint_url">"链接"</string>
+    <string name="add_source_hint_name">"名称"</string>
+    <string name="add_source">"添加新源"</string>
+    <string name="add_source_save">"保存"</string>
+    <string name="wrong_infos">"再次检查您的详细信息。"</string>
+    <string name="all_posts_not_read">"所有帖子都未读"</string>
+    <string name="all_posts_read">"所有帖子已读"</string>
+    <string name="cant_get_favs">"无法获取收藏文件"</string>
+    <string name="cant_get_new_elements">"无法获取新文章"</string>
+    <string name="cant_get_read">"无法获取已读文章"</string>
+    <string name="nothing_here">"暂无内容！"</string>
+    <string name="tab_new">"新建"</string>
+    <string name="tab_read">"所有"</string>
+    <string name="tab_favs">"收藏夹"</string>
+    <string name="action_about">"关于我们"</string>
+    <string name="marked_as_read">"已读"</string>
+    <string name="marked_as_unread">"未读条目"</string>
+    <string name="undo_string">"撤销"</string>
+    <string name="addStringNoUrl">"登录以添加数据源。"</string>
+    <string name="cant_get_sources">"无法获取数据列表。"</string>
+    <string name="cant_create_source">"无法创建源数据。"</string>
+    <string name="cant_get_spouts">"无法获取数据列表"</string>
+    <string name="form_not_complete">"窗体未完成"</string>
+    <string name="pref_header_links">"链接"</string>
+    <string name="issue_tracker_link">"问题追踪器"</string>
+    <string name="issue_tracker_summary">"报告错误或请求新功能"</string>
+    <string name="warning_wrong_url">"警告"</string>
+    <string name="pref_switch_card_view_title">"卡片视图"</string>
+    <string name="cant_mark_favortie">"不能将文章标记为收藏"</string>
+    <string name="cant_unmark_favortie">"无法从收藏中删除项目"</string>
+    <string name="share">"共享"</string>
+    <string name="rating_prompt_title">"喜欢这个应用吗？"</string>
+    <string name="rating_prompt_yes">"是的！"</string>
+    <string name="rating_prompt_no">"不大喜欢…"</string>
+    <string name="rating_prompt_feedback_title">"能告诉我们为什么吗？"</string>
+    <string name="rating_prompt_feedback_yes">"好的！"</string>
+    <string name="rating_prompt_feedback_no">"以后再说。"</string>
+    <string name="rating_prompt_rating_title">"太好了！你能在应用商店给我们打分吗？"</string>
+    <string name="rating_prompt_rating_yes">"当然！"</string>
+    <string name="rating_prompt_rating_no">"现在不行。"</string>
+    <string name="rating_prompt_thanks">"谢谢，您的反馈有助于改进应用程序！"</string>
+    <string name="switch_unread_count">"将未读数在底部显示为一个徽标。"</string>
+    <string name="switch_unread_count_title">"显示未读数"</string>
+    <string name="display_all_counts_title">"显示收藏和已读的计数"</string>
+    <string name="text_wrong_url">"您似乎试图使用无效的 URL。确保它是正确的，如果问题仍然存在，请与我联系 (通过商店的联系链接)。请注意，该应用程序需要您使用 Selfoss。没有它，您无法访问 RSS 源。"</string>
+    <string name="pref_general_internal_browser_title">"打开应用程序中的链接"</string>
+    <string name="pref_general_internal_browser_on">"文章将在应用程序内打开"</string>
+    <string name="pref_general_internal_browser_off">"文章将使用默认浏览器打开"</string>
+    <string name="prefer_article_viewer_title">"使用文章查看器"</string>
+    <string name="prefer_article_viewer_on">"将使用文章查看器而不是内部浏览器"</string>
+    <string name="prefer_article_viewer_off">"将使用内部浏览器而不是文章查看器"</string>
+    <string name="pref_general_category_links">"链接处理"</string>
+    <string name="pref_general_category_displaying">"显示"</string>
+    <string name="pref_switch_card_view_on">"这些文章将以卡片形式显示"</string>
+    <string name="pref_switch_card_view_off">"这些文章将以列表形式显示"</string>
+    <string name="menu_home_refresh">"更新远程"</string>
+    <string name="refresh_success_response">"远程已更新，您现在可以重新加载文章列表"</string>
+    <string name="refresh_failer_message">"更新未执行，请稍后重试，或者查看 Selfoss 日志。"</string>
+    <string name="refresh_in_progress">"正在进行刷新"</string>
+    <string name="card_height_title">全高卡片</string>
+    <string name="card_height_on">卡片高度将根据内容调整</string>
+    <string name="card_height_off">卡片高度将被固定</string>
+    <string name="source_code">源代码</string>
+    <string name="cant_mark_read">无法将文章标记为已读</string>
+    <string name="cant_mark_unread">无法将文章标记为未读</string>
+    <string name="drawer_error_loading_tags">加载标记时出错..。</string>
+    <string name="drawer_error_loading_sources">加载源时出错..。</string>
+    <string name="drawer_item_filters">搜索条件</string>
+    <string name="drawer_action_clear">清空</string>
+    <string name="drawer_item_tags">标签</string>
+    <string name="drawer_item_sources">来源</string>
+    <string name="drawer_action_edit">编辑</string>
+    <string name="no_tags_loaded">未加载标签</string>
+    <string name="no_sources_loaded">未加载数据源</string>
+    <string name="drawer_loading">正在载入…</string>
+    <string name="menu_home_search">搜索</string>
+    <string name="can_delete_source">无法删除数据源…</string>
+    <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
+    <string name="pref_header_theme">主题</string>
+    <string name="default_theme">默认​​​​​</string>
+    <string name="default_dark_theme">默认值/暗</string>
+    <string name="pref_header_debug">调试</string>
+    <string name="self_hosted_cert_switch">使用自托管证书？</string>
+    <string name="self_signed_cert_warning">出于安全考虑, 默认情况下不支持自签名证书。如果激活此项, 您遇到的任何安全问题我将概不负责。</string>
+    <string name="pref_selfoss_category">塞尔福斯 Api</string>
+    <string name="pref_api_items_number_title">已加载项目编号</string>
+    <string name="pref_hidden_tags">隐藏标签</string>
+    <string name="summary_debug_identifier">除错标识符</string>
+    <string name="unique_id_to_clipboard">复制到你的剪贴板的标识符</string>
+    <string name="display_header_drawer_summary">在侧边栏中显示带有 Selfoss 链接地址的页眉。</string>
+    <string name="display_header_drawer_title">帐户页眉</string>
+    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
+    <string name="translation">翻译</string>
+    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
+    <string name="drawer_report_bug">报告错误</string>
+    <string name="items_number_should_be_number">项目数应为整数。</string>
+    <string name="reader_action_more">阅读更多</string>
+    <string name="reader_action_open">在浏览器中打开</string>
+    <string name="reader_action_share">分享</string>
+    <string name="pref_switch_actions_pager_scroll_on">切换文章时将文章标记为已读。</string>
+    <string name="add_to_favs_reader">添加到收藏</string>
+    <string name="remove_to_favs_reader">从收藏中移除</string>
+    <string name="pref_content_reader_font_size">文章阅读器内容字体大小</string>
+    <string name="pref_header_viewer">文章查看器</string>
+    <string name="refresh_dialog_message">这将刷新您的 Selfoss 实例。</string>
+    <string name="markall_dialog_message">这将标记所有项目为已读。</string>
+    <string name="pref_switch_actions_pager_scroll">滑动时标为已读</string>
+    <string name="pref_switch_actions_pager_scroll_off">滑动时不标记文章为已读</string>
+    <string name="pref_acra_alwaysaccept">自动发送崩溃报告</string>
+    <string name="pref_acra_alwaysaccept_enabled">允许自动发送故障报告</string>
+    <string name="pref_acra_alwaysaccept_disabled">每次发送崩溃报告时都会询问。</string>
+    <string name="pref_debug_crash_reports">崩溃报告</string>
+    <string name="pref_debug_debug_logs">调试日志(这些日志将在没有对话框的情况下发送)</string>
+    <string name="acra_login">启用日志记录</string>
+    <string name="drawer_item_hidden_tags">隐藏标签</string>
+    <string name="unmark">标记条目为未读</string>
+    <string name="pref_header_offline">离线和缓存</string>
+    <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
+    <string name="pref_switch_items_caching_on">文章将被保存到设备内存并可在离线时使用</string>
+    <string name="pref_switch_items_caching">保存项目以便离线使用</string>
+    <string name="pref_switch_update_sources">检查新来源和标签</string>
+    <string name="pref_switch_update_sources_summary">如果你的服务器接收过多的数据库查询，请禁用此功能。</string>
+    <string name="no_network_connectivity">未连接！</string>
+    <string name="pref_switch_periodic_refresh">同步文章</string>
+    <string name="pref_switch_periodic_refresh_off">文章将不会在后台同步</string>
+    <string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[同步间隔 (>= 15分钟)]]></string>
+    <string name="pref_switch_refresh_when_charging">仅在手机充电时刷新</string>
+    <string name="loading_notification_title">加载中...</string>
+    <string name="loading_notification_text">Selfoss 正在同步您的文章</string>
+    <string name="notification_channel_sync">同步通知</string>
+    <string name="new_items_channel_sync">新条目通知</string>
+    <string name="new_items_notification_title">新条目 ！</string>
+    <string name="new_items_notification_text">已加载%1$d新条目</string>
+    <string name="pref_switch_notify_new_items">通知已同步的新条目</string>
+    <string name="shortcut_offline">离线</string>
+    <string name="pref_api_timeout">Api 超时</string>
+    <string name="pref_header_experimental">实验性功能</string>
+    <string name="webview_dialog_issue_message">Webview不可用。禁用文章查看器以避免将来发生崩溃。从现在起将在浏览器内加载文章。</string>
+    <string name="webview_dialog_issue_title">Webview问题</string>
+    <string name="reader_text_align_left">左对齐</string>
+    <string name="reader_text_align_justify">左右对齐</string>
+    <string name="settings_reader_font">阅读器字体</string>
+    <string name="reader_static_bar_title">文章查看器中的静态底部栏</string>
+    <string name="reader_static_bar_on">底部栏将始终显示</string>
+    <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string>
+    <string name="remove_source">删除源</string>
+</resources>
diff --git a/androidApp/src/main/res/values-zh-rTW/strings.xml b/androidApp/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..297125d
--- /dev/null
+++ b/androidApp/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Selfoss 阅读器"</string>
+    <string name="title_activity_login">"登录"</string>
+    <string name="prompt_password">"密码"</string>
+    <string name="prompt_http_password">"HTTP 密碼"</string>
+    <string name="action_sign_in">"转至"</string>
+    <string name="error_invalid_password">"密码不够长"</string>
+    <string name="error_field_required">"欄位必填"</string>
+    <string name="prompt_url">"网址"</string>
+    <string name="withLoginSwitch">"需要登入？"</string>
+    <string name="withHttpLoginSwitch">"请先登录网站"</string>
+    <string name="login_url_problem">"哎呀。您可能需要在网址的末尾添加一个 \"/\"。"</string>
+    <string name="prompt_login">"使用者名稱"</string>
+    <string name="prompt_http_login">"HTTP 用户名"</string>
+    <string name="label_share">"分享"</string>
+    <string name="readAll">"全部阅读"</string>
+    <string name="action_disconnect">"断开连接"</string>
+    <string name="title_activity_settings">"设置"</string>
+    <string name="pref_header_general">"常用"</string>
+    <string name="add_source_hint_tags">"标签1,标签2,标签3"</string>
+    <string name="add_source_hint_url">"链接"</string>
+    <string name="add_source_hint_name">"名称"</string>
+    <string name="add_source">"添加新源"</string>
+    <string name="add_source_save">"保存"</string>
+    <string name="wrong_infos">"再次检查您的详细信息。"</string>
+    <string name="all_posts_not_read">"所有帖子都未读"</string>
+    <string name="all_posts_read">"所有帖子已读"</string>
+    <string name="cant_get_favs">"无法获取收藏文件"</string>
+    <string name="cant_get_new_elements">"无法获取新文章"</string>
+    <string name="cant_get_read">"无法获取已读文章"</string>
+    <string name="nothing_here">"暂无内容！"</string>
+    <string name="tab_new">"新建"</string>
+    <string name="tab_read">"所有"</string>
+    <string name="tab_favs">"收藏夹"</string>
+    <string name="action_about">"关于我们"</string>
+    <string name="marked_as_read">"已读"</string>
+    <string name="marked_as_unread">"未讀項目"</string>
+    <string name="undo_string">"撤销"</string>
+    <string name="addStringNoUrl">"登录以添加数据源。"</string>
+    <string name="cant_get_sources">"无法获取数据列表。"</string>
+    <string name="cant_create_source">"无法创建源数据。"</string>
+    <string name="cant_get_spouts">"无法获取数据列表"</string>
+    <string name="form_not_complete">"窗体未完成"</string>
+    <string name="pref_header_links">"链接"</string>
+    <string name="issue_tracker_link">"问题追踪器"</string>
+    <string name="issue_tracker_summary">"报告错误或请求新功能"</string>
+    <string name="warning_wrong_url">"警告"</string>
+    <string name="pref_switch_card_view_title">"卡片视图"</string>
+    <string name="cant_mark_favortie">"不能将文章标记为收藏"</string>
+    <string name="cant_unmark_favortie">"无法从收藏中删除项目"</string>
+    <string name="share">"共享"</string>
+    <string name="rating_prompt_title">"喜欢这个应用吗？"</string>
+    <string name="rating_prompt_yes">"是的！"</string>
+    <string name="rating_prompt_no">"不大喜欢…"</string>
+    <string name="rating_prompt_feedback_title">"能告诉我们为什么吗？"</string>
+    <string name="rating_prompt_feedback_yes">"好的！"</string>
+    <string name="rating_prompt_feedback_no">"以后再说。"</string>
+    <string name="rating_prompt_rating_title">"太好了！你能在应用商店给我们打分吗？"</string>
+    <string name="rating_prompt_rating_yes">"当然！"</string>
+    <string name="rating_prompt_rating_no">"现在不行。"</string>
+    <string name="rating_prompt_thanks">"谢谢，您的反馈有助于改进应用程序！"</string>
+    <string name="switch_unread_count">"将未读数在底部显示为一个徽标。"</string>
+    <string name="switch_unread_count_title">"显示未读数"</string>
+    <string name="display_all_counts_title">"显示收藏和已读的计数"</string>
+    <string name="text_wrong_url">"您似乎试图使用无效的 URL。确保它是正确的，如果问题仍然存在，请与我联系 (通过商店的联系链接)。请注意，该应用程序需要您使用 Selfoss。没有它，您无法访问 RSS 源。"</string>
+    <string name="pref_general_internal_browser_title">"打开应用程序中的链接"</string>
+    <string name="pref_general_internal_browser_on">"文章将在应用程序内打开"</string>
+    <string name="pref_general_internal_browser_off">"文章将使用默认浏览器打开"</string>
+    <string name="prefer_article_viewer_title">"使用文章查看器"</string>
+    <string name="prefer_article_viewer_on">"将使用文章查看器而不是内部浏览器"</string>
+    <string name="prefer_article_viewer_off">"将使用内部浏览器而不是文章查看器"</string>
+    <string name="pref_general_category_links">"链接处理"</string>
+    <string name="pref_general_category_displaying">"显示"</string>
+    <string name="pref_switch_card_view_on">"这些文章将以卡片形式显示"</string>
+    <string name="pref_switch_card_view_off">"这些文章将以列表形式显示"</string>
+    <string name="menu_home_refresh">"更新远程"</string>
+    <string name="refresh_success_response">"远程已更新，您现在可以重新加载文章列表"</string>
+    <string name="refresh_failer_message">"更新未执行，请稍后重试，或者查看 Selfoss 日志。"</string>
+    <string name="refresh_in_progress">"正在进行刷新"</string>
+    <string name="card_height_title">全高卡片</string>
+    <string name="card_height_on">卡片高度将根据内容调整</string>
+    <string name="card_height_off">卡片高度将被固定</string>
+    <string name="source_code">源代码</string>
+    <string name="cant_mark_read">无法将文章标记为已读</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">加载标记时出错..。</string>
+    <string name="drawer_error_loading_sources">加载源时出错..。</string>
+    <string name="drawer_item_filters">搜索条件</string>
+    <string name="drawer_action_clear">清空</string>
+    <string name="drawer_item_tags">标签</string>
+    <string name="drawer_item_sources">来源</string>
+    <string name="drawer_action_edit">编辑</string>
+    <string name="no_tags_loaded">未加载标签</string>
+    <string name="no_sources_loaded">未加载数据源</string>
+    <string name="drawer_loading">正在载入…</string>
+    <string name="menu_home_search">搜索</string>
+    <string name="can_delete_source">无法删除数据源…</string>
+    <string name="base_url_error">与您的 Selfoss 通信时出现问题。如果问题一直存在，请与我联系。</string>
+    <string name="pref_header_theme">主题</string>
+    <string name="default_theme">默认​​​​​</string>
+    <string name="default_dark_theme">默认值/暗</string>
+    <string name="pref_header_debug">调试</string>
+    <string name="self_hosted_cert_switch">使用自托管证书？</string>
+    <string name="self_signed_cert_warning">出于安全考虑, 默认情况下不支持自签名证书。如果激活此项, 您遇到的任何安全问题我将概不负责。</string>
+    <string name="pref_selfoss_category">塞尔福斯 Api</string>
+    <string name="pref_api_items_number_title">已加载项目编号</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">除错标识符</string>
+    <string name="unique_id_to_clipboard">复制到你的剪贴板的标识符</string>
+    <string name="display_header_drawer_summary">在侧边栏中显示带有 Selfoss 链接地址的页眉。</string>
+    <string name="display_header_drawer_title">帐户页眉</string>
+    <string name="pref_general_infinite_loading_title">翻页时载入更多文章</string>
+    <string name="translation">翻译</string>
+    <string name="cant_open_invalid_url">项目链接地址无效。我正在设法解决这个问题，以避免应用程序崩溃。</string>
+    <string name="drawer_report_bug">报告错误</string>
+    <string name="items_number_should_be_number">项目数应为整数。</string>
+    <string name="reader_action_more">阅读更多</string>
+    <string name="reader_action_open">在浏览器中打开</string>
+    <string name="reader_action_share">分享</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values/attrs.xml b/androidApp/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..40532b5
--- /dev/null
+++ b/androidApp/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="Theme">
+        <attr name="colorAccentDark" format="reference|color" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/colors.xml b/androidApp/src/main/res/values/colors.xml
index 4faecfa..5dea68f 100644
--- a/androidApp/src/main/res/values/colors.xml
+++ b/androidApp/src/main/res/values/colors.xml
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
-</resources>
\ No newline at end of file
+    <color name="colorPrimary">#FF00bfa5</color>
+    <color name="colorPrimaryDark">#FF00ac94</color>
+    <color name="colorAccent">#FFff5722</color>
+    <color name="colorAccentDark">#FFbf360c</color>
+    <color name="pink">#FFe91e63</color>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#FF000000</color>
+    <color name="red">#FF0000</color>
+    <color name="refresh_progress_1">@color/colorAccentDark</color>
+    <color name="refresh_progress_2">@color/colorAccent</color>
+    <color name="refresh_progress_3">@color/pink</color>
+    <color name="background_grey">#FFe4e4e4</color>
+
+    <color name="dark_webview">#FF303030</color>
+    <color name="dark_webview_text">#FFFFFF</color>
+    <color name="light_webview">#FFFFFF</color>
+    <color name="light_webview_text">#212121</color>
+
+    <color name="cardBackgroundColor">#FFFFFFFF</color>
+    <color name="materialDrawerHeaderSelectionText">#212121</color>
+    <color name="darkBackground">#303030</color>
+</resources>
diff --git a/androidApp/src/main/res/values/dimens.xml b/androidApp/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..411bfe9
--- /dev/null
+++ b/androidApp/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="card_image_max_height">150dp</dimen>
+</resources>
diff --git a/androidApp/src/main/res/values/font_certs.xml b/androidApp/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..d2226ac
--- /dev/null
+++ b/androidApp/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
diff --git a/androidApp/src/main/res/values/ic_launcher_background.xml b/androidApp/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..16cdd5a
--- /dev/null
+++ b/androidApp/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/preloaded_fonts.xml b/androidApp/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 0000000..467da32
--- /dev/null
+++ b/androidApp/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts" translatable="false">
+        <item>@font/open_sans</item>
+        <item>@font/roboto</item>
+    </array>
+</resources>
diff --git a/androidApp/src/main/res/values/preloaded_fonts_keys.xml b/androidApp/src/main/res/values/preloaded_fonts_keys.xml
new file mode 100644
index 0000000..083f6b2
--- /dev/null
+++ b/androidApp/src/main/res/values/preloaded_fonts_keys.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts_keys" translatable="false">
+        <item></item>
+        <item>@string/open_sans_font_id</item>
+        <item>@string/roboto_font_id</item>
+    </array>
+</resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/preloaded_fonts_values.xml b/androidApp/src/main/res/values/preloaded_fonts_values.xml
new file mode 100644
index 0000000..dca50bc
--- /dev/null
+++ b/androidApp/src/main/res/values/preloaded_fonts_values.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts_values" translatable="false">
+        <item>Systems</item>
+        <item>Open Sans</item>
+        <item>Roboto</item>
+    </array>
+</resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
new file mode 100644
index 0000000..fc20983
--- /dev/null
+++ b/androidApp/src/main/res/values/strings.xml
@@ -0,0 +1,172 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">"Reader for Selfoss"</string>
+    <string name="title_activity_login">"Log in"</string>
+    <string name="prompt_password">"Password"</string>
+    <string name="prompt_http_password">"HTTP Password"</string>
+    <string name="action_sign_in">"Go"</string>
+    <string name="error_invalid_password">"Password not long enough"</string>
+    <string name="error_field_required">"Field required"</string>
+    <string name="prompt_url">"Url"</string>
+    <string name="withLoginSwitch">"Login required ?"</string>
+    <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+    <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+    <string name="prompt_login">"Username"</string>
+    <string name="prompt_http_login">"HTTP Username"</string>
+    <string name="label_share">"Share"</string>
+    <string name="readAll">"Read all"</string>
+    <string name="action_disconnect">"Disconnect"</string>
+    <string name="title_activity_settings">"Settings"</string>
+    <string name="pref_header_general">"General"</string>
+    <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+    <string name="add_source_hint_url">"Link"</string>
+    <string name="add_source_hint_name">"Name"</string>
+    <string name="add_source">"Add a source"</string>
+    <string name="add_source_save">"Save"</string>
+    <string name="wrong_infos">"Check your details again."</string>
+    <string name="all_posts_not_read">"All posts weren't read"</string>
+    <string name="all_posts_read">"All posts were read"</string>
+    <string name="cant_get_favs">"Can't get favorites"</string>
+    <string name="cant_get_new_elements">"Can't get new articles"</string>
+    <string name="cant_get_read">"Can't get read articles"</string>
+    <string name="nothing_here">"Nothing here"</string>
+    <string name="tab_new">"New"</string>
+    <string name="tab_read">"All"</string>
+    <string name="tab_favs">"Favorites"</string>
+    <string name="action_about">"About"</string>
+    <string name="marked_as_read">"Item read"</string>
+    <string name="marked_as_unread">"Item unread"</string>
+    <string name="undo_string">"Undo"</string>
+    <string name="addStringNoUrl">"Log in to add sources."</string>
+    <string name="cant_get_sources">"Can't get sources list."</string>
+    <string name="cant_create_source">"Can't create source."</string>
+    <string name="cant_get_spouts">"Can't get spouts list."</string>
+    <string name="form_not_complete">"The form is not complete"</string>
+    <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_wrong_url">"WARNING"</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>
+    <string name="rating_prompt_title">"Enjoying the app ?"</string>
+    <string name="rating_prompt_yes">"Yes !"</string>
+    <string name="rating_prompt_no">"Not really …"</string>
+    <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+    <string name="rating_prompt_feedback_yes">"OK !"</string>
+    <string name="rating_prompt_feedback_no">"Not now."</string>
+    <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
+    <string name="rating_prompt_rating_yes">"Sure !"</string>
+    <string name="rating_prompt_rating_no">"Not right now."</string>
+    <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
+    <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
+    <string name="switch_unread_count_title">"Display unread count"</string>
+    <string name="display_all_counts_title">"Display count for favorite and read"</string>
+    <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
+    <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
+    <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
+    <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
+    <string name="prefer_article_viewer_title">"Use the article viewer"</string>
+    <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
+    <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
+    <string name="pref_general_category_links">"Link handling"</string>
+    <string name="pref_general_category_displaying">"Displaying"</string>
+    <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
+    <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
+    <string name="menu_home_refresh">"Update remote"</string>
+    <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
+    <string
+        name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
+    <string name="refresh_in_progress">"Refresh in progress"</string>
+    <string name="card_height_title">Full height cards</string>
+    <string name="card_height_on">Cards height will adjust to its content</string>
+    <string name="card_height_off">Card height will be fixed</string>
+    <string name="source_code">Source code</string>
+    <string name="cant_mark_read">Can\'t mark article as read</string>
+    <string name="cant_mark_unread">Can\'t mark article as unread</string>
+    <string name="drawer_error_loading_tags">Error loading tags…</string>
+    <string name="drawer_error_loading_sources">Error loading sources…</string>
+    <string name="drawer_item_filters">Filters</string>
+    <string name="drawer_action_clear">clear</string>
+    <string name="drawer_item_tags">Tags</string>
+    <string name="drawer_item_sources">Sources</string>
+    <string name="drawer_action_edit">edit</string>
+    <string name="no_tags_loaded">No tags loaded</string>
+    <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="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>
+    <string name="default_dark_theme">Default/Dark</string>
+    <string name="pref_header_debug">Debug</string>
+    <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
+    <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+    <string name="pref_selfoss_category">Selfoss Api</string>
+    <string name="pref_api_items_number_title">Loaded items number</string>
+    <string name="pref_hidden_tags">Hidden Tags</string>
+    <string name="summary_debug_identifier">Debug identifier</string>
+    <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
+    <string
+        name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
+    <string name="display_header_drawer_title">Account header</string>
+    <string name="pref_general_infinite_loading_title">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>
+    <string name="items_number_should_be_number">The items number should be an integer.</string>
+    <string name="reader_action_more">Read more</string>
+    <string name="reader_action_open">Open in browser</string>
+    <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll_on">Mark articles as read when swiping between articles.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
+    <string name="remove_to_favs_reader">Remove from favorites</string>
+    <string name="pref_content_reader_font_size">Article reader content font size</string>
+    <string name="pref_header_viewer">Article viewer</string>
+    <string name="refresh_dialog_message">This will refresh your Selfoss instance.</string>
+    <string name="markall_dialog_message">This will mark all the items as read.</string>
+    <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
+    <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
+    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
+    <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
+    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
+    <string name="acra_login">Enable logging</string>
+    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
+    <string name="pref_header_offline">Offline and cache</string>
+    <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
+    <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
+    <string name="pref_switch_items_caching">Save items for offline use</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="no_network_connectivity">Not connected !</string>
+    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="notification_channel_sync">Sync notification</string>
+    <string name="new_items_channel_sync">New items notification</string>
+    <string name="new_items_notification_title">New items !</string>
+    <string name="new_items_notification_text">%1$d new items loaded.</string>
+    <string name="pref_switch_notify_new_items">Notify on new items synced.</string>
+    <string name="shortcut_offline">Offline</string>
+    <string name="pref_api_timeout">Api Timeout</string>
+    <string name="pref_header_experimental">Experimental</string>
+    <string name="webview_dialog_issue_message">Webview not available. Disabling the article viewer to avoid any future crashes. Will load articles inside of your browser from now on.</string>
+    <string name="webview_dialog_issue_title">Webview issue</string>
+    <string name="reader_text_align_left">Align left</string>
+    <string name="reader_text_align_justify">Justify</string>
+    <string name="settings_reader_font">Reader font</string>
+    <string name="open_sans_font_id" translatable="false">open_sans</string>
+    <string name="roboto_font_id" translatable="false">roboto</string>
+    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
+    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
+    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
+</resources>
diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml
index 1971a0a..e81acf0 100644
--- a/androidApp/src/main/res/values/styles.xml
+++ b/androidApp/src/main/res/values/styles.xml
@@ -1,9 +1,73 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@drawable/background_splash</item>
+    </style>
+
+    <style name="NoBar" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccentDark">@color/colorAccentDark</item>
+        <item name="cardBackgroundColor">@color/white</item>
+        <item name="android:colorBackground">@color/grey_50</item>
+        <item name="colorSurface">@color/grey_50</item>
+        <item name="android:textColorPrimary">@color/grey_900</item>
+        <item name="android:textColorSecondary">@color/grey_400</item>
+        <item name="materialDrawerStyle">@style/App.materialDrawerStyle</item>
+        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="preferenceTheme">@style/PreferenceStyle</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="NoBarDark" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccentDark">@color/colorAccentDark</item>
+        <item name="cardBackgroundColor">@color/grey_800</item>
+        <item name="android:colorBackground">@color/darkBackground</item>
+        <item name="colorSurface">@color/darkBackground</item>
+        <item name="alertDialogTheme">@style/AlertDialogDark</item>
+        <item name="bnbBackgroundColor">@color/grey_900</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/grey_600</item>
+        <item name="materialDrawerStyle">@style/App.materialDrawerStyle</item>
+        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="preferenceTheme">@style/PreferenceStyle</item>
+    </style>
+
+    <!-- ToolBar -->
+    <style name="ToolBarStyle" parent="Theme.AppCompat">
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/white</item>
+        <item name="actionMenuTextColor">@color/white</item>
+        <!--<item name="actionOverflowButtonStyle">@style/ActionButtonOverflowStyle</item>
+        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>-->
+    </style>
+
+    <!-- Material Drawer Theme -->
+    <style name="App.materialDrawerStyle" parent="@style/Widget.MaterialDrawerStyle">
+        <item name="materialDrawerPrimaryIcon">?android:textColorPrimary</item>
+        <item name="materialDrawerSecondaryIcon">?android:textColorPrimary</item>
+        <item name="materialDrawerSecondaryText">?android:textColorPrimary</item>
+    </style>
+      
+    <!-- Preference Theme -->
+    <style name="PreferenceStyle" parent="@style/PreferenceThemeOverlay">
+        <item name="android:tint">?android:textColorPrimary</item>
+    </style>
+
+    <!-- Spinner Theme -->
+    <style name="App.Spinner" parent="Widget.AppCompat.Light.DropDownItem.Spinner">
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
+
+    <!-- Alert dialog Theme -->
+
+    <style name="AlertDialogDark" parent="Theme.MaterialComponents.Dialog">
+        <item name="android:background">@color/darkBackground</item>
+    </style>
+
+</resources>
diff --git a/androidApp/src/main/res/xml-v25/shortcuts.xml b/androidApp/src/main/res/xml-v25/shortcuts.xml
new file mode 100644
index 0000000..2b70e83
--- /dev/null
+++ b/androidApp/src/main/res/xml-v25/shortcuts.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="new"
+        android:enabled="true"
+        android:icon="@drawable/ic_tab_fiber_new_black_24dp"
+        android:shortcutShortLabel="@string/tab_new">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="bou.amine.apps.readerforselfossv2.android"
+            android:targetClass="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="1" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="read"
+        android:enabled="true"
+        android:icon="@drawable/ic_tab_archive_black_24dp"
+        android:shortcutShortLabel="@string/tab_read">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="bou.amine.apps.readerforselfossv2.android"
+            android:targetClass="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="2" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="favs"
+        android:enabled="true"
+        android:icon="@drawable/ic_tab_favorite_black_24dp"
+        android:shortcutShortLabel="@string/tab_favs">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="bou.amine.apps.readerforselfossv2.android"
+            android:targetClass="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+            <extra
+                android:name="shortcutTab"
+                android:value="3" />
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="offline"
+        android:enabled="true"
+        android:icon="@drawable/ic_signal_wifi_off_black_24dp"
+        android:shortcutShortLabel="@string/shortcut_offline">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="bou.amine.apps.readerforselfossv2.android"
+            android:targetClass="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+            <extra
+                android:name="startOffline"
+                android:value="true" />
+        </intent>
+    </shortcut>
+</shortcuts>
\ No newline at end of file
diff --git a/androidApp/src/main/res/xml/network_security_config.xml b/androidApp/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..cd24e6c
--- /dev/null
+++ b/androidApp/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" >
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/androidApp/src/main/res/xml/pref_experimental.xml b/androidApp/src/main/res/xml/pref_experimental.xml
new file mode 100644
index 0000000..bc7569e
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_experimental.xml
@@ -0,0 +1,11 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <EditTextPreference
+        android:inputType="number"
+        android:key="api_timeout"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_api_timeout"
+        app:iconSpaceReserved="false"/>
+
+</PreferenceScreen>
diff --git a/androidApp/src/main/res/xml/pref_general.xml b/androidApp/src/main/res/xml/pref_general.xml
new file mode 100644
index 0000000..450f81e
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_general.xml
@@ -0,0 +1,97 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/pref_selfoss_category">
+
+    </PreferenceCategory>
+    <EditTextPreference
+        android:defaultValue="200"
+        android:inputType="number"
+        android:key="prefer_api_items_number"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_api_items_number_title"
+        app:iconSpaceReserved="false"/>
+
+    <EditTextPreference
+        android:defaultValue=""
+        android:hint="@string/add_source_hint_tags"
+        android:key="hidden_tags"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_hidden_tags"
+        app:iconSpaceReserved="false"/>
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="infinite_loading"
+        android:title="@string/pref_general_infinite_loading_title"
+        app:iconSpaceReserved="false"/>
+    <PreferenceCategory
+        android:title="@string/pref_general_category_links">
+
+    </PreferenceCategory>
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="prefer_internal_browser"
+        android:summaryOff="@string/pref_general_internal_browser_off"
+        android:summaryOn="@string/pref_general_internal_browser_on"
+        android:title="@string/pref_general_internal_browser_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="true"
+        android:dependency="prefer_internal_browser"
+        android:key="prefer_article_viewer"
+        android:summaryOff="@string/prefer_article_viewer_off"
+        android:summaryOn="@string/prefer_article_viewer_on"
+        android:title="@string/prefer_article_viewer_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:dependency="prefer_article_viewer"
+        android:key="reader_static_bar"
+        android:summaryOff="@string/reader_static_bar_off"
+        android:summaryOn="@string/reader_static_bar_on"
+        android:title="@string/reader_static_bar_title"
+        app:iconSpaceReserved="false"/>
+
+    <PreferenceCategory
+        android:title="@string/pref_general_category_displaying">
+
+    </PreferenceCategory>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="account_header_displaying"
+        android:summary="@string/display_header_drawer_summary"
+        android:title="@string/display_header_drawer_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="card_view_active"
+        android:summaryOff="@string/pref_switch_card_view_off"
+        android:summaryOn="@string/pref_switch_card_view_on"
+        android:title="@string/pref_switch_card_view_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:dependency="card_view_active"
+        android:key="full_height_cards"
+        android:summaryOff="@string/card_height_off"
+        android:summaryOn="@string/card_height_on"
+        android:title="@string/card_height_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="display_unread_count"
+        android:summaryOn="@string/switch_unread_count"
+        android:title="@string/switch_unread_count_title"
+        app:iconSpaceReserved="false"/>
+    <SwitchPreference
+        android:defaultValue="false"
+        android:dependency="display_unread_count"
+        android:key="display_other_count"
+        android:title="@string/display_all_counts_title"
+        app:iconSpaceReserved="false"/>
+
+</PreferenceScreen>
diff --git a/androidApp/src/main/res/xml/pref_links.xml b/androidApp/src/main/res/xml/pref_links.xml
new file mode 100644
index 0000000..7d8387f
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_links.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference android:title="@string/issue_tracker_link"
+                android:summary="@string/issue_tracker_summary"
+                android:key="trackerLink"
+                app:iconSpaceReserved="false"/>
+
+    <Preference android:title="@string/source_code"
+        android:key="sourceLink"
+        app:iconSpaceReserved="false"/>
+
+    <Preference android:title="@string/translation"
+        android:key="translation"
+        app:iconSpaceReserved="false"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/androidApp/src/main/res/xml/pref_main.xml b/androidApp/src/main/res/xml/pref_main.xml
new file mode 100644
index 0000000..9a24689
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_main.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/title_activity_settings">
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$GeneralPreferenceFragment"
+        android:title="@string/pref_header_general"
+        android:icon="@drawable/ic_settings_black_24dp" />
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ArticleViewerPreferenceFragment"
+        android:title="@string/pref_header_viewer"
+        android:icon="@drawable/ic_chrome_reader_mode_black_24dp" />
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$OfflinePreferenceFragment"
+        android:title="@string/pref_header_offline"
+        android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ThemePreferenceFragment"
+        android:title="@string/pref_header_theme"
+        android:icon="@drawable/ic_color_lens_black_24dp" />
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$LinksPreferenceFragment"
+        android:title="@string/pref_header_links"
+        android:icon="@drawable/ic_info_black_24dp" />
+
+    <Preference
+        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ExperimentalPreferenceFragment"
+        android:title="@string/pref_header_experimental"
+        android:icon="@drawable/ic_widgets_black_24dp" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/androidApp/src/main/res/xml/pref_offline.xml b/androidApp/src/main/res/xml/pref_offline.xml
new file mode 100644
index 0000000..a5418f4
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_offline.xml
@@ -0,0 +1,50 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="items_caching"
+        app:iconSpaceReserved="false"
+        android:summaryOff="@string/pref_switch_items_caching_off"
+        android:summaryOn="@string/pref_switch_items_caching_on"
+        android:title="@string/pref_switch_items_caching" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="periodic_refresh"
+        android:dependency="items_caching"
+        app:iconSpaceReserved="false"
+        android:summaryOff="@string/pref_switch_periodic_refresh_off"
+        android:summaryOn="@string/pref_switch_periodic_refresh_on"
+        android:title="@string/pref_switch_periodic_refresh" />
+
+    <EditTextPreference
+        android:dependency="periodic_refresh"
+        android:defaultValue="360"
+        android:inputType="number"
+        app:iconSpaceReserved="false"
+        android:key="periodic_refresh_minutes"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_periodic_refresh_minutes_title" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        app:iconSpaceReserved="false"
+        android:key="refresh_when_charging"
+        android:dependency="periodic_refresh"
+        android:title="@string/pref_switch_refresh_when_charging" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        app:iconSpaceReserved="false"
+        android:key="notify_new_items"
+        android:dependency="periodic_refresh"
+        android:title="@string/pref_switch_notify_new_items" />
+
+    <SwitchPreference
+        android:defaultValue="true"
+        app:iconSpaceReserved="false"
+        android:key="update_sources"
+        android:summary="@string/pref_switch_update_sources_summary"
+        android:title="@string/pref_switch_update_sources" />
+</PreferenceScreen>
diff --git a/androidApp/src/main/res/xml/pref_theme.xml b/androidApp/src/main/res/xml/pref_theme.xml
new file mode 100644
index 0000000..fb86ec3
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_theme.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!-- TODO translate this file -->
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="dark_theme"
+        app:iconSpaceReserved="false"
+        android:title="Dark theme" />
+
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="@color/colorPrimary"
+        android:key="color_primary"
+        app:iconSpaceReserved="false"
+        android:title="Primary color"/>
+
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="@color/colorPrimaryDark"
+        android:key="color_primary_dark"
+        app:iconSpaceReserved="false"
+        android:title="Primary dark color"/>
+
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="@color/colorAccent"
+        android:key="color_accent"
+        app:iconSpaceReserved="false"
+        android:title="Accent color"/>
+
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="@color/colorAccentDark"
+        android:key="color_accent_dark"
+        app:iconSpaceReserved="false"
+        android:title="Accent dark color"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/androidApp/src/main/res/xml/pref_viewer.xml b/androidApp/src/main/res/xml/pref_viewer.xml
new file mode 100644
index 0000000..55a6dcc
--- /dev/null
+++ b/androidApp/src/main/res/xml/pref_viewer.xml
@@ -0,0 +1,26 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="mark_on_scroll"
+        app:iconSpaceReserved="false"
+        android:summaryOff="@string/pref_switch_actions_pager_scroll_off"
+        android:summaryOn="@string/pref_switch_actions_pager_scroll_on"
+        android:title="@string/pref_switch_actions_pager_scroll" />
+
+    <EditTextPreference
+        android:defaultValue="16"
+        android:inputType="number"
+        android:key="reader_font_size"
+        app:iconSpaceReserved="false"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:title="@string/pref_content_reader_font_size" />
+    <ListPreference
+        android:defaultValue="1"
+        android:entries="@array/preloaded_fonts_values"
+        android:entryValues="@array/preloaded_fonts_keys"
+        android:key="reader_font"
+        app:iconSpaceReserved="false"
+        android:title="@string/settings_reader_font" />
+</PreferenceScreen>
diff --git a/androidApp/version.sh b/androidApp/version.sh
new file mode 100755
index 0000000..3bb4033
--- /dev/null
+++ b/androidApp/version.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# You can pass --force as first parameter to force push and tag creation.
+
+echo "Creating tag $@"
+
+TAG="v$@"
+git tag ${TAG}
+
+echo "Pushing tag"
+
+git push origin ${TAG}
diff --git a/check-for-issues.sh b/check-for-issues.sh
new file mode 100755
index 0000000..d03ab4a
--- /dev/null
+++ b/check-for-issues.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+./gradlew clean --info
+./gradlew assembleAndroidTest --info
+./gradlew assembleDebug --info
+./gradlew assemble --info
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 0000000..62ace39
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,5 @@
+files:
+  - source: /androidApp/src/main/res/values/strings.xml
+    translation: /androidApp/src/main/res/values-%android_code%/%original_file_name%
+    translate_attributes: '0'
+    content_segmentation: '0'
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000..8269cdb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,13 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+What it does:
+
+<ul>
+  <li>Fetches read, unread, and favorite feeds.</li>
+  <li>Marking as read, marking as favorite.</li>
+  <li>Manage selfoss sources from the app.</li>
+  <li>Add an RSS feed from within the app, or by sharing a link from your browser.</li>
+  <li>Choose between multiple light and dark themes.</li>
+</ul>
+
+PS: It only works with Selfoss
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
new file mode 100644
index 0000000..1bb345b
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
new file mode 100644
index 0000000..46505c0
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
new file mode 100644
index 0000000..1bf2284
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
new file mode 100644
index 0000000..cff0d8d
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
new file mode 100644
index 0000000..47efe63
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000..543c361
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1,3 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+It connects to your selfoss instance (works only with selfoss, and can't work without it), and you'll be able to read and manage all your RSS feeds.
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 0000000..751debe
--- /dev/null
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+Reader for Selfoss
\ No newline at end of file