Merge dandelion news and FAQ content all into markdown files in the dandelion repository

Update translations, project info
Crowdin add Estonian, Update translations (PR #297 )
2025-09-09 10:19:42 +02:00 · 2023-02-11 03:07:41 +01:00 · 2023-01-28 17:21:07 +01:00 · 2022-12-08 14:16:52 +01:00 · 2022-07-13 01:51:31 +02:00 · 2022-05-28 19:03:18 +00:00
314 changed files with 16331 additions and 6846 deletions
--- a/.atomignore
+++ b/.atomignore
@ -15,3 +15,9 @@ app/build
 app/.gitignore
 app/pom.xml
 app/proguard-rules.pro
+.hidden
+.travis.yml
+circle.yml
+CODE_OF_CONDUCT*
+gradle.properties
+LICENSE*
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,53 +1,24 @@
 #### General information

+* **App version:** 
+* **System:** 
+* **Pod:**

-* **Android Device:**
-* **Android API Version:** 
-* **App version:**
-* **App source:**
-* **Pod version:**
+#### Description


+#### Log
+
 <!--
-I have:
+  Look for already reported issues before posting!
+  Also take a look at documentation and wiki, or write in the project chat.

- At least version 0.2.0 installed, see About-> Debug. If it is not visible you have an very old version, and 
-  your issue will be closed.
- searched open and closed issues for duplicates
- read <https://github.com/Diaspora-for-Android/dandelion/blob/master/CONTRIBUTING.md>
- not submitted translations - see [Crowdin](https://crowdin.com/project/diaspora-for-android/invite)  
+  App version: The version of the app installed and the installation source. Example: v0.3.5 F-Droid
+               Please keep in mind that only the latest downloadable version is supported and that there are no backports to older versions.
+  System:      Information about where the app is running. Give all details you know, but at least the Android OS version.
+               Example: Android 8.0.1, Nexus 5, LineageOS
+
+  Description:
+  What this is about, what happens and what is expected to happen. What needs to be done for it to happen.
+  If a crash is happening a log is needed. Screenshots or demonstration videos are always helpful too.
 -->
-
-#### Steps to reproduce
-
-1. …
-2. …
-3. …
-
-
-#### Expected result
-**What is the expected output?** 
-
-**What do you see instead?**
-
-
-Upload screenshots via drag&drop if needed and apply resizing:
-`<img width="30%" height="30%" src="https://cloud.githubusercontent.com/assets/67..b55.jpg">`
-
-
-#### Debug output
-
-Please post the output of adb logcat. The log should begin with the start of dandelion* and include all the steps it takes to reproduce the problem.
-IMPORTANT: In-App debug log must be activated and the app restarted first!
-
-````
-adb logcat -s com.github.dfa.diaspora_android
-````
-
-#### In-App debug log
-
-This is useful for visual bugs without application crashes
-
-````
-You can long click on the in-app debug log in order to copy it to the clipboard
-````
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@ -0,0 +1,27 @@
+
+
+
+
+
+
+<!-- 
+Hello, and thanks for contributing!
+
+Please always do auto-reformat on code before creating a PR.
+In Android-Studio do a right-click on java->Reformat and check the first two options.
+
+After creating the PR please wait patiently till somebody from the team has time to give a review.
+The top-priority requirement for this to get merged is, that building/tests don't fail.
+If theres an continious integration system integrated in this project, you should see a colored checkmark in the PR window which tells the status.
+
+## Contributors document
+Add yourself! When adding your information to the `CONTRIBUTORS.md` file, please use the following format:
+
+Schema:  **[Name](Reference)**<br/>~° Text 
+Where: 
+  * Name: username, first/lastname 
+  * Reference: E-Mail, Webpage 
+  * Text: Information about / kind of contribution 
+Example:
+* **[Nice Guy](http://niceguy.web)**<br/>~° German localization 
+-->
--- a/.github/workflows/build-android-project.yml
+++ b/.github/workflows/build-android-project.yml
@ -0,0 +1,68 @@
+##############################################################################################################################
+# # Cleanup:
+#const sleep = ms => () => new Promise((resolve, reject) => window.setTimeout(resolve, ms));
+#Promise.resolve()
+#.then(() => {  document.getElementsByClassName("details-overlay details-reset position-relative d-inline-block ")[3].children[0].click();  })
+#.then(sleep(500))
+#.then(() => {  document.getElementsByClassName("dropdown-item btn-link menu-item-danger")[0].click();  })
+#.then(sleep(1000))
+#.then(() => {  document.getElementsByClassName("btn btn-block btn-danger")[0].click();});
+#
+# while [ 1 ] ; do sleep 4; xdotool key Up; sleep 0.1; xdotool key Return; done
+##############################################################################################################################
+
+name: "CI"
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, 'ci skip') && (!contains(github.event_name, 'pull_request') || (contains(github.event_name, 'pull_request') && github.event.pull_request.head.repo.full_name != github.repository))"
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: "Checkout: Code"
+      uses: actions/checkout@v2
+
+
+    - name: "Checkout: Code (PR)"
+      uses: actions/checkout@v2
+      if: "contains(github.event_name, 'pull_request')"
+      with:
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: "Setup: Java"
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: "Cache: Gradle"
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.gradle
+          .gradle
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.*') }}
+
+    - name: "Build: Project with make"
+      run: make clean all
+
+    - name: "Build: List dist files"
+      if: always()
+      run: find dist -type f -maxdepth 2
+
+    - name: "Artifacts: All"
+      if: always()
+      uses: actions/upload-artifact@v2.2.1
+      with:
+        name: "all"
+        path: dist
+        retention-days: 5
+
+    - name: "Artifacts: Android APK"
+      uses: actions/upload-artifact@v2.2.1
+      with:
+        name: "android-apk"
+        path: |
+          dist/*.apk
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +1,3 @@
-##############
-### Project ##
-app/src/main/res/raw/changelog.md
-app/src/main/res/raw/contributors.md
-app/src/main/res/raw/license.md
-app/src/main/res/raw/readme.md
-app/src/main/res/raw/contributors.txt
-#app/src/main/res/raw/podlist.json
-
 ##############
 ### Common ###
 *~*
@ -45,6 +36,7 @@ tmp/
 ### Gradle ###
 .gradle
 build/
+dist/
 gradle-app.setting

 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
@ -99,3 +91,14 @@ proguard/
 # Android Studio Stuff
 .navigation/
 gen-external-apklibs
+
+### Project ##
+app/src/main/res/raw/changelog.*
+app/src/main/res/raw/license.*
+app/src/main/res/raw/readme.*
+app/src/main/res/raw/contributors.*
+app/flavor*
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
--- a/.travis.yml
+++ b/.travis.yml
@ -1,38 +0,0 @@
-language: android
-jdk:
-  - oraclejdk8
-android:
-  components:
-    - tools
-    - tools # TODO https://github.com/travis-ci/travis-ci/issues/6193
-    - platform-tools
-    - build-tools-24.0.3
-    - android-24
-    - extra-android-m2repository
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-script: "./gradlew $TASK"
-env:
-    - TASK="lintFlavorDefaultDebug"
-    - TASK="build check --stacktrace"
-
-branches:
-  except:
-  - l10n_master
-  - l10n_master2
-  - crowdin
-notifications:
-  webhooks:
-    urls:
-      - "https://webhooks.gitter.im/e/e462044d3105a7bb4b4f"
-      - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MGdzYW50bmVyJTNBbWF0cml4Lm9yZy8lMjFNUERTYURTaVBMZXdSQXBxa24lM0FtYXRyaXgub3Jn"
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,82 @@
+### Recent changes
+- See [Discussions](https://github.com/gsantner/dandelion/discussions), [Issues](https://github.com/gsantner/dandelion/issues) and [Project page](https://github.com/gsantner/dandelion#readme) to see what is going on.
+
+### v1.4.0
+- Add seconds to 'save picture' date format
+- Updated translations
+- Added german F-Droid description translation
+- Update to Android SDK 29
+
+### v1.3.0
+- Add option to open youtube links external/in YouTube app (optional)  
+- Pull to refresh  
+
+### v1.2.3
+**Improved:**  
+- More supported languages, more complete translations!  
+
+### v1.2.1
+**App release: dandelior**
+- Added an (rebranded) flavor of dandelion: dandelior
+- Only differenties in use are other (black) icon and AMOLED colors by default enabled
+- Already available on F-Droid
+
+**New features:**  
+- All new Aspects and Tags, using a searchable dialog
+
+**Fixed:**  
+- Sometimes the Stream went white, which is due an still (>3 years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.
+
+**Improved:**
+- Various small tweaks
+- Updated translation files
+
+### v1.1.3
+- Improve sharing *a lot*, add support for multiple filetypes
+- Support for downloading GIFs ;)
+- Rework screenshot saving and sharing; add new share options:
+- Merge license and changelog dialog on first start
+
+### v1.1.2
+- Fix: loading non-pod links outside customtab/external browser
+- Fix: webview-js dialog not dismissing correctly
+
+### v1.1.0
+- Added: App shortcuts (Android 7+)
+- Updated: podlist
+- More supported languages
+- File sharing fixes
+
+### v1.0.8
+- Modified: Navigation - Merge bottom toolbar into top
+- Updated: Build for Android O/27
+- Updated: Language change preference
+- Added: B/W coloring of toolbar popup
+
+### v1.0.5
+- Updated: Language preference
+
+### v1.0.4
+- Updated: README
+- Added: Hide statusbar option
+- Fixed: Language list
+- Added: Sardinian,Malayalam,Turkish translation
+
+### v1.0.3
+- Update opoc
+- Better visibility for counter badge
+- Refactor DiasporaPod model
+- Update PodList (many new pods!)
+- Fix CustomTab bug
+
+### v1.0.2 (2017-08-05)
+- Improve build script
+- Update translation file license
+
+### v1.0.1 (2017-07-30)
+- Update SimpleMarkdownParser
+- Move untranslatable strings
+
 ### v1.0.0 (2017-06-14)
 - Added AMOLED mode
 - Improve NavDrawer
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <gsantner AT mailbox DOT org>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,6 +0,0 @@
-We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)  
-If you got any questions feel free to join our IRC conference at `#diaspora-android @irc.freenode.net`.  
-Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
-
-We use Crowdin to translate dandelion\*. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
-If your desired language is not listed please contact the maintainers/owner.  
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -0,0 +1,32 @@
+<!--
+This file contains references to people who contributed to the app.
+
+Schema:  **[Name](Reference)**<br/>~° Text
+
+Where:
+  * Name: username, first/lastname
+  * Reference: E-Mail, Webpage
+  * Text: Information about / kind of contribution
+
+
+
+## LIST OF CONTRIBUTORS
+-->
+* **[Gregor Santner](http://github.com/gsantner)**<br/>~° Development of dandelion
+* **[Paul Schaub](https://github.com/vanitasvitae)**<br/>~° Development of dandelion
+* **[Martín Vukovic](martinvukovic AT protonmail DOT com)**<br/>~° Diaspora Native WebApp
+* **[Gaukler Faun](https://github.com/scoute-dich)**<br/>~° Diaspora Native WebApp additions
+* **[Airon90](https://diasp.eu/u/airon90)**<br/>~° Italian translation
+* **[Nacho Fernández](nacho_f AT joindiaspora DOT com)**<br/>~° Spanish translation
+* **[Naofumi Fukue](https://github.com/naofum)**<br/>~° Japanese translation
+* **[pskosinski](email AT pskosinski DOT pl)**<br/>~° Polish translation
+* **[SansPseudoFix](https://github.com/SansPseudoFix)**<br/>~° French translation
+* **[Zsolt Szakács](maxigaz AT diaspora DOT zone)**<br/>~° Hungarian translation
+* **[Luís F.S. Rosa](https://github.com/luisfsr)**<br/>~° Brazilian Portuguese translation
+* **[Danilo Raffaelli](https://crowdin.com/profile/Daraf)**<br/>~° Italian translation
+* **[Âng Iōngchun](https://pubpod.alqualonde.org/u/iongchun)**<br/>~° Chinese traditional translation
+* **[Mikkel Kirkgaard Nielsen](http://www.mikini.dk)**<br/>~° Danish translation
+* **[Jean Lucas](jean AT 4ray DOT co)**<br/>~° Spanish translation
+* **[asereze](https://github.com/asereze)**<br/>~° Sardinian translation
+* **[Xosé M. Lamas](http://xmgz.eu)**<br />~° Galician translation
+* **[massimiliano](https://framagit.org/massimiliano)**<br />~° Contributor
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@ -1,24 +0,0 @@
-00l>> This file contains references to people who contributed to the app.
-01l>> If you helped by translating the app, please send a message on Crowdin.  
-02l>> You can also send a mail to [gdev AT live DOT de](https://gsantner.github.io/about/email/) to get included.
-03l>>  
-04l>> Schemes:  
-05l>>   Firstname Lastname (Link): Text  
-06l>>   Firstname Lastname (E-Mail): Text  
-07l>>   Username (Link): Text  
-08l>>   Username (E-Mail): Text  
-## 99l CONTRIBUTORS
-Abhijith Balan (abhijithb21 AT openmailbox DOT org): Malayalam translation
-Airon90 (https://diasp.eu/u/airon90): Italian translation
-Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions
-Martín Vukovic (martinvukovic AT protonmail DOT com): Diaspora Native WebApp
-Nacho Fernández (nacho_f AT joindiaspora DOT com): Spanish translation
-Naofumi Fukue (https://github.com/naofum): Japanese translation
-pskosinski (email AT pskosinski DOT pl): Polish translation
-SansPseudoFix (https://github.com/SansPseudoFix): French translation
-secitem (secitem AT tuta DOT io): Czech translation
-Zsolt Szakács (maxigaz AT diaspora DOT zone): Hungarian translation
-Danilo Raffaelli (https://crowdin.com/profile/Daraf): Italian translation
-O'Loubám (loubam AT diasp DOT org): Galician translation
-transifex3 (https://crowdin.com/profile/transifex3): Korean translation
-Âng Iōngchun (https://pubpod.alqualonde.org/u/iongchun): Chinese traditional translation
--- a/99
+++ b/99
@ -0,0 +1,99 @@
+# License of Makefile: Public Domain / CC0
+.PHONY: $(shell sed -n -e '/^$$/ { n ; /^[^ .\#][^ ]*:/ { s/:.*$$// ; p ; } ; }' $(MAKEFILE_LIST))
+.NOTPARALLEL: clean
+.DEFAULT_GOAL := all
+
+env-%:
+	@: $(if ${${*}},,$(error Environment variable $* not set))
+####################################################################################
+
+DIST_DIR = dist
+MOVE = mv
+
+all: $(DIST_DIR) spellcheck lint deptree test build aapt_dump_badging
+
+####################################################################################
+
+$(DIST_DIR):
+	mkdir -p ${DIST_DIR}
+
+ANDROID_BUILD_TOOLS := $(shell test -n "$ANDROID_SDK_ROOT" && find "${ANDROID_SDK_ROOT}/build-tools" -iname "aapt" | sort -r | head -n1 | xargs dirname)
+TOOL_SPELLCHECKING_ISPELL := $(shell command -v ispell 2> /dev/null)
+
+FLAVOR := $(or ${FLAVOR},${FLAVOR},Atest)
+
+.NOTPARALLEL: gradle gradle-analyze-log
+gradle: env-ANDROID_SDK_ROOT
+	mkdir -p $(DIST_DIR)/log/
+	chmod +x gradlew
+	./gradlew --no-daemon --parallel --stacktrace $A  2>&1 | tee "$(DIST_DIR)/log/gradle.log"
+	@echo "-----------------------------------------------------------------------------------"
+
+gradle-analyze-log:
+	mv  "$(DIST_DIR)/log/gradle.log" "$(DIST_DIR)/log/gradle$A.log"
+	cat "$(DIST_DIR)/log/gradle$A.log" | grep "BUILD " | tail -n1 | grep -q "BUILD SUCCESSFUL in"
+
+adb: env-ANDROID_SDK_ROOT
+	"${ANDROID_SDK_ROOT}/platform-tools/adb" $A 2>&1 | tee "$(DIST_DIR)/log/adb-$L.log"
+
+aapt: env-ANDROID_SDK_ROOT
+	"${ANDROID_BUILD_TOOLS}/aapt" $A 2>&1 | grep -v 'application-label-' | tee "$(DIST_DIR)/log/aapt$L.log"
+
+build:
+	rm -f $(DIST_DIR)/*.apk
+	$(MAKE) A="clean assembleFlavor$(FLAVOR) -x lint" gradle
+	find app -type f -newermt '-300 seconds' -iname '*.apk' -not -iname '*unsigned.apk' | xargs cp -R -t $(DIST_DIR)/
+	$(MAKE) A="-build" gradle-analyze-log
+
+lint:
+	rm -Rf $(DIST_DIR)/lint
+	mkdir -p $(DIST_DIR)/lint/
+	$(MAKE) A="lintFlavorDefaultDebug" gradle
+	find app -type f -iname 'lint-results-*' | grep -v 'intermediates' | xargs cp -R -t $(DIST_DIR)/lint
+	$(MAKE) A="-lint" gradle-analyze-log
+
+test:
+	rm -Rf $(DIST_DIR)/tests
+	$(MAKE) A="testFlavorDefaultDebugUnitTest -x lint" gradle
+	mkdir -p app/build/test-results/testFlavorDefaultDebugUnitTest && echo 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHRlc3RzdWl0ZSBuYW1lPSJkdW1teSIgdGVzdHM9IjEiIHNraXBwZWQ9IjAiIGZhaWx1cmVzPSIwIiBlcnJvcnM9IjAiIHRpbWVzdGFtcD0iMjAyMC0xMi0wOFQwMDowMDowMCIgaG9zdG5hbWU9ImxvY2FsaG9zdCIgdGltZT0iMC4wMSI+CiAgPHByb3BlcnRpZXMvPgogIDx0ZXN0Y2FzZSBuYW1lPSJkdW1teSIgY2xhc3NuYW1lPSJkdW1teSIgdGltZT0iMC4wMSIvPgogIDxzeXN0ZW0tb3V0PjwhW0NEQVRBW11dPjwvc3lzdGVtLW91dD4KICA8c3lzdGVtLWVycj48IVtDREFUQVtdXT48L3N5c3RlbS1lcnI+CjwvdGVzdHN1aXRlPgo=' | base64 -d > 'app/build/test-results/testFlavorDefaultDebugUnitTest/TEST-dummy.xml'
+	find app -type d -iname 'testFlavorDefaultDebugUnitTest' | xargs cp -R -t $(DIST_DIR)/
+	mv ${DIST_DIR}/testFlavorDefaultDebugUnitTest $(DIST_DIR)/tests
+	$(MAKE) A="-test" gradle-analyze-log
+
+deptree:
+	$(MAKE) A="app:dependencies --configuration flavor$(FLAVOR)DebugRuntimeClasspath" gradle
+	$(MAKE) A="-dependency-tree" gradle-analyze-log
+
+clean:
+	$(MAKE) A="clean" gradle
+	rm -Rf $(DIST_DIR) app/build app/flavor* .idea dist
+	find . -type f -iname "*.iml" -delete
+	$(MAKE) $(DIST_DIR)
+	@echo "-----------------------------------------------------------------------------------"
+
+install:
+	$(MAKE) A="install -r $(DIST_DIR)/*.apk" L="install" adb
+
+run:
+	$(MAKE) A="shell monkey -p $$(aapt dump badging $(DIST_DIR)/*.apk | grep package: | sed 's@.* name=@@' | sed 's@ .*@@' | xargs | head -n1) -c android.intent.category.LAUNCHER 1" L="run" adb
+
+aapt_dump_badging:
+	$(MAKE) A="dump badging $(DIST_DIR)/*.apk" aapt
+	@echo "-----------------------------------------------------------------------------------"
+
+spellcheck:
+	mkdir -p "$(DIST_DIR)/lint/"
+ifndef TOOL_SPELLCHECKING_ISPELL
+	@echo "Tool ispell (spellcheck) not found in PATH. Spellcheck skipped." > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+else
+	@echo "Use ispell for spellchecking the original values/strings.xml"
+	find . -iname "strings.xml" -path "*/main*/values/*" | head -n1 | xargs cat \
+	   | grep "<string name=" | sed 's@.*">@@' | sed 's@</string>@@' | sed 's@\\n@  @g' | sed 's@\\@@g'  \
+	   | ispell -W3 -a | grep ^\& | sed 's@[0-9]@@g' | sort | uniq | cut -d, -f1-4 \
+	   | sed 's@^..@- @' | column -t -s: \
+	   > "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "\nPotential words with bad spelling:"
+endif
+	@cat "$(DIST_DIR)/lint/stringsxml-spellcheck.txt"
+	@echo "-----------------------------------------------------------------------------------"
+
--- a/NEWS.md
+++ b/NEWS.md
@ -0,0 +1,96 @@
+# dandelion - News
+
+## General
+
+### Installation
+You can install and update from [F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android) or [GitHub](https://github.com/gsantner/dandelion/releases/latest).
+
+F-Droid is a store for free & open source apps.
+The *.apk's available for download are signed by the F-Droid team and guaranteed to correspond to the (open source) source code of dandelion.
+Generally this is the recommended way to install dandelion & keep it updated.
+
+
+### Get informed
+* Check the [project readme](https://github.com/gsantner/dandelion/tree/news#readme) for general project information.
+* Check the [project news](https://github.com/gsantner/dandelion/blob/master/NEWS.md#readme) for more details on what is going on.
+* Check the [project git history](https://github.com/gsantner/dandelion/commits/master) for most recent code changes.
+
+### The right place to ask
+If you have questions or found an issue please head to the [dandelion project](https://github.com/gsantner/dandelion/issues/new/choose) and ask there. 
+[Search](https://github.com/gsantner/dandelion/issues?q=#js-issues-search) for same/similar and related issues/questions before, it might be already answered or resolved.   
+
+
+### Navigation
+* [dandelion v1.2 - Add dandelior - Searchable Tags and Aspects](#dandelion-v12---add-dandelior---searchable-tags-and-aspects)
+* [dandelion v0.1.2 - Aspekte, Pod wechseln](#dandelion-v012---aspekte-pod-wechseln)
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion\* v1.2 - Add dandelior\* - Searchable Tags and Aspects
+_12. August 2018_
+
+## dandelior\* is a rebranded version of dandelion\*
+dandelior\* is based 100% on the same code and resources as dandelion\*. Its from the same code repository, just a different build flavor. 
+The main purpose of dandelior\* is the most requested feature till date - to support multiple accounts / another account at dandelion\*.
+
+- Added an (rebranded) flavor of dandelion: dandelior
+- Only differenties in use are other (black) icon and AMOLED colors by default enabled
+- Already available on F-Droid
+
+**New features:**  
+- All new Aspects and Tags, using a searchable dialog
+
+**Fixed:**  
+- Sometimes the Stream went white, which is due an still (3+ years) unfixed Android Support library bug. It should not occur very often anymore due less use of fragments.
+
+**Improved:**
+- Various small tweaks
+- Updated translation files
+
+
+
+
+
+
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------------------------------------------------------------
+
+
+# dandelion v0.1.2 - Aspekte, Pod wechseln
+_05. Juni 2016_
+
+In den letzten Tagen hat @gsantner viel Zeit in die inoffizielle diaspora\* Android App ([dandelion\*](https://github.com/gsantner/dandelion)) investiert.
+
+Dabei wurden unter anderem folgende Änderungen beigesteuert:
+
+- Allgemeines zur Usability
+- Animationen für den Activity-Wechsel und Startup, WebView-Scroll-Top
+- Podliste caching
+- Aspekt-Liste und Aspekte hinzugefügt
+- Verbessertes Sharing aus der App
+- Material Progressbar
+- Suche verbessert
+- Collapsing top menu
+- toolbar/actions/menu geändert, fab entfernt
+- Refactoring layout & menu files, dialogs
+- Überarbeitete Main,Splash,PodSelectionActivity
+- Pod wechseln
--- a/README.md
+++ b/README.md
@ -1,48 +1,81 @@
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android)
-
-<a name="badgers"></a>[![CircleCI](https://circleci.com/gh/Diaspora-for-Android/dandelion.svg?style=shield)](https://circleci.com/gh/Diaspora-for-Android/dandelion)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/diaspora-for-android/localized.svg)](https://crowdin.com/project/diaspora-for-android)
-[![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)
-
-
+[![GitHub releases](https://img.shields.io/github/tag/gsantner/dandelion.svg)](https://github.com/gsantner/dandelion/releases)
+[![GitHub downloads](https://img.shields.io/github/downloads/gsantner/dandelion/total.svg?logo=github&logoColor=lime)](https://github.com/gsantner/dandelion/releases)
+[![Translate on Crowdin](https://img.shields.io/badge/translate-crowdin-green.svg)](https://crowdin.com/project/diaspora-for-android/invite)
+[![Chat on Matrix](https://img.shields.io/badge/chat-matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)
+[![GitHub CI](https://github.com/gsantner/dandelion/workflows/CI/badge.svg)](https://github.com/gsantner/dandelion/actions)
+[![Codacy code quality](https://img.shields.io/codacy/grade/aff869c440bc48b7bd64680e97cbc453)](https://www.codacy.com/app/gsantner/dandelion)

 # dandelion\*
-FORMERLY KNOWN AS DIASPORA-FOR-ANDROID
+<img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
+This is an unofficial webview based client for the community-run, distributed social network <b><a href="https://diasporafoundation.org/">diaspora*</a></b>.

-This is an unofficial webview based client for the community-run, distributed social network **[diaspora*](https://diasporafoundation.org/)**. It's currently under development and should be used with that in mind. Please submit any bugs you might find.
+<div style="display:flex;" >
+<a href="https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android">
+    <img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">
+</a>
+<!--<a href="https://play.google.com/store/apps/details?id=com.github.dfa.diaspora_android">
+    <img alt="Get it on Google Play" height="80" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" />
+</a>-->
+</div></br>

- Download latest release on ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android))
- Download latest nightly - [secondlion\*](https://gsantner.gitlab.io/fdroid/latest/com.github.dfa.secondlion.apk)
- Watch [Changelog](https://github.com/Diaspora-for-Android/dandelion/blob/master/CHANGELOG.md)
- See [Screenshots](https://github.com/Diaspora-for-Android/dandelion/blob/master/SCREENSHOTS.md)
- Get updates from our diaspora\* account: [dandelion00@diasp.org](https://diasp.org/people/48b78420923501341ef3782bcb452bd5)

-## Contributions
-We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)
-If you got any questions feel free to contact us on IRC, XMPP or Gitter. You can start chatting by clicking on the [blue chat badges](#badgers) listed on top.
+## Description
+This is an unofficial webview based client for the community-run, distributed social network <b><a href="https://diasporafoundation.org/">diaspora*</a></b>.
+It's currently under development and should be used with that in mind. Please submit any bugs you might find.

-We use Crowdin to translate dandelion\*. Join our project here: <https://crowdin.com/project/diaspora-for-android/invite>. If your desired language is not listed please contact the maintainers/owner.
-
-Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
-
-### License
-dandelion\* is released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/dandelion/blob/master/LICENSE.md)).
-
-### WebApp
-The app is developed as a WebApp because currently diaspora\* doesn't have an API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on. That's why there are only WebApps for diaspora\* out there.
+#### WebApp
+The app is developed as a WebApp because currently diaspora\* doesn't have an functional API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on. That's why there are currently only WebApps for diaspora\* out there.
 [Stay tuned on diaspora\* issues](https://github.com/diaspora/diaspora/labels/api) about API.

 Why is a WebApp better than using the mobile site on a browser?
 Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)

-### Device Requirements
+#### Device Requirements
 The minimum Android version supported is Jelly Bean, Android v4.2.0 / API 17

-### App Permissions
+### Privacy & Permissions<a name="privacy"></a>
 dandelion\* requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.

-## Maintainers
- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
-  - Bitcoin: [1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5](https://gsantner.github.io/donate/#donate)
+
+## Contributions
+The project is always open for contributions and accepts pull requests.
+The project uses [AOSP Java Code Style](https://source.android.com/source/code-style#follow-field-naming-conventions), with one exception: private members are `_camelCase` instead of `mBigCamel`. You may use Android Studios _auto reformat feature_ before sending a PR.
+
+Translations can be contributed on GitHub. You can use Stringlate ([![Translate - with Stringlate](https://img.shields.io/badge/stringlate-translate-green.svg)](https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fgsantner%2Fdandelion.git)) to translate the project directly on your Android phone. It allows you to export as E-Mail attachement and to post on GitHub.
+
+Join our Matrix channel and say hello! Don't be afraid to start talking. [![Chat - Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#dandelion:matrix.org)  
+Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
+
+
+#### Resources
+* Project: [Changelog](/CHANGELOG.md) | [Issues level/beginner](https://github.com/gsantner/dandelion/issues?q=is%3Aissue+is%3Aopen+label%3Alevel%2Fbeginner) | [License](/LICENSE.txt) | [CoC](/CODE_OF_CONDUCT.md)
+* Project diaspora\* account: [dandelion00@diasp.org](https://diasp.org/people/48b78420923501341ef3782bcb452bd5)
+* diaspora\*: [GitHub](https://github.com/diaspora/diaspora) | [Web](https://diasporafoundation.org) | [d\* HQ account](https://pod.diaspora.software/people/7bca7c80311b01332d046c626dd55703)
+* App on F-Droid: [Metadata](https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/com.github.dfa.diaspora_android.txt) | [Page](https://f-droid.org/packages/com.github.dfa.diaspora_android/) | [Wiki](https://f-droid.org/wiki/page/com.github.dfa.diaspora_android) | [Build log](https://f-droid.org/wiki/page/com.github.dfa.diaspora_android/lastbuild)
+
+
+## Licensing
+dandelion\* is released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/gsantner/dandelion/blob/master/LICENSE.md)).
+The app is licensed GPL v3. Localization files and resources (strings\*.xml) are licensed CC0 1.0.
+For more licensing informations, see [`3rd party licenses`](/app/src/main/res/raw/licenses_3rd_party.md).
+
+## Screenshots
+<div style="display:flex;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/01.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/02.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/03.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/04.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/05.png" width="19%" style="margin-left:10px;" >
+</div>
+
+<div style="display:flex;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/06.png" width="19%" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/07.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/08.png" width="19%" style="margin-left:10px;" >
+	<img src="https://raw.githubusercontent.com/gsantner/dandelion/master/metadata/en-US/phoneScreenshots/09.png" width="19%" style="margin-left:10px;" >
+</div>
+
+### Notice
+#### Maintainers
+- gsantner ([GitHub](https://github.com/gsantner), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
 - vanitasvitae ([GitHub](https://github.com/vanitasvitae), [diaspora*](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
-  - Bitcoin: 1Ao3W6NaQv3xKppviB7RSFKjHo6PGd8RTy
--- a/SCREENSHOTS.md
+++ b/SCREENSHOTS.md
@ -1,24 +0,0 @@
-<table>
- <tr>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/01.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/02.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/03.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/04.png" height="60%" width="60%"></td>
- </tr>
-<tr>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/05.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/06.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/07.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/08.png" height="60%" width="60%"></td>
-</tr>
-<tr>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/09.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/10.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/11.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/12.png" height="60%" width="60%"></td>
-</tr>
-<tr>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/13.png" height="60%" width="60%"></td>
-	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/14.png" height="60%" width="60%"></td>
-</tr>
-</table>
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,33 +1,32 @@
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
+if (enable_plugin_kotlin) {
+    apply plugin: 'kotlin-android'
+    apply plugin: 'kotlin-android-extensions'
+    apply plugin: 'kotlin-kapt'
+}

 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion rootProject.ext.version_buildTools
+    compileSdkVersion rootProject.ext.version_compileSdk

    defaultConfig {
-        minSdkVersion 17
-        targetSdkVersion 24
-
-        versionCode 20
-        versionName "1.0.0"
-
+        resValue "string", "manifest_package_id", "com.github.dfa.diaspora_android"
        applicationId "com.github.dfa.diaspora_android"
-        resValue 'string', 'app_name', "dandelion*"
-        manifestPlaceholders = [appIcon: "@drawable/ic_launcher"]
+        versionName "1.3.5"
+        versionCode 46
+        vectorDrawables.useSupportLibrary = true

+        minSdkVersion rootProject.ext.version_minSdk
+        targetSdkVersion rootProject.ext.version_compileSdk
        buildConfigField "boolean", "IS_TEST_BUILD", "false"
        buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
-
-        vectorDrawables.useSupportLibrary = true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+        buildConfigField "String[]", "DETECTED_ANDROID_LOCALES", "${findUsedAndroidLocales()}"
+        buildConfigField "String", "BUILD_DATE", "\"${getBuildDate()}\""
+        buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
+        setProperty("archivesBaseName", applicationId + "-v" + versionCode + "-" + versionName)
    }

+    flavorDimensions "default"
    productFlavors {
        flavorDefault {
        }
@ -35,78 +34,103 @@ android {
        /*
        flavorGplay {
            buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
-        }
-        */
+        }*/

-        flavorTest {
-            applicationId "com.github.dfa.secondlion"
-            resValue 'string', 'app_name', "secondlion*"
-            manifestPlaceholders = [appIcon: "@drawable/ic_launcher_test"]
+        flavorDandelior {
+            applicationId "net.gsantner.dandelior"
+        }
+
+        flavorAtest {
+            applicationId "net.gsantner.secondlion"
            versionCode = Integer.parseInt(new Date().format('yyMMdd'))
            versionName = new Date().format('yyMMdd')
            buildConfigField "boolean", "IS_TEST_BUILD", "true"
        }
    }
-    lintOptions {
-        disable 'MissingTranslation'
-    }
-}

-// Additional repositories
-repositories {
-    maven {
-        url "https://jitpack.io"
+    sourceSets {
+        main { assets.srcDirs = ['src/main/assets'] }
+        if (enable_plugin_kotlin) {
+            main.java.srcDirs += 'src/main/kotlin'
+        }
+        main.java.srcDirs +=  'thirdparty/java'
+        main.res.srcDirs +=  'thirdparty/res'
+        main.assets.srcDirs +=  'thirdparty/assets'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            eachDependency { details ->
+                if (details.requested.group == 'com.android.support') {
+                    if (details.requested.name != 'multidex' && details.requested.name != 'multidex-instrumentation') {
+                        details.useVersion "${rootProject.ext.version_library_appcompat}"
+                    }
+                }
+            }
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE-LGPL-2.1.txt'
+        exclude 'META-INF/LICENSE-LGPL-3.txt'
+        exclude 'META-INF/LICENSE-W3C-TEST'
+    }
+
+    compileOptions {
+        encoding = 'UTF-8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        disable 'MissingTranslation', 'InvalidPackage', 'ObsoleteLintCustomCheck', 'DefaultLocale', 'UnusedAttribute', 'VectorRaster', 'InflateParams', 'IconLocation', 'UnusedResources', 'TypographyEllipsis'
+        abortOnError false
    }
 }

 dependencies {
    // Sub-Projects
-    //compile project(':subprojectFromRoot')
+    //implementation project(':subprojectFromRoot')

    // Jars
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'

    // Android standard libs
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0
-    compile 'com.android.support:support-v4:24.2.1'
-    compile 'com.android.support:customtabs:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
+    implementation "com.android.support:appcompat-v7:${version_library_appcompat}"
+    implementation "com.android.support:design:${version_library_appcompat}"
+    implementation "com.android.support:support-v4:${version_library_appcompat}"
+    implementation "com.android.support:customtabs:${version_library_appcompat}"
+    implementation "com.android.support:cardview-v7:${version_library_appcompat}"
+    implementation "com.android.support:preference-v7:${version_library_appcompat}"

-    // More libraries
-    compile 'com.jakewharton:butterknife:8.0.1'
-    compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
-    compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
-    compile 'com.github.DASAR:ShiftColorPicker:v0.5'
-    apt 'com.jakewharton:butterknife-compiler:8.0.1'
-}
+    // UI libraries
+    implementation "com.github.DASAR:ShiftColorPicker:v0.5"

-//  #####################
-//  Groovy Coding Area
-//  #####################
-final String RAW_DIR = "app/src/main/res/raw"
-final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "LICENSE.md", "CHANGELOG.md", "CONTRIBUTORS.txt"]
-
-// Called before building
-task copyRepoFiles(type: Copy) {
-
-    // Copy files over to raw dir
-    from rootProject.files(ROOT_TO_RAW_COPYFILES)
-    into RAW_DIR.replaceFirst("app/", "")
-    rename { String fileName ->
-        fileName.replace(fileName, fileName.toLowerCase())
+    // Tool libraries
+    implementation 'commons-io:commons-io:2.6'
+    implementation "info.guardianproject.netcipher:netcipher:${version_library_netcipher}"
+    implementation "info.guardianproject.netcipher:netcipher-webkit:${version_library_netcipher}"
+    //noinspection AnnotationProcessorOnCompilePath
+    implementation "com.jakewharton:butterknife:${version_library_butterknife}"
+    if (enable_plugin_kotlin) {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version_plugin_kotlin}"
    }

-    // Filter Contributors file
-    from(rootProject.file("CONTRIBUTORS.txt")) {
-        into '.'    // Target already changed to 'src/main/res/raw'
-        rename { String fileName ->
-            fileName.replace(fileName, fileName.toLowerCase())
-        }
-        filter { line ->
-            (line.toString().matches("..l>>.*") || line.toString().startsWith("## 99l CONTRIBUTORS")) ? null : line.toString().trim().replaceAll(" \\(.*\\)", "")
+    // Processors
+    def anpros = ["com.jakewharton:butterknife-compiler:${version_library_butterknife}"]
+    for (anpro in anpros) {
+        if (enable_plugin_kotlin) {
+            kapt anpro
+        } else {
+            annotationProcessor anpro
        }
    }
 }
-tasks.copyRepoFiles.execute()
--- a/app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher.xml
+++ b/app/src/flavorAtest/res/drawable-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="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/flavorAtest/res/drawable-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/flavorAtest/res/drawable-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="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/flavorAtest/res/drawable-hdpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-hdpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-hdpi/ic_launcher_round.png
+++ b/app/src/flavorAtest/res/drawable-hdpi/ic_launcher_round.png
--- a/app/src/flavorAtest/res/drawable-ldpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-ldpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-mdpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-mdpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-mdpi/ic_launcher_round.png
+++ b/app/src/flavorAtest/res/drawable-mdpi/ic_launcher_round.png
--- a/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher_round.png
+++ b/app/src/flavorAtest/res/drawable-xhdpi/ic_launcher_round.png
--- a/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher_round.png
+++ b/app/src/flavorAtest/res/drawable-xxhdpi/ic_launcher_round.png
--- a/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher.png
+++ b/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher.png
--- a/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher_round.png
+++ b/app/src/flavorAtest/res/drawable-xxxhdpi/ic_launcher_round.png
--- a/app/src/flavorAtest/res/drawable/ic_launcher_background.xml
+++ b/app/src/flavorAtest/res/drawable/ic_launcher_background.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="20"
+        android:viewportHeight="20">
+    <path
+        android:pathData="M0.025,-0.07h19.95v20.14H0.025z"
+        android:fillColor="#492600"/>
+</vector>
--- a/app/src/flavorAtest/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/flavorAtest/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="36.363636"
+        android:viewportHeight="36.363636">
+    <group android:translateX="8.181818"
+            android:translateY="8.181818">
+        <path
+            android:pathData="M11.337,14.123l-0.963,-1.345c-0.257,-0.36 -0.466,-0.64 -0.477,-0.64 -0.012,0 -0.416,0.544 -0.958,1.287a83.9,83.9 0,0 1,-0.947 1.287c-0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.62 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515l-1.485,-0.496c-0.013,-0.005 0.063,-0.263 0.327,-1.094 0.19,-0.599 0.349,-1.093 0.354,-1.099 0.005,-0.006 0.707,0.219 1.56,0.5 0.852,0.28 1.556,0.509 1.565,0.509 0.008,0 0.018,-0.013 0.022,-0.03 0.003,-0.015 0.01,-0.74 0.016,-1.612 0.006,-0.87 0.015,-1.59 0.02,-1.6 0.009,-0.012 0.248,-0.015 1.127,-0.015 0.614,0 1.123,0.004 1.13,0.01 0.01,0.006 0.027,0.485 0.056,1.56 0.046,1.766 0.047,1.79 0.075,1.79 0.01,0 0.686,-0.226 1.501,-0.503a50.795,50.795 0,0 1,1.49 -0.492c0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.005 -0.684,0.237 -1.51,0.517 -1.137,0.386 -1.504,0.515 -1.507,0.531 -0.003,0.012 0.388,0.597 0.886,1.324 0.49,0.716 0.888,1.308 0.886,1.314a96.945,96.945 0,0 1,-1.852 1.364c-0.006,0 -0.239,-0.317 -0.517,-0.705z"
+            android:fillColor="#fafafa"/>
+    </group>
+</vector>
--- a/app/src/flavorAtest/res/ic_launcher-web.png
+++ b/app/src/flavorAtest/res/ic_launcher-web.png
--- a/app/src/flavorAtest/res/values/strings-flavor.xml
+++ b/app/src/flavorAtest/res/values/strings-flavor.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">secondlion*</string>
+</resources>
--- a/app/src/flavorDandelior/ic_launcher-web.png
+++ b/app/src/flavorDandelior/ic_launcher-web.png
--- a/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher.xml
+++ b/app/src/flavorDandelior/res/drawable-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="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/flavorDandelior/res/drawable-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/flavorDandelior/res/drawable-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="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png
+++ b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png
--- a/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png
+++ b/app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png
--- a/app/src/flavorDandelior/res/drawable/ic_launcher_background.xml
+++ b/app/src/flavorDandelior/res/drawable/ic_launcher_background.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="20"
+        android:viewportHeight="20">
+    <path
+        android:pathData="M0.025,-0.07h19.95v20.14H0.025z"
+        android:fillColor="#000000"/>
+</vector>
--- a/app/src/flavorDandelior/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/flavorDandelior/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="36.363636"
+        android:viewportHeight="36.363636">
+    <group android:translateX="8.181818"
+            android:translateY="8.181818">
+        <path
+            android:pathData="M11.337,14.123l-0.963,-1.345c-0.257,-0.36 -0.466,-0.64 -0.477,-0.64 -0.012,0 -0.416,0.544 -0.958,1.287a83.9,83.9 0,0 1,-0.947 1.287c-0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.62 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515l-1.485,-0.496c-0.013,-0.005 0.063,-0.263 0.327,-1.094 0.19,-0.599 0.349,-1.093 0.354,-1.099 0.005,-0.006 0.707,0.219 1.56,0.5 0.852,0.28 1.556,0.509 1.565,0.509 0.008,0 0.018,-0.013 0.022,-0.03 0.003,-0.015 0.01,-0.74 0.016,-1.612 0.006,-0.87 0.015,-1.59 0.02,-1.6 0.009,-0.012 0.248,-0.015 1.127,-0.015 0.614,0 1.123,0.004 1.13,0.01 0.01,0.006 0.027,0.485 0.056,1.56 0.046,1.766 0.047,1.79 0.075,1.79 0.01,0 0.686,-0.226 1.501,-0.503a50.795,50.795 0,0 1,1.49 -0.492c0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.005 -0.684,0.237 -1.51,0.517 -1.137,0.386 -1.504,0.515 -1.507,0.531 -0.003,0.012 0.388,0.597 0.886,1.324 0.49,0.716 0.888,1.308 0.886,1.314a96.945,96.945 0,0 1,-1.852 1.364c-0.006,0 -0.239,-0.317 -0.517,-0.705z"
+            android:fillColor="#fafafa"/>
+    </group>
+</vector>
--- a/app/src/flavorDandelior/res/values/strings-flavor.xml
+++ b/app/src/flavorDandelior/res/values/strings-flavor.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">dandelior*</string>
+</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -7,12 +7,15 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

    <application
        android:name="com.github.dfa.diaspora_android.App"
        android:allowBackup="false"
-        android:icon="${appIcon}"
+        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
        android:theme="@style/DiasporaLight">

        <provider
@ -20,6 +23,16 @@
            android:authorities="${applicationId}.mainactivity"
            android:exported="false" />

+        <!--File provider for sharing files-->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
        <service
            android:name="com.github.dfa.diaspora_android.service.FetchPodsService"
            android:enabled="true"
@ -35,20 +48,29 @@
        <activity
            android:name="com.github.dfa.diaspora_android.activity.AboutActivity"
            android:configChanges="locale"
-            android:label="@string/about_activity__title_about_app"
+            android:label="@string/about"
            android:theme="@style/DiasporaLight.NoActionBar" />

        <activity
            android:name="com.github.dfa.diaspora_android.activity.MainActivity"
            android:configChanges="keyboardHidden|locale|orientation|screenSize"
-            android:icon="${appIcon}"
+            android:icon="@drawable/ic_launcher"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/DiasporaLight.NoActionBar"
            android:windowSoftInputMode="adjustResize">

+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+
            <intent-filter>
+                <action android:name="sc_new_post" />
+                <action android:name="sc_nav_followed_tags" />
+                <action android:name="sc_aspects" />
+                <action android:name="sc_activities" />
                <action android:name="android.intent.action.MAIN" />
+
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>

@ -59,7 +81,7 @@
            </intent-filter>

            <!-- Hashtag click intent from HtmlTextViews -->
-            <intent-filter>
+            <intent-filter tools:ignore="AppLinkUrlError">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <data android:mimeType="vnd.android.cursor.item/vnd.cc.tag" />
@ -79,151 +101,705 @@
                    android:scheme="https" />

                <!--@@@ PODLIST START-->
-                <data android:host="joindiaspora.com" android:scheme="https" />
-                <data android:host="diasporaaqmjixh5.onion" android:scheme="http" />
-                <data android:host="pod.geraspora.de" android:scheme="https" />
-                <data android:host="diasp.org" android:scheme="https" />
-                <data android:host="framasphere.org" android:scheme="https" />
-                <data android:host="nerdpol.ch" android:scheme="https" />
-                <data android:host="despora.de" android:scheme="https" />
-                <data android:host="sechat.org" android:scheme="https" />
-                <data android:host="sechatqpscuj2npx.onion" android:scheme="http" />
-                <data android:host="berdaguermontes.eu" android:scheme="https" />
-                <data android:host="berlinspora.de" android:scheme="https" />
-                <data android:host="community.kanalinseln.de" android:scheme="https" />
-                <data android:host="d.consumium.org" android:scheme="https" />
-                <data android:host="dia.manuelbichler.at" android:scheme="https" />
-                <data android:host="dia.myocastor.de" android:scheme="https" />
-                <data android:host="diapod.net" android:scheme="https" />
-                <data android:host="diapod.org" android:scheme="https" />
-                <data android:host="diasp.ca" android:scheme="https" />
-                <data android:host="diasp.cz" android:scheme="https" />
-                <data android:host="diasp.de" android:scheme="https" />
-                <data android:host="diasp.eu" android:scheme="https" />
-                <data android:host="diasp.eu.com" android:scheme="https" />
-                <data android:host="diasp.nl" android:scheme="https" />
-                <data android:host="diaspod.de" android:scheme="https" />
-                <data android:host="diaspora-fr.org" android:scheme="https" />
-                <data android:host="diaspora.alfter.us" android:scheme="https" />
-                <data android:host="diaspora.bohramt.de" android:scheme="https" />
-                <data android:host="diaspora.com.ar" android:scheme="https" />
-                <data android:host="diaspora.deadhexagon.com" android:scheme="https" />
-                <data android:host="diaspora.digi-merc.org" android:scheme="https" />
-                <data android:host="diaspora.dorf-post.de" android:scheme="https" />
-                <data android:host="diaspora.espiritolivre.org" android:scheme="https" />
-                <data android:host="diaspora.horwood.biz" android:scheme="https" />
-                <data android:host="diaspora.hzsogood.net" android:scheme="https" />
-                <data android:host="diaspora.kapper.net" android:scheme="https" />
-                <data android:host="diaspora.koehn.com" android:scheme="https" />
-                <data android:host="diaspora.kosebamse.com" android:scheme="https" />
-                <data android:host="diaspora.lebarjack.com" android:scheme="https" />
-                <data android:host="diaspora.microdata.co.uk" android:scheme="https" />
-                <data android:host="diaspora.moosje.nl" android:scheme="https" />
-                <data android:host="diaspora.net.gr" android:scheme="https" />
-                <data android:host="diaspora.permutationsofchaos.com" android:scheme="https" />
-                <data android:host="diaspora.pimpmypony.eu" android:scheme="https" />
-                <data android:host="diaspora.pingupod.de" android:scheme="https" />
-                <data android:host="diaspora.podzimek.org" android:scheme="https" />
-                <data android:host="diaspora.poleni.com" android:scheme="https" />
-                <data android:host="diaspora.psyco.fr" android:scheme="https" />
-                <data android:host="diaspora.raven-ip.com" android:scheme="https" />
-                <data android:host="diaspora.retrodigital.net" android:scheme="https" />
-                <data android:host="diaspora.soh.re" android:scheme="https" />
-                <data android:host="diaspora.subsignal.org" android:scheme="https" />
-                <data android:host="diaspora.trash-talk.de" android:scheme="https" />
-                <data android:host="diaspora.u4u.org" android:scheme="https" />
-                <data android:host="diaspora.unixcorn.org" android:scheme="https" />
-                <data android:host="diasporabr.com.br" android:scheme="https" />
-                <data android:host="diasporabrazil.org" android:scheme="https" />
-                <data android:host="diasporapr.tk" android:scheme="https" />
-                <data android:host="diasporing.ch" android:scheme="https" />
-                <data android:host="distributed.chat" android:scheme="https" />
-                <data android:host="espora.com.es" android:scheme="https" />
-                <data android:host="espora.social" android:scheme="https" />
-                <data android:host="failure.net" android:scheme="https" />
-                <data android:host="flokk.no" android:scheme="https" />
-                <data android:host="freehuman.fr" android:scheme="https" />
-                <data android:host="iliketoast.net" android:scheme="https" />
-                <data android:host="jons.gr" android:scheme="https" />
-                <data android:host="kapok.se" android:scheme="https" />
-                <data android:host="karmasphe.re" android:scheme="https" />
-                <data android:host="laba.mba" android:scheme="https" />
-                <data android:host="liberdade.digital" android:scheme="https" />
-                <data android:host="librenet.co.za" android:scheme="https" />
-                <data android:host="librenet.gr" android:scheme="https" />
-                <data android:host="misamigos.online" android:scheme="https" />
-                <data android:host="mondiaspora.net" android:scheme="https" />
-                <data android:host="networkwizard.de" android:scheme="https" />
-                <data android:host="nx-pod.de" android:scheme="https" />
-                <data android:host="pe.spbstu.ru" android:scheme="https" />
-                <data android:host="pod.4ray.co" android:scheme="https" />
-                <data android:host="pod.8n1.org" android:scheme="https" />
-                <data android:host="pod.alterworld.info" android:scheme="https" />
-                <data android:host="pod.asap-soft.com" android:scheme="https" />
-                <data android:host="pod.cannyfoxx.me" android:scheme="https" />
-                <data android:host="pod.cyberdungeon.de" android:scheme="https" />
-                <data android:host="pod.dapor.net" android:scheme="https" />
-                <data android:host="pod.datenknoten.me" android:scheme="https" />
-                <data android:host="pod.diaspora.software" android:scheme="https" />
-                <data android:host="pod.dirkomatik.de" android:scheme="https" />
-                <data android:host="pod.disroot.org" android:scheme="https" />
-                <data android:host="pod.gedankenausbruch.com" android:scheme="https" />
-                <data android:host="pod.gleisnetze.de" android:scheme="https" />
-                <data android:host="pod.goodsharing.at" android:scheme="https" />
-                <data android:host="pod.hashtagueule.fr" android:scheme="https" />
-                <data android:host="pod.hoizi.net" android:scheme="https" />
-                <data android:host="pod.itabs.nl" android:scheme="https" />
-                <data android:host="pod.jpope.org" android:scheme="https" />
-                <data android:host="pod.liebeleu.de" android:scheme="https" />
-                <data android:host="pod.nomorestars.com" android:scheme="https" />
-                <data android:host="pod.orkz.net" android:scheme="https" />
-                <data android:host="pod.ponk.pink" android:scheme="https" />
-                <data android:host="pod.promedol.com" android:scheme="https" />
-                <data android:host="pod.psynet.su" android:scheme="https" />
-                <data android:host="pod.roocita.com" android:scheme="https" />
-                <data android:host="pod.sertelon.fr" android:scheme="https" />
-                <data android:host="pod.storel.li" android:scheme="https" />
-                <data android:host="pod.tchncs.de" android:scheme="https" />
-                <data android:host="pod.thomasdalichow.de" android:scheme="https" />
-                <data android:host="pod.volt.io" android:scheme="https" />
-                <data android:host="podbay.net" android:scheme="https" />
-                <data android:host="poddery.com" android:scheme="https" />
-                <data android:host="podricing.pw" android:scheme="https" />
-                <data android:host="pubpod.alqualonde.org" android:scheme="https" />
-                <data android:host="revreso.de" android:scheme="https" />
-                <data android:host="ruhrspora.de" android:scheme="https" />
-                <data android:host="russiandiaspora.org" android:scheme="https" />
-                <data android:host="shrekislove.us" android:scheme="https" />
-                <data android:host="social.acclaro.digital" android:scheme="https" />
-                <data android:host="social.baldr.io" android:scheme="https" />
-                <data android:host="social.daxbau.net" android:scheme="https" />
-                <data android:host="social.elaon.de" android:scheme="https" />
-                <data android:host="social.lanham.id.au" android:scheme="https" />
-                <data android:host="social.mbuto.me" android:scheme="https" />
-                <data android:host="socializer.cc" android:scheme="https" />
-                <data android:host="spora.zone" android:scheme="https" />
-                <data android:host="subvillage.de" android:scheme="https" />
-                <data android:host="sysad.org" android:scheme="https" />
-                <data android:host="teki.be" android:scheme="https" />
-                <data android:host="therealtalk.org" android:scheme="https" />
-                <data android:host="thinkopen.net" android:scheme="https" />
-                <data android:host="tippentappen.de" android:scheme="https" />
-                <data android:host="whatsnewz.com" android:scheme="https" />
-                <data android:host="wk3.org" android:scheme="https" />
-                <data android:host="www.datataffel.dk" android:scheme="https" />
-                <data android:host="www.diasporaix.de" android:scheme="https" />
-                <data android:host="diaspora.hofud.com" android:scheme="https" />
-                <data android:host="diaspora.softwarelivre.org" android:scheme="https" />
-                <data android:host="confetticake.club" android:scheme="https" />
-                <data android:host="diaspote.org" android:scheme="https" />
-                <data android:host="diaspora.zone" android:scheme="https" />
-                <data android:host="pod.userzap.de" android:scheme="https" />
-                <data android:host="www.vodeoo.com" android:scheme="https" />
-                <data android:host="diaspora.punkbeer.me" android:scheme="https" />
-                <data android:host="ingtech.net" android:scheme="https" />
-                <data android:host="mmkr.co" android:scheme="https" />
-                <data android:host="pod.kneedrag.org" android:scheme="https" />
-                <data android:host="pod.mew.cat" android:scheme="https" />
+                <data
+                    android:host="joindiaspora.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporaaqmjixh5.onion"
+                    android:scheme="http" />
+                <data
+                    android:host="pod.geraspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporgc3d32vv4.onion"
+                    android:scheme="https" />
+                <data
+                    android:host="framasphere.org"
+                    android:scheme="https" />
+                <data
+                    android:host="nerdpol.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="despora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="sechat.org"
+                    android:scheme="https" />
+                <data
+                    android:host="sechatqpscuj2npx.onion"
+                    android:scheme="http" />
+                <data
+                    android:host="berdaguermontes.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="berlinspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="community.kanalinseln.de"
+                    android:scheme="https" />
+                <data
+                    android:host="d.consumium.org"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.manuelbichler.at"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.myocastor.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diapod.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diapod.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.ca"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.cz"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.eu.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora-fr.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.alfter.us"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.bohramt.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.com.ar"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.deadhexagon.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.digi-merc.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.dorf-post.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.espiritolivre.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.horwood.biz"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.hzsogood.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.kapper.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.koehn.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.kosebamse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.lebarjack.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.microdata.co.uk"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.moosje.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.net.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.permutationsofchaos.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.pimpmypony.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.pingupod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.podzimek.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.poleni.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.psyco.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.raven-ip.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.retrodigital.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.soh.re"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.subsignal.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.trash-talk.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.u4u.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.unixcorn.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporabr.com.br"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporabrazil.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporapr.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporing.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="distributed.chat"
+                    android:scheme="https" />
+                <data
+                    android:host="espora.com.es"
+                    android:scheme="https" />
+                <data
+                    android:host="espora.social"
+                    android:scheme="https" />
+                <data
+                    android:host="failure.net"
+                    android:scheme="https" />
+                <data
+                    android:host="flokk.no"
+                    android:scheme="https" />
+                <data
+                    android:host="freehuman.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="iliketoast.net"
+                    android:scheme="https" />
+                <data
+                    android:host="jons.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="kapok.se"
+                    android:scheme="https" />
+                <data
+                    android:host="karmasphe.re"
+                    android:scheme="https" />
+                <data
+                    android:host="laba.mba"
+                    android:scheme="https" />
+                <data
+                    android:host="liberdade.digital"
+                    android:scheme="https" />
+                <data
+                    android:host="librenet.co.za"
+                    android:scheme="https" />
+                <data
+                    android:host="librenet.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="misamigos.online"
+                    android:scheme="https" />
+                <data
+                    android:host="mondiaspora.net"
+                    android:scheme="https" />
+                <data
+                    android:host="networkwizard.de"
+                    android:scheme="https" />
+                <data
+                    android:host="nx-pod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pe.spbstu.ru"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.4ray.co"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.8n1.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.alterworld.info"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.asap-soft.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cannyfoxx.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cyberdungeon.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.dapor.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.datenknoten.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.diaspora.software"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.dirkomatik.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.disroot.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.gedankenausbruch.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.gleisnetze.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.goodsharing.at"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.hashtagueule.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.hoizi.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.itabs.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.jpope.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.liebeleu.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.nomorestars.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.orkz.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.ponk.pink"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.promedol.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.psynet.su"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.roocita.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sertelon.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.storel.li"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.tchncs.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.thomasdalichow.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.volt.io"
+                    android:scheme="https" />
+                <data
+                    android:host="podbay.net"
+                    android:scheme="https" />
+                <data
+                    android:host="poddery.com"
+                    android:scheme="https" />
+                <data
+                    android:host="podricing.pw"
+                    android:scheme="https" />
+                <data
+                    android:host="pubpod.alqualonde.org"
+                    android:scheme="https" />
+                <data
+                    android:host="revreso.de"
+                    android:scheme="https" />
+                <data
+                    android:host="ruhrspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="russiandiaspora.org"
+                    android:scheme="https" />
+                <data
+                    android:host="shrekislove.us"
+                    android:scheme="https" />
+                <data
+                    android:host="social.acclaro.digital"
+                    android:scheme="https" />
+                <data
+                    android:host="social.baldr.io"
+                    android:scheme="https" />
+                <data
+                    android:host="social.daxbau.net"
+                    android:scheme="https" />
+                <data
+                    android:host="social.elaon.de"
+                    android:scheme="https" />
+                <data
+                    android:host="social.lanham.id.au"
+                    android:scheme="https" />
+                <data
+                    android:host="social.mbuto.me"
+                    android:scheme="https" />
+                <data
+                    android:host="socializer.cc"
+                    android:scheme="https" />
+                <data
+                    android:host="spora.zone"
+                    android:scheme="https" />
+                <data
+                    android:host="subvillage.de"
+                    android:scheme="https" />
+                <data
+                    android:host="sysad.org"
+                    android:scheme="https" />
+                <data
+                    android:host="teki.be"
+                    android:scheme="https" />
+                <data
+                    android:host="therealtalk.org"
+                    android:scheme="https" />
+                <data
+                    android:host="thinkopen.net"
+                    android:scheme="https" />
+                <data
+                    android:host="tippentappen.de"
+                    android:scheme="https" />
+                <data
+                    android:host="whatsnewz.com"
+                    android:scheme="https" />
+                <data
+                    android:host="wk3.org"
+                    android:scheme="https" />
+                <data
+                    android:host="www.datataffel.dk"
+                    android:scheme="https" />
+                <data
+                    android:host="www.diasporaix.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.hofud.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.softwarelivre.org"
+                    android:scheme="https" />
+                <data
+                    android:host="confetticake.club"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspote.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.zone"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.userzap.de"
+                    android:scheme="https" />
+                <data
+                    android:host="www.vodeoo.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.punkbeer.me"
+                    android:scheme="https" />
+                <data
+                    android:host="ingtech.net"
+                    android:scheme="https" />
+                <data
+                    android:host="mmkr.co"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.kneedrag.org"
+                    android:scheme="https" />
+                <data
+                    android:host="spyurk.am"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.mew.cat"
+                    android:scheme="https" />
+                <data
+                    android:host="dfhz.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="netiz.in"
+                    android:scheme="https" />
+                <data
+                    android:host="pod1.orobouros.net"
+                    android:scheme="https" />
+                <data
+                    android:host="witchcraft.ml"
+                    android:scheme="https" />
+                <data
+                    android:host="libellula.criptica.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.datamol.org"
+                    android:scheme="https" />
+                <data
+                    android:host="social.berdaguermontes.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="mh8.lat-clan.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="dp.lumy.me"
+                    android:scheme="https" />
+                <data
+                    android:host="social.souvenirfromlife.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.mokrynskyi.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.transition-regensburg.de"
+                    android:scheme="https" />
+                <data
+                    android:host="co.zy.lc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.treefish.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.bke.ro"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sd.vc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.cxx.rocks"
+                    android:scheme="https" />
+                <data
+                    android:host="social.homenet.org"
+                    android:scheme="https" />
+                <data
+                    android:host="social.cigliola.com"
+                    android:scheme="https" />
+                <data
+                    android:host="friaspora.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.lasserh.dk"
+                    android:scheme="https" />
+                <data
+                    android:host="hubz.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.kosebamse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="driaans.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="dispersio.us"
+                    android:scheme="https" />
+                <data
+                    android:host="go.lookbehind.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.ot-si.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.crossfamilyweb.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.aoeu.me"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.pwn.ninja"
+                    android:scheme="https" />
+                <data
+                    android:host="3ogsbs3vuvapgg37.onion.to"
+                    android:scheme="https" />
+                <data
+                    android:host="hubz.secretlair.me"
+                    android:scheme="https" />
+                <data
+                    android:host="got.noip.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.bitcast.info"
+                    android:scheme="https" />
+                <data
+                    android:host="f.tschlotfeldt.de"
+                    android:scheme="https" />
+                <data
+                    android:host="hubloq.net"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.kneedrag.org"
+                    android:scheme="https" />
+                <data
+                    android:host="gesichtsbu.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzi.fraengii.de"
+                    android:scheme="https" />
+                <data
+                    android:host="friendica.narf.ssji.net"
+                    android:scheme="https" />
+                <data
+                    android:host="durohr.de"
+                    android:scheme="https" />
+                <data
+                    android:host="0kcg.com"
+                    android:scheme="https" />
+                <data
+                    android:host="aegibson.me"
+                    android:scheme="https" />
+                <data
+                    android:host="redmatrix.us"
+                    android:scheme="https" />
+                <data
+                    android:host="15o2.de"
+                    android:scheme="https" />
+                <data
+                    android:host="upt.social"
+                    android:scheme="https" />
+                <data
+                    android:host="friendica.bohrshouse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.site"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.zavb.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.aeriesguard.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cornify.de"
+                    android:scheme="https" />
+                <data
+                    android:host="hochminuseins.net"
+                    android:scheme="https" />
+                <data
+                    android:host="thecrimsontint.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.clubelek.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="teamhubzilla.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.schlimme.net"
+                    android:scheme="https" />
+                <data
+                    android:host="www.wiwiec.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.danletard.de"
+                    android:scheme="https" />
+                <data
+                    android:host="libertypod.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.pskosinski.pl"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.juvenesco.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="pirati.ca"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.sk"
+                    android:scheme="https" />
+                <data
+                    android:host="f.libreden.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.mausdompteur.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.raitisoja.com"
+                    android:scheme="https" />
+                <data
+                    android:host="squeet.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.kakise.xyz"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.diasporacaribe.org"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.feder8.ru"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.a-zwenkau.de"
+                    android:scheme="https" />
+                <data
+                    android:host="social.punkbeer.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sapient.fun"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.phantasie.cc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.masharih.me"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.mariovavti.com"
+                    android:scheme="https" />
+                <data
+                    android:host="social.patur.in"
+                    android:scheme="https" />
+                <data
+                    android:host="jeroenpraat.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="grindcore.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.vixiv.net"
+                    android:scheme="https" />
+                <data
+                    android:host="social.deuxfleurs.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="parlementum.net"
+                    android:scheme="https" />
+                <data
+                    android:host="villianbook.com"
+                    android:scheme="https" />
+                <data
+                    android:host="frolix8.asia"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.vilarejo.pro.br"
+                    android:scheme="https" />
+                <data
+                    android:host="social.vixiv.net"
+                    android:scheme="https" />
                <!--@@@ PODLIST END-->
            </intent-filter>

--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/ic_launcher_test.png
+++ b/app/src/main/ic_launcher_test.png
--- a/app/src/main/java/com/github/dfa/diaspora_android/App.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/App.java
@ -34,7 +34,9 @@ import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;

-import io.github.gsantner.opoc.util.AdBlock;
+import net.gsantner.opoc.util.AdBlock;
+import net.gsantner.opoc.util.ContextUtils;
+import net.gsantner.opoc.util.ShareUtil;

 public class App extends Application {
    private volatile static App app;
@ -50,10 +52,18 @@ public class App extends Application {
    @Override
    public void onCreate() {
        super.onCreate();
+        ShareUtil.setFileProviderAuthority(BuildConfig.APPLICATION_ID);
        app = this;
        final Context c = getApplicationContext();
        appSettings = AppSettings.get();

+        String a = new ContextUtils(this).bcstr("FLAVOR", "");
+        a += "__";
+
+        if (appSettings.isAppFirstStart() && "flavorDandelior".equals(new ContextUtils(this).bcstr("FLAVOR", ""))) {
+            appSettings.setAmoledColorMode(true);
+        }
+
        // Init app log
        AppLog.setLoggingEnabled(appSettings.isLoggingEnabled());
        AppLog.setLoggingSpamEnabled(appSettings.isLoggingSpamEnabled());
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
@ -20,12 +20,13 @@ package com.github.dfa.diaspora_android.activity;

 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@ -34,8 +35,6 @@ import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@ -52,7 +51,7 @@ import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
 import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
-import com.github.dfa.diaspora_android.util.Helpers;
+import com.github.dfa.diaspora_android.util.ContextUtils;

 import java.util.Observable;
 import java.util.Observer;
@ -68,16 +67,16 @@ public class AboutActivity extends ThemedActivity
        implements IntellihideToolbarActivityListener {

    @BindView(R.id.about__appbar)
-    protected AppBarLayout appBarLayout;
+    protected AppBarLayout _appBarLayout;

    @BindView(R.id.main__topbar)
-    protected Toolbar toolbar;
+    protected Toolbar _toolbar;

    @BindView(R.id.appbar_linear_layout)
-    protected LinearLayout linearLayout;
+    protected LinearLayout _linearLayout;

    @BindView(R.id.tabs)
-    protected TabLayout tabLayout;
+    protected TabLayout _tabLayout;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@ -85,9 +84,9 @@ public class AboutActivity extends ThemedActivity
        setContentView(R.layout.about__activity);
        ButterKnife.bind(this);

-        setSupportActionBar(toolbar);
-        toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24px));
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+        setSupportActionBar(_toolbar);
+        _toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24px));
+        _toolbar.setNavigationOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                AboutActivity.this.onBackPressed();
@ -101,41 +100,33 @@ public class AboutActivity extends ThemedActivity
        ViewPager mViewPager = ButterKnife.findById(this, R.id.container);
        mViewPager.setAdapter(mSectionsPagerAdapter);

-        tabLayout.setupWithViewPager(mViewPager);
+        _tabLayout.setupWithViewPager(mViewPager);
    }

    @Override
    public void onResume() {
        super.onResume();
-        if (getAppSettings().isIntellihideToolbars()) {
-            this.enableToolbarHiding();
-        } else {
-            this.disableToolbarHiding();
-        }
+        setToolbarIntellihide(getAppSettings().isIntellihideToolbars());
    }

    @Override
    protected void applyColorToViews() {
-        ThemeHelper.updateToolbarColor(toolbar);
-        ThemeHelper.updateTabLayoutColor(tabLayout);
-        ThemeHelper.setPrimaryColorAsBackground(linearLayout);
+        ThemeHelper.updateToolbarColor(_toolbar);
+        ThemeHelper.updateTabLayoutColor(_tabLayout);
+        ThemeHelper.setPrimaryColorAsBackground(_linearLayout);
    }

-    @Override
-    public void enableToolbarHiding() {
-        AppLog.d(this, "Enable Intellihide");
-        AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) linearLayout.getLayoutParams();
-        //scroll|enterAlways|snap
-        params.setScrollFlags(toolbarDefaultScrollFlags);
-        appBarLayout.setExpanded(true, true);
-    }
+    public void setToolbarIntellihide(boolean enable) {
+        AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) _linearLayout.getLayoutParams();
+        if (enable) {
+            AppLog.d(this, "Enable Intellihide");
+            params.setScrollFlags(toolbarDefaultScrollFlags);

-    @Override
-    public void disableToolbarHiding() {
-        AppLog.d(this, "Disable Intellihide");
-        AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) linearLayout.getLayoutParams();
-        params.setScrollFlags(0);  // clear all scroll flags
-        appBarLayout.setExpanded(true, true);
+        } else {
+            AppLog.d(this, "Disable Intellihide");
+            params.setScrollFlags(0);  // clear all scroll flags
+        }
+        _appBarLayout.setExpanded(true, true);
    }

    /**
@ -167,20 +158,23 @@ public class AboutActivity extends ThemedActivity
        }

        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            View rootView = inflater.inflate(R.layout.about__fragment_about, container, false);
-            ButterKnife.bind(this, rootView);
+        protected int getLayoutResId() {
+            return R.layout.about__fragment_about;
+        }
+
+        @Override
+        public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            ButterKnife.bind(this, view);
            if (isAdded()) {
                try {
                    PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
-                    appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")"));
+                    appVersion.setText(getString(R.string.app_version_with_arg, pInfo.versionName + " (" + pInfo.versionCode + ")"));

                } catch (PackageManager.NameNotFoundException e) {
                    e.printStackTrace();
                }
            }
-            return rootView;
        }

        @Override
@ -198,11 +192,6 @@ public class AboutActivity extends ThemedActivity
            return TAG;
        }

-        @Override
-        public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-            /* Nothing to do */
-        }
-
        @Override
        public boolean onBackPressed() {
            return false;
@ -212,20 +201,20 @@ public class AboutActivity extends ThemedActivity
        public void buttonClicked(View view) {
            switch (view.getId()) {
                case R.id.fragment_about__contribute_button:
-                    Helpers.get().openWebpageInExternalBrowser(getString(R.string.fragment_about__contribute_link));
+                    ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_about__contribute_link));
                    break;
                case R.id.fragment_about__translate_button:
-                    Helpers.get().openWebpageInExternalBrowser(getString(R.string.fragment_about__translate_link));
+                    ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_about__translate_link));
                    break;
                case R.id.fragment_about__feedback_button:
-                    Helpers.get().openWebpageInExternalBrowser(getString(R.string.fragment_About__feedback_link));
+                    ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_About__feedback_link));
                    break;
                case R.id.fragment_about__spread_the_word_button:
                    Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                    sharingIntent.setType("text/plain");
                    sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_name));
-                    sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.fragment_about__spread_the_word_share_text, getString(R.string.fragment_about__fdroid_link)));
-                    startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
+                    sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.hey_checkout_dandelion_tag__appspecific, getString(R.string.fragment_about__fdroid_link)));
+                    startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.share_dotdotdot)));
                    break;
            }
        }
@ -259,29 +248,32 @@ public class AboutActivity extends ThemedActivity
        }

        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-            View rootView = inflater.inflate(R.layout.about__fragment_license, container, false);
-            ButterKnife.bind(this, rootView);
-            final Context context = rootView.getContext();
-            accentColor = Helpers.get().colorToHexString(ThemeHelper.getAccentColor());
+        protected int getLayoutResId() {
+            return R.layout.about__fragment_license;
+        }

-            maintainers.setTextFormatted(getString(R.string.fragment_license__maintainers_text,
-                    Helpers.get().loadMarkdownForTextViewFromRaw(R.raw.maintainers, "")));
-            contributors.setTextFormatted(getString(R.string.fragment_license__contributors_thank_you,
-                    Helpers.get().loadMarkdownForTextViewFromRaw(R.raw.contributors, "* ")));
+        @Override
+        public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            ButterKnife.bind(this, view);
+            accentColor = ContextUtils.get().colorToHexString(ThemeHelper.getAccentColor());
+
+            maintainers.setTextFormatted(getString(R.string.this_app_is_currently_developed_and_maintained_by_witharg,
+                    ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.maintainers, "")));
+            contributors.setTextFormatted(getString(R.string.thank_you_witharg,
+                    ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.contributors, "")));
            thirdPartyLibs.setTextFormatted(
-                    Helpers.get().loadMarkdownForTextViewFromRaw(R.raw.license_third_party, ""));
-            return rootView;
+                    ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.licenses_3rd_party, ""));
        }

        @OnClick({R.id.fragment_license__leafpic_button, R.id.fragment_license__license_button})
        public void buttonClicked(View v) {
            switch (v.getId()) {
                case R.id.fragment_license__leafpic_button:
-                    Helpers.get().openWebpageInExternalBrowser(getString(R.string.fragment_licesen__misc_leafpic_link));
+                    ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_licesen__misc_leafpic_link));
                    break;
                case R.id.fragment_license__license_button:
-                    Helpers.get().openWebpageInExternalBrowser(getString(R.string.fragment_license__license_gpl_link));
+                    ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_license__license_gpl_link));
                    break;
            }
        }
@ -300,11 +292,6 @@ public class AboutActivity extends ThemedActivity
            return TAG;
        }

-        @Override
-        public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-            /* Nothing to do */
-        }
-
        @Override
        public boolean onBackPressed() {
            return false;
@ -354,7 +341,7 @@ public class AboutActivity extends ThemedActivity
                        ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
                        ClipData clip = ClipData.newPlainText("DEBUG_LOG", AppLog.Log.getLogBuffer());
                        clipboard.setPrimaryClip(clip);
-                        Toast.makeText(DebugFragment.this.getActivity(), R.string.fragment_debug__toast_log_copied, Toast.LENGTH_SHORT).show();
+                        Toast.makeText(DebugFragment.this.getActivity(), R.string.debug_log_copied_to_clipboard, Toast.LENGTH_SHORT).show();
                    } else {
                        AppLog.d(this, "Not Added!");
                    }
@ -369,13 +356,13 @@ public class AboutActivity extends ThemedActivity
                    PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
                    AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
                    packageName.setText(pInfo.packageName);
-                    appVersion.setText(getString(R.string.fragment_debug__app_version, pInfo.versionName + " (" + pInfo.versionCode + ")"));
+                    appVersion.setText(getString(R.string.app_version_with_arg, pInfo.versionName + " (" + pInfo.versionCode + ")"));

-                    osVersion.setText(getString(R.string.fragment_debug__android_version, Build.VERSION.RELEASE));
-                    deviceName.setText(getString(R.string.fragment_debug__device_name, Build.MANUFACTURER + " " + Build.MODEL));
+                    osVersion.setText(getString(R.string.android_version_witharg, Build.VERSION.RELEASE));
+                    deviceName.setText(getString(R.string.device_name_witharg, Build.MANUFACTURER + " " + Build.MODEL));
                    if (app.getSettings().getPod() != null) {
-                        podDomain.setText(getString(R.string.fragment_debug__pod_profile_url, app.getSettings().getPod().getPodUrl()));
-                        podName.setText(getString(R.string.fragment_debug__pod_profile_name, app.getSettings().getPod().getName()));
+                        podDomain.setText(getString(R.string.pod_domain_witharg__appspecific, app.getSettings().getPod().getPodUrl()));
+                        podName.setText(getString(R.string.pod_profile_name_witharg__appspecific, app.getSettings().getPod().getName()));
                    }

                } catch (PackageManager.NameNotFoundException e) {
@ -433,11 +420,11 @@ public class AboutActivity extends ThemedActivity
        public CharSequence getPageTitle(int position) {
            switch (position) {
                case 0:
-                    return getString(R.string.about_activity__title_about_app);
+                    return getString(R.string.about);
                case 1:
-                    return getString(R.string.about_activity__title_about_license);
+                    return getString(R.string.license);
                case 2:
-                    return getString(R.string.about_activity__title_debug_info);
+                    return getString(R.string.debugging);
            }
            return null;
        }
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java
@ -1,216 +0,0 @@
-/*
-    This file is part of the dandelion*.
-
-    dandelion* 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.
-
-    dandelion* 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 the dandelion*.
-
-    If not, see <http://www.gnu.org/licenses/>.
- */
-package com.github.dfa.diaspora_android.activity;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.os.Bundle;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.github.dfa.diaspora_android.App;
-import com.github.dfa.diaspora_android.R;
-import com.github.dfa.diaspora_android.data.DiasporaAspect;
-import com.github.dfa.diaspora_android.listener.OnSomethingClickListener;
-import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.AppSettings;
-import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-import com.github.dfa.diaspora_android.util.Helpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Fragment that shows a list of the Aspects
- */
-public class AspectListFragment extends ThemedFragment implements OnSomethingClickListener<Object> {
-
-    public static final String TAG = "com.github.dfa.diaspora_android.AspectListFragment";
-
-    @BindView(R.id.fragment_list__recycler_view)
-    public RecyclerView aspectsRecyclerView;
-
-    @BindView(R.id.fragment_list__spacer)
-    public View space;
-
-    @BindView(R.id.fragment_list__root)
-    public RelativeLayout rootView;
-
-    protected App app;
-    protected DiasporaUrlHelper urls;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        AppLog.d(this, "onCreateView()");
-        return inflater.inflate(R.layout.recycler_list__fragment, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
-        app = (App) getActivity().getApplication();
-        AppSettings appSettings = app.getSettings();
-        urls = new DiasporaUrlHelper(appSettings);
-
-        aspectsRecyclerView.setHasFixedSize(true);
-        aspectsRecyclerView.setNestedScrollingEnabled(false);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
-        aspectsRecyclerView.setLayoutManager(layoutManager);
-
-        final AspectAdapter adapter = new AspectAdapter(appSettings, this);
-        aspectsRecyclerView.setAdapter(adapter);
-
-        //Set window title
-        getActivity().setTitle(R.string.nav_aspects);
-    }
-
-    @Override
-    public String getFragmentTag() {
-        return TAG;
-    }
-
-    @Override
-    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-        /* Nothing to do */
-    }
-
-    @Override
-    public boolean onBackPressed() {
-        return false;
-    }
-
-    @Override
-    public void onSomethingClicked(Object null1, Integer null2, String aspectId) {
-        ((MainActivity) getActivity()).openDiasporaUrl(urls.getAspectUrl(aspectId));
-    }
-
-    @Override
-    protected void applyColorToViews() {
-        aspectsRecyclerView.invalidate();
-        if (getAppSettings().isAmoledColorMode()) {
-            rootView.setBackgroundColor(Color.BLACK);
-            space.setBackgroundColor(Color.BLACK);
-        }
-    }
-
-    public static class AspectAdapter extends RecyclerView.Adapter<AspectAdapter.ViewHolder> {
-        private boolean isAmoledColorMode;
-        private final AppSettings appSettings;
-        private final DiasporaAspect[] aspectList;
-        private final List<String> aspectFavsList;
-        private final OnSomethingClickListener<Object> aspectClickedListener;
-
-        static class ViewHolder extends RecyclerView.ViewHolder {
-            @BindView(R.id.recycler_view__list_item__text)
-            public TextView title;
-            @BindView(R.id.recycler_view__list_item__favourite)
-            AppCompatImageView favouriteImage;
-            @BindView(R.id.recycler_view__list_item__root)
-            RelativeLayout root;
-
-            ViewHolder(View v) {
-                super(v);
-                ButterKnife.bind(this, v);
-            }
-        }
-
-
-        AspectAdapter(AppSettings appSettings, OnSomethingClickListener<Object> aspectClickedListener) {
-            this.appSettings = appSettings;
-            this.aspectList = appSettings.getAspects();
-            this.aspectFavsList = new ArrayList<>(Arrays.asList(appSettings.getAspectFavs()));
-            this.aspectClickedListener = aspectClickedListener;
-            this.isAmoledColorMode = appSettings.isAmoledColorMode();
-        }
-
-        @Override
-        public int getItemCount() {
-            return aspectList.length;
-        }
-
-        @Override
-        public AspectAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View v = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.recycler_list__list_item_with_fav, parent, false);
-            return new ViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(final ViewHolder holder, int position) {
-            // Alternating colors
-            final Context c = holder.root.getContext();
-            final DiasporaAspect aspect = aspectList[position];
-            holder.title.setText(aspect.name);
-            if (position % 2 == 1) {
-                holder.root.setBackgroundColor(isAmoledColorMode ? Color.BLACK : Helpers.get().color(R.color.alternate_row_color));
-                holder.title.setTextColor(isAmoledColorMode ? Color.GRAY : Color.BLACK);
-            } else {
-                holder.root.setBackgroundColor(isAmoledColorMode ? Color.BLACK : Color.WHITE);
-                holder.title.setTextColor(isAmoledColorMode ? Color.GRAY : Color.BLACK);
-            }
-
-            // Favourite (Star) Image
-            applyFavouriteImage(holder.favouriteImage, isAspectFaved(aspect.name));
-
-            // Click on fav button
-            holder.favouriteImage.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    if (isAspectFaved(aspect.name)) {
-                        aspectFavsList.remove(aspectFavsList.indexOf(aspect.name));
-                    } else {
-                        aspectFavsList.add(aspect.name);
-                    }
-                    appSettings.setAspectFavs(aspectFavsList);
-                    applyFavouriteImage(holder.favouriteImage, isAspectFaved(aspect.name));
-                }
-            });
-
-            holder.root.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    aspectClickedListener.onSomethingClicked(null, null, aspect.id + "");
-                }
-            });
-        }
-
-        private boolean isAspectFaved(String tag) {
-            return aspectFavsList.contains(tag);
-        }
-
-        private void applyFavouriteImage(AppCompatImageView imageView, boolean isFaved) {
-            imageView.setImageResource(isFaved ? R.drawable.ic_star_filled_48px : R.drawable.ic_star_border_black_48px);
-            imageView.setColorFilter(isFaved ? appSettings.getAccentColor() : (isAmoledColorMode ? Color.GRAY : 0), PorterDuff.Mode.SRC_ATOP);
-        }
-    }
-}
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
@ -25,11 +25,13 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@ -38,23 +40,30 @@ import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
+import android.widget.Toast;

 import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
 import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
 import com.github.dfa.diaspora_android.util.AppLog;
+import com.github.dfa.diaspora_android.util.AppSettings;
+import com.github.dfa.diaspora_android.util.ContextUtils;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-import com.github.dfa.diaspora_android.util.Helpers;
 import com.github.dfa.diaspora_android.web.BrowserFragment;
 import com.github.dfa.diaspora_android.web.DiasporaStreamWebChromeClient;
 import com.github.dfa.diaspora_android.web.FileUploadWebChromeClient;
 import com.github.dfa.diaspora_android.web.WebHelper;

+import net.gsantner.opoc.util.PermissionChecker;
+import net.gsantner.opoc.util.ShareUtil;
+
 import org.json.JSONException;

 import java.io.File;
 import java.io.IOException;
+import java.util.Date;

 /**
 * Fragment that displays the Stream of the diaspora* user
@ -92,13 +101,15 @@ public class DiasporaStreamFragment extends BrowserFragment {
    }

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.stream__menu_top, menu);
        super.onCreateOptionsMenu(menu, inflater);
-    }
+        inflater.inflate(R.menu.stream__menu_top, menu);

-    @Override
-    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.stream__menu_bottom, menu);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            menu.findItem(R.id.action_share_pdf).setVisible(true);
+        }
+
+        final boolean darkBg = ContextUtils.get().shouldColorOnTopBeLight(AppSettings.get().getPrimaryColor());
+        ContextUtils.get().tintMenuItems(menu, true, ContextCompat.getColor(getActivity(), darkBg ? R.color.white : R.color.black));
    }

    @Override
@ -117,6 +128,8 @@ public class DiasporaStreamFragment extends BrowserFragment {
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        AppLog.d(this, "StreamFragment.onOptionsItemSelected()");
+        ShareUtil shu = new ShareUtil(getContext());
+        PermissionChecker permc = new PermissionChecker(getActivity());
        switch (item.getItemId()) {
            case R.id.action_reload: {
                if (WebHelper.isOnline(getContext())) {
@ -139,17 +152,51 @@ public class DiasporaStreamFragment extends BrowserFragment {
                sharingIntent.setType("text/plain");
                sharingIntent.putExtra(Intent.EXTRA_SUBJECT, webView.getTitle());
                sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
-                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
+                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.share_dotdotdot)));
+                return true;
+            }
+
+            case R.id.action_share_pdf: {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    shu.createPdf(webView, "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()));
+                }
+                return true;
+            }
+
+            case R.id.action_share_link_to_clipboard: {
+                shu.setClipboard(webView.getUrl());
+                Toast.makeText(getContext(), R.string.link_adress_copied, Toast.LENGTH_SHORT).show();
+                return true;
+            }
+
+            case R.id.action_create_launcher_shortcut: {
+                if (webView.getUrl() != null) {
+                    Intent intent = new Intent(getContext(), MainActivity.class);
+                    intent.setAction(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(webView.getUrl()));
+                    shu.createLauncherDesktopShortcut(intent, R.drawable.ic_launcher, webView.getTitle());
+                }
                return true;
            }

            case R.id.action_take_screenshot: {
-                makeScreenshotOfWebView(false);
+                if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
+                    File fileSaveDirectory = appSettings.getAppSaveDirectory();
+                    if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
+                        Bitmap bmp = ShareUtil.getBitmapFromWebView(webView);
+                        String filename = "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()) + ".jpg";
+                        _cu.writeImageToFile(new File(fileSaveDirectory, filename), bmp);
+                        Snackbar.make(webView, getString(R.string.saving_screenshot_as)
+                                + " " + filename, Snackbar.LENGTH_LONG).show();
+                    }
+                }
                return true;
            }

            case R.id.action_share_screenshot: {
-                makeScreenshotOfWebView(true);
+                if (permc.doIfExtStoragePermissionGranted(getString(R.string.screenshot_permission__appspecific))) {
+                    shu.shareImage(ShareUtil.getBitmapFromWebView(webView));
+                }
                return true;
            }
        }
@ -246,7 +293,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
                    if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
                        new ThemedAlertDialogBuilder(getContext(), appSettings)
-                                .setMessage(R.string.permissions_image)
+                                .setMessage(R.string.image_permission_description__appspecific)
                                .setNegativeButton(android.R.string.no, null)
                                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                                    @Override
@ -271,7 +318,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                // Create the File where the photo should go
                File photoFile;
                try {
-                    photoFile = Helpers.get().createImageFile();
+                    photoFile = ContextUtils.get().createImageFile();
                    takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
                } catch (IOException ex) {
                    AppLog.e(this, "ERROR creating temp file: " + ex.toString());
@ -324,13 +371,30 @@ public class DiasporaStreamFragment extends BrowserFragment {
        @SuppressWarnings("unused")
        @JavascriptInterface
        public void setUserProfile(final String webMessage) throws JSONException {
-            final DiasporaUserProfile pup = ((App) getActivity().getApplication()).getDiasporaUserProfile();
-            if (pup.isRefreshNeeded()) {
-                AppLog.v(this, "DiasporaUserProfile needs refresh; Try to parse JSON");
-                pup.parseJson(webMessage);
-                getActivity().runOnUiThread(new Runnable() {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.runOnUiThread(new Runnable() {
+                    @Override
                    public void run() {
-                        pup.analyzeUrl(webView.getUrl());
+                        App app = ((App) activity.getApplication());
+                        final DiasporaUserProfile pup = app.getDiasporaUserProfile();
+                        if (pup.isRefreshNeeded()) {
+                            try {
+                                // Try to very fail-safe check if user information gets really loaded from correct pod
+                                if (!webView.getUrl().startsWith(app.getSettings().getPod().getPodUrl().getBaseUrl())) {
+                                    return;
+                                }
+                            } catch (Exception ignored) {
+                                return;
+                            }
+                            AppLog.v(this, "DiasporaUserProfile needs refresh; Try to parse JSON");
+                            pup.parseJson(webMessage);
+                            getActivity().runOnUiThread(new Runnable() {
+                                public void run() {
+                                    pup.analyzeUrl(webView.getUrl());
+                                }
+                            });
+                        }
                    }
                });
            }
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@ -36,14 +36,15 @@ import android.support.customtabs.CustomTabsSession;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.Menu;
@ -61,8 +62,8 @@ import android.widget.TextView;
 import android.widget.Toast;

 import com.github.dfa.diaspora_android.App;
-import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.data.DiasporaAspect;
 import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
 import com.github.dfa.diaspora_android.listener.DiasporaUserProfileChangedListener;
@ -71,12 +72,16 @@ import com.github.dfa.diaspora_android.receiver.OpenExternalLinkReceiver;
 import com.github.dfa.diaspora_android.receiver.UpdateTitleReceiver;
 import com.github.dfa.diaspora_android.ui.BadgeDrawable;
 import com.github.dfa.diaspora_android.ui.PodSelectionDialog;
-import com.github.dfa.diaspora_android.ui.theme.CustomFragment;
+import com.github.dfa.diaspora_android.ui.SearchOrCustomTextDialogCreator;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
 import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
+import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
+import com.github.dfa.diaspora_android.util.ActivityUtils;
+import com.github.dfa.diaspora_android.util.AndroidBug5497Workaround;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
+import com.github.dfa.diaspora_android.util.ContextUtils;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 import com.github.dfa.diaspora_android.web.BrowserFragment;
 import com.github.dfa.diaspora_android.web.ContextMenuWebView;
@ -84,13 +89,13 @@ import com.github.dfa.diaspora_android.web.ProxyHandler;
 import com.github.dfa.diaspora_android.web.WebHelper;
 import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;

+import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
+
 import java.io.IOException;

 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.github.gsantner.opoc.util.HelpersA;
-import io.github.gsantner.opoc.util.SimpleMarkdownParser;

 public class MainActivity extends ThemedActivity
        implements NavigationView.OnNavigationItemSelectedListener,
@ -116,7 +121,7 @@ public class MainActivity extends ThemedActivity

    private App app;
    private CustomTabActivityHelper customTabActivityHelper;
-    private AppSettings appSettings;
+    private AppSettings _appSettings;
    private DiasporaUrlHelper urls;
    private DiasporaUserProfile diasporaUserProfile;
    private final Handler uiHandler = new Handler();
@ -135,9 +140,6 @@ public class MainActivity extends ThemedActivity
    @BindView(R.id.main__topbar)
    Toolbar toolbarTop;

-    @BindView(R.id.main__bottombar)
-    ActionMenuView toolbarBottom;
-
    @BindView(R.id.fragment_container)
    FrameLayout fragmentContainer;

@ -169,16 +171,26 @@ public class MainActivity extends ThemedActivity
        super.onCreate(savedInstanceState);
        AppLog.v(this, "onCreate()");

+        // Pre UI
+        ContextUtils.get().setAppLanguage(AppSettings.get().getLanguage());
+        if (AppSettings.get().isEditorStatusBarHidden()) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+
+
        // Bind UI
        setContentView(R.layout.main__activity);
        ButterKnife.bind(this);
+        if (AppSettings.get().isEditorStatusBarHidden()) {
+            AndroidBug5497Workaround.assistActivity(this);
+        }

        app = (App) getApplication();
-        appSettings = app.getSettings();
+        _appSettings = app.getSettings();
        diasporaUserProfile = app.getDiasporaUserProfile();
        diasporaUserProfile.setCallbackHandler(uiHandler);
        diasporaUserProfile.setListener(this);
-        urls = new DiasporaUrlHelper(appSettings);
+        urls = new DiasporaUrlHelper(_appSettings);
        customTabActivityHelper = new CustomTabActivityHelper();
        customTabActivityHelper.setConnectionCallback(this);
        ProxyHandler.getInstance().updateProxySettings(this);
@ -189,7 +201,7 @@ public class MainActivity extends ThemedActivity
        brOpenExternalLink = new OpenExternalLinkReceiver(this);
        brSetTitle = new UpdateTitleReceiver(app, urls, new UpdateTitleReceiver.TitleCallback() {
            public void setTitle(String url, int resId) {
-                CustomFragment top = getTopFragment();
+                ThemedFragment top = getTopFragment();
                if (top != null && top.getFragmentTag().equals(DiasporaStreamFragment.TAG)) {
                    MainActivity.this.setTitle(resId);
                    showLastVisitedTimestampMessageIfNeeded(url);
@ -197,14 +209,14 @@ public class MainActivity extends ThemedActivity
            }

            public void setTitle(String url, String title) {
-                CustomFragment top = getTopFragment();
+                ThemedFragment top = getTopFragment();
                if (top != null && top.getFragmentTag().equals(DiasporaStreamFragment.TAG)) {
                    MainActivity.this.setTitle(title);
                }
            }
        });

-        if (!appSettings.hasPod()) {
+        if (!_appSettings.hasPod()) {
            AppLog.d(this, "We have no pod. Show PodSelectionFragment");
            updateNavigationViewEntryVisibilities();
            showFragment(getFragment(PodSelectionFragment.TAG));
@ -219,25 +231,16 @@ public class MainActivity extends ThemedActivity
            }
        }

-        // Show first start dialog
+        // Show first start / update dialog
        try {
-            if (appSettings.isAppFirstStart()) {
-                SimpleMarkdownParser smp = new SimpleMarkdownParser().parse(
-                        getResources().openRawResource(R.raw.license),
-                        SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, "");
-                String html = smp.getHtml()
-                        + "<br/><br/><br/>"
-                        + "<h1>" + getString(R.string.fragment_license__thirdparty_libs) + "</h1>"
-                        + smp.parse(getResources().openRawResource(R.raw.license_third_party),
-                        SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, "");
-                html = smp.setHtml(html).removeMultiNewlines().getHtml();
-                HelpersA.get(this).showDialogWithHtmlTextView(R.string.about_activity__title_about_license, html);
-                appSettings.isAppCurrentVersionFirstStart();
-            } else if (appSettings.isAppCurrentVersionFirstStart()) {
-                SimpleMarkdownParser smp = new SimpleMarkdownParser().parse(
-                        getResources().openRawResource(R.raw.changelog),
-                        SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, "");
-                HelpersA.get(this).showDialogWithHtmlTextView(R.string.changelog, smp.getHtml());
+            if (_appSettings.isAppCurrentVersionFirstStart(true)) {
+                SimpleMarkdownParser smp = SimpleMarkdownParser.get().setDefaultSmpFilter(SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW);
+                String html = "";
+                html += smp.parse(getString(R.string.copyright_license_text_official).replace("\n", "  \n"), "").getHtml();
+                html += "<br/><br/><br/><big><big>" + getString(R.string.changelog) + "</big></big><br/>" + smp.parse(getResources().openRawResource(R.raw.changelog), "", SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, SimpleMarkdownParser.FILTER_CHANGELOG).getHtml();
+                html += "<br/><br/><br/><big><big>" + getString(R.string.licenses) + "</big></big><br/>" + smp.parse(getResources().openRawResource(R.raw.licenses_3rd_party), "").getHtml();
+                ActivityUtils _au = new ActivityUtils(this);
+                _au.showDialogWithHtmlTextView(R.string.licenses, html);
            }
        } catch (IOException e) {
            e.printStackTrace();
@ -251,23 +254,17 @@ public class MainActivity extends ThemedActivity
    private void setupUI() {
        AppLog.i(this, "setupUI()");

-        // Setup toolbar
+        // Setup _toolbar
        setSupportActionBar(toolbarTop);
        ActionBar actionBar = getSupportActionBar();
        if (actionBar != null) {
            actionBar.setDisplayHomeAsUpEnabled(true);
        }
-        toolbarBottom.setOnMenuItemClickListener(new ActionMenuView.OnMenuItemClickListener() {
-            public boolean onMenuItemClick(MenuItem item) {
-                CustomFragment top = getTopFragment();
-                return MainActivity.this.onOptionsItemSelected(item) || (top != null && top.onOptionsItemSelected(item));
-            }
-        });
        setTitle(R.string.app_name);

        //Setup snackbar
        snackbarExitApp = Snackbar
-                .make(fragmentContainer, R.string.confirm_exit, Snackbar.LENGTH_LONG)
+                .make(fragmentContainer, R.string.do_you_want_to_exit, Snackbar.LENGTH_LONG)
                .setAction(android.R.string.yes, new View.OnClickListener() {
                    public void onClick(View view) {
                        finish();
@ -276,13 +273,13 @@ public class MainActivity extends ThemedActivity
                });
        snackbarLastVisitedTimestampInStream =
                Snackbar.make(fragmentContainer,
-                        R.string.jump_to_last_visited_timestamp_in_stream, Snackbar.LENGTH_LONG)
+                        R.string.jump_to_last_visited_page_in_stream__appspecific, Snackbar.LENGTH_LONG)
                        .setAction(android.R.string.yes, new View.OnClickListener() {
                            public void onClick(View view) {
                                openDiasporaUrl(urls.getStreamWithTimestampUrl(diasporaUserProfile.getLastVisitedPositionInStream()));
                            }
                        });
-        snackbarNoInternet = Snackbar.make(fragmentContainer, R.string.no_internet, Snackbar.LENGTH_LONG);
+        snackbarNoInternet = Snackbar.make(fragmentContainer, R.string.sorry_need_to_be_connected_to_internet, Snackbar.LENGTH_LONG);

        // Load app settings
        setupNavigationSlider();
@ -290,15 +287,15 @@ public class MainActivity extends ThemedActivity
    }

    /**
-     * Get an instance of the CustomFragment with the tag fragmentTag.
+     * Get an instance of the ThemedFragment with the tag fragmentTag.
     * If there was no instance so far, create a new one and add it to the FragmentManagers pool.
     * If there is no Fragment with the corresponding Tag, return the top fragment.
     *
     * @param fragmentTag tag
     * @return corresponding Fragment
     */
-    protected CustomFragment getFragment(String fragmentTag) {
-        CustomFragment fragment = (CustomFragment) fm.findFragmentByTag(fragmentTag);
+    protected ThemedFragment getFragment(String fragmentTag) {
+        ThemedFragment fragment = (ThemedFragment) fm.findFragmentByTag(fragmentTag);
        if (fragment != null) {
            return fragment;
        } else {
@ -311,14 +308,6 @@ public class MainActivity extends ThemedActivity
                    BrowserFragment bf = new BrowserFragment();
                    fm.beginTransaction().add(bf, fragmentTag).commit();
                    return bf;
-                case TagListFragment.TAG:
-                    TagListFragment hlf = new TagListFragment();
-                    fm.beginTransaction().add(hlf, fragmentTag).commit();
-                    return hlf;
-                case AspectListFragment.TAG:
-                    AspectListFragment alf = new AspectListFragment();
-                    fm.beginTransaction().add(alf, fragmentTag).commit();
-                    return alf;
                case PodSelectionFragment.TAG:
                    PodSelectionFragment psf = new PodSelectionFragment();
                    fm.beginTransaction().add(psf, fragmentTag).commit();
@ -336,12 +325,30 @@ public class MainActivity extends ThemedActivity
     *
     * @param url URL to load in the DiasporaStreamFragment
     */
-    public void openDiasporaUrl(String url) {
+    public void openDiasporaUrl(final String url) {
        AppLog.v(this, "openDiasporaUrl()");
-        DiasporaStreamFragment streamFragment = (DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG);
-        showFragment(streamFragment);
-        showLastVisitedTimestampMessageIfNeeded(url);
-        streamFragment.loadUrl(url);
+        if (url != null && url.startsWith("http://127.0.0.1")) {
+            // This URL seems to be called somehow, but it doesn't make sense ;)
+            toolbarTop.postDelayed(() -> {
+                Intent i = new Intent(ACTION_OPEN_EXTERNAL_URL);
+                i.putExtra(EXTRA_URL, "https://github.com/gsantner/dandelion/blob/master/README.md");
+                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(i);
+            }, 1000);
+            return;
+        }
+        if (_appSettings.getPod() != null && _appSettings.getPod().getPodUrl() != null && _appSettings.getPod().getPodUrl().getBaseUrl() != null
+                && url.startsWith(_appSettings.getPod().getPodUrl().getBaseUrl()) && !url.startsWith("https://dia.so/")) {
+            DiasporaStreamFragment streamFragment = (DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG);
+            showFragment(streamFragment);
+            showLastVisitedTimestampMessageIfNeeded(url);
+            streamFragment.loadUrl(url);
+        } else {
+            toolbarTop.postDelayed(() -> {
+                Intent i = new Intent(ACTION_OPEN_EXTERNAL_URL);
+                i.putExtra(EXTRA_URL, url);
+                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(i);
+            }, 1000);
+        }
    }

    public void showLastVisitedTimestampMessageIfNeeded(String url) {
@ -356,18 +363,21 @@ public class MainActivity extends ThemedActivity
     *
     * @param fragment Fragment to show
     */
-    protected void showFragment(CustomFragment fragment) {
+    protected void showFragment(ThemedFragment fragment) {
+        if (PodSelectionFragment.TAG.equals(fragment.getTag())) {
+            Fragment fragment1 = fm.findFragmentByTag(DiasporaStreamFragment.TAG);
+            if (fragment1 != null) {
+                new net.gsantner.opoc.util.ContextUtils(this).restartApp(MainActivity.class);
+            }
+        }
+
        AppLog.v(this, "showFragment()");
-        CustomFragment currentTop = (CustomFragment) fm.findFragmentById(R.id.fragment_container);
+        ThemedFragment currentTop = (ThemedFragment) fm.findFragmentById(R.id.fragment_container);
        if (currentTop == null || !currentTop.getFragmentTag().equals(fragment.getFragmentTag())) {
            AppLog.v(this, "Fragment was not visible. Replace it.");
            fm.beginTransaction().addToBackStack(null).replace(R.id.fragment_container, fragment, fragment.getFragmentTag()).commit();
            invalidateOptionsMenu();
-            if (appSettings.isIntellihideToolbars() && fragment.isAllowedIntellihide()) {
-                this.enableToolbarHiding();
-            } else {
-                this.disableToolbarHiding();
-            }
+            setToolbarIntellihide(_appSettings.isIntellihideToolbars() && fragment.isAllowedIntellihide());
        } else {
            AppLog.v(this, "Fragment was already visible. Do nothing.");
        }
@ -378,7 +388,7 @@ public class MainActivity extends ThemedActivity
     */
    private void setupNavigationSlider() {
        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, navDrawer, toolbarTop, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+                this, navDrawer, toolbarTop, R.string.open_navdrawer, R.string.close_navdrawer);
        navDrawer.addDrawerListener(toggle);
        toggle.syncState();

@ -392,7 +402,7 @@ public class MainActivity extends ThemedActivity
        navProfilePictureArea.setOnClickListener(new View.OnClickListener() {
            public void onClick(View view) {
                navDrawer.closeDrawer(GravityCompat.START);
-                if (!appSettings.getProfileId().equals("")) {
+                if (!_appSettings.getProfileId().equals("")) {
                    openDiasporaUrl(urls.getProfileUrl());
                }
            }
@ -401,13 +411,13 @@ public class MainActivity extends ThemedActivity
        navheaderDescription = ButterKnife.findById(navHeader, R.id.podselection__podupti_notice);
        navheaderImage = ButterKnife.findById(navHeader, R.id.navheader_user_image);

-        if (!appSettings.getName().equals("")) {
-            navheaderTitle.setText(appSettings.getName());
+        if (!_appSettings.getName().equals("")) {
+            navheaderTitle.setText(_appSettings.getName());
        }
-        if (appSettings.getPod() != null) {
-            navheaderDescription.setText(appSettings.getPod().getName());
+        if (_appSettings.getPod() != null) {
+            navheaderDescription.setText(_appSettings.getPod().getName());
        }
-        String avatarUrl = appSettings.getAvatarUrl();
+        String avatarUrl = _appSettings.getAvatarUrl();
        if (!avatarUrl.equals("")) {
            //Display app launcher icon instead of default avatar asset
            //(Which would by the way not load because of missing pod domain prefix in the url)
@ -422,8 +432,6 @@ public class MainActivity extends ThemedActivity
                    app.getAvatarImageLoader().startImageDownload(navheaderImage, avatarUrl);
                }
            }
-        } else if (BuildConfig.IS_TEST_BUILD) {
-            navheaderImage.setImageResource(R.drawable.ic_launcher_test);
        }
        updateNavigationViewEntryVisibilities();
    }
@ -435,38 +443,39 @@ public class MainActivity extends ThemedActivity
        navMenu.setGroupVisible(navMenu.findItem(R.id.nav_exit).getGroupId(), true);

        // Hide by app settings
-        navMenu.findItem(R.id.nav_exit).setVisible(appSettings.isVisibleInNavExit());
-        navMenu.findItem(R.id.nav_activities).setVisible(appSettings.isVisibleInNavActivities());
-        navMenu.findItem(R.id.nav_aspects).setVisible(appSettings.isVisibleInNavAspects());
-        navMenu.findItem(R.id.nav_contacts).setVisible(appSettings.isVisibleInNavContacts());
-        navMenu.findItem(R.id.nav_commented).setVisible(appSettings.isVisibleInNavCommented());
-        navMenu.findItem(R.id.nav_followed_tags).setVisible(appSettings.isVisibleInNavFollowed_tags());
-        navMenu.findItem(R.id.nav_about).setVisible(appSettings.isVisibleInNavHelp_license());
-        navMenu.findItem(R.id.nav_liked).setVisible(appSettings.isVisibleInNavLiked());
-        navMenu.findItem(R.id.nav_mentions).setVisible(appSettings.isVisibleInNavMentions());
-        navMenu.findItem(R.id.nav_profile).setVisible(appSettings.isVisibleInNavProfile());
-        navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());
+        navMenu.findItem(R.id.nav_exit).setVisible(_appSettings.isVisibleInNavExit());
+        navMenu.findItem(R.id.nav_activities).setVisible(_appSettings.isVisibleInNavActivities());
+        navMenu.findItem(R.id.nav_aspects).setVisible(_appSettings.isVisibleInNavAspects());
+        navMenu.findItem(R.id.nav_contacts).setVisible(_appSettings.isVisibleInNavContacts());
+        navMenu.findItem(R.id.nav_commented).setVisible(_appSettings.isVisibleInNavCommented());
+        navMenu.findItem(R.id.nav_followed_tags).setVisible(_appSettings.isVisibleInNavFollowed_tags());
+        navMenu.findItem(R.id.nav_about).setVisible(_appSettings.isVisibleInNavHelp_license());
+        navMenu.findItem(R.id.nav_liked).setVisible(_appSettings.isVisibleInNavLiked());
+        navMenu.findItem(R.id.nav_mentions).setVisible(_appSettings.isVisibleInNavMentions());
+        navMenu.findItem(R.id.nav_profile).setVisible(_appSettings.isVisibleInNavProfile());
+        navMenu.findItem(R.id.nav_public).setVisible(_appSettings.isVisibleInNavPublic_activities());
        navMenu.findItem(R.id.nav_stream).setVisible(true);
-        navMenu.findItem(R.id.nav_statistics).setVisible(appSettings.isVisibleInNavStatistics());
-        navMenu.findItem(R.id.nav_reports).setVisible(appSettings.isVisibleInNavReports());
-        navMenu.findItem(R.id.nav_toggle_desktop_page).setVisible(appSettings.isVisibleToggleMobileDesktop());
+        navMenu.findItem(R.id.nav_statistics).setVisible(_appSettings.isVisibleInNavStatistics());
+        navMenu.findItem(R.id.nav_reports).setVisible(_appSettings.isVisibleInNavReports());
+        navMenu.findItem(R.id.nav_toggle_desktop_page).setVisible(_appSettings.isVisibleInNavToggleMobileDesktop());
+        navMenu.findItem(R.id.nav_product_support).setVisible(_appSettings.isVisibleInNavGsantnerAccount());


        // Hide whole group (for logged in use) if no pod was selected
-        if (!appSettings.hasPod()) {
+        if (!_appSettings.hasPod()) {
            navMenu.setGroupVisible(navMenu.findItem(R.id.nav_exit).getGroupId(), false);
        }
    }

    /**
-     * Open Stream when clicked on top toolbar AND preference stream shortcut is true
+     * Open Stream when clicked on top _toolbar AND preference stream shortcut is true
     *
     * @param view selected view
     */
    @OnClick(R.id.main__topbar)
    public void onToolBarClicked(View view) {
        AppLog.i(this, "onToolBarClicked()");
-        if (appSettings.isTopbarStreamShortcutEnabled() && appSettings.hasPod()) {
+        if (_appSettings.isTopbarStreamShortcutEnabled() && _appSettings.hasPod()) {
            onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_stream));
        }
    }
@ -513,7 +522,7 @@ public class MainActivity extends ThemedActivity
            }
        } else if (ACTION_CHANGE_ACCOUNT.equals(action)) {
            AppLog.v(this, "Reset pod data and  show PodSelectionFragment");
-            appSettings.setPod(null);
+            _appSettings.setPod(null);
            runOnUiThread(new Runnable() {
                public void run() {
                    navheaderTitle.setText(R.string.app_name);
@ -550,6 +559,18 @@ public class MainActivity extends ThemedActivity
        } else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
            /* TODO: Implement and add filter to manifest */
            return;
+        } else if ("sc_new_post".equals(action)) {
+            openDiasporaUrl(urls.getNewPostUrl());
+            return;
+        } else if ("sc_activities".equals(action)) {
+            openDiasporaUrl(urls.getActivityUrl());
+            return;
+        } else if ("sc_contacts".equals(action)) {
+            onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_aspects));
+            return;
+        } else if ("sc_tags".equals(action)) {
+            onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_followed_tags));
+            return;
        }
        //Catch split screen recreation
        if (action != null && action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
@ -580,8 +601,8 @@ public class MainActivity extends ThemedActivity
     *
     * @return top fragment or null if there is none displayed
     */
-    private CustomFragment getTopFragment() {
-        return (CustomFragment) fm.findFragmentById(R.id.fragment_container);
+    private ThemedFragment getTopFragment() {
+        return (ThemedFragment) fm.findFragmentById(R.id.fragment_container);
    }

    /**
@ -594,7 +615,7 @@ public class MainActivity extends ThemedActivity
            navDrawer.closeDrawer(navView);
            return;
        }
-        CustomFragment top = getTopFragment();
+        ThemedFragment top = getTopFragment();
        if (top != null) {
            AppLog.v(this, "Top Fragment is not null");
            if (!top.onBackPressed()) {
@ -646,48 +667,52 @@ public class MainActivity extends ThemedActivity
        LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL));
        LocalBroadcastManager.getInstance(this).registerReceiver(brOpenExternalLink, new IntentFilter(ACTION_OPEN_EXTERNAL_URL));
        invalidateOptionsMenu();
-        this.appSettings = getAppSettings();
-        if (appSettings.isIntellihideToolbars()) {
-            enableToolbarHiding();
-        } else {
-            disableToolbarHiding();
+        _appSettings = getAppSettings();
+        if (_appSettings.isRecreateMainActivity()) {
+            recreate();
+        }
+        setToolbarIntellihide(_appSettings.isIntellihideToolbars());
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayShowTitleEnabled(AppSettings.get().isShowTitleInMainView());
        }
        updateNavigationViewEntryVisibilities();
    }

    /**
-     * Clear and repopulate top and bottom toolbar.
+     * Clear and repopulate top and bottom _toolbar.
     * Also add menu items of the displayed fragment
     *
-     * @param menu top toolbar
+     * @param menu top _toolbar
     * @return boolean
     */
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        AppLog.v(this, "onCreateOptionsMenu()");
+        boolean cache;
+
        //Clear the menus
        menu.clear();
-        toolbarBottom.getMenu().clear();
-        toolbarBottom.setVisibility(View.VISIBLE);

-        CustomFragment top = getTopFragment();
+        ThemedFragment top = getTopFragment();
        if (top != null) {
-            //PodSelectionFragment?
-            if (top.getFragmentTag().equals(PodSelectionFragment.TAG)) {
-                ///Hide bottom toolbar
-                toolbarBottom.setVisibility(View.GONE);
-            } else {
-                getMenuInflater().inflate(appSettings.isExtendedNotificationsActivated() ?
-                        R.menu.main__menu_top__notifications_dropdown : R.menu.main__menu_top, menu);
-                getMenuInflater().inflate(R.menu.main__menu_bottom, toolbarBottom.getMenu());
-                top.onCreateBottomOptionsMenu(toolbarBottom.getMenu(), getMenuInflater());
+            if (!top.getFragmentTag().equals(PodSelectionFragment.TAG)) {
+                cache = _appSettings.isExtendedNotificationsActivated();
+                getMenuInflater().inflate(R.menu.main__menu_top, menu);
+                menu.findItem(R.id.action_notifications).setVisible(!cache);
+                menu.findItem(R.id.action_notifications_extended).setVisible(cache);
            }
        }
+
+        ContextUtils cu = ContextUtils.get();
+        final boolean darkBg = cu.get().shouldColorOnTopBeLight(AppSettings.get().getPrimaryColor());
+        cu.tintMenuItems(menu, true, ContextCompat.getColor(this, darkBg ? R.color.white : R.color.black));
+        cu.setSubMenuIconsVisiblity(menu, true);
+
        return true;
    }

    /**
-     * Set the notification and messages counter in the top toolbar
+     * Set the notification and messages counter in the top _toolbar
     *
     * @param menu menu
     * @return boolean
@ -720,7 +745,7 @@ public class MainActivity extends ThemedActivity
        AppLog.i(this, "onOptionsItemSelected()");
        switch (item.getItemId()) {
            case R.id.action_notifications: {
-                if (appSettings.isExtendedNotificationsActivated()) {
+                if (_appSettings.isExtendedNotificationsActivated()) {
                    return true;
                }
                //Otherwise we execute the action of action_notifications_all
@ -820,7 +845,7 @@ public class MainActivity extends ThemedActivity
                    final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

                    @SuppressLint("InflateParams") View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false);
-                    final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input);
+                    final EditText input = layout.findViewById(R.id.dialog_search__input);
                    input.setMaxLines(1);
                    input.setSingleLine(true);
                    ThemeHelper.updateEditTextColor(input);
@ -829,7 +854,7 @@ public class MainActivity extends ThemedActivity
                        public void onClick(DialogInterface dialogInterface, int which) {
                            String query = input.getText().toString().trim().replaceAll((which == DialogInterface.BUTTON_NEGATIVE ? "\\*" : "\\#"), "");
                            if (query.equals("")) {
-                                Snackbar.make(fragmentContainer, R.string.search_alert_bypeople_validate_needsomedata, Snackbar.LENGTH_LONG).show();
+                                Snackbar.make(fragmentContainer, R.string.please_add_a_name, Snackbar.LENGTH_LONG).show();
                            } else {
                                openDiasporaUrl(which == DialogInterface.BUTTON_NEGATIVE ? urls.getSearchPeopleUrl(query) : urls.getSearchTagsUrl(query));
                            }
@ -838,11 +863,11 @@ public class MainActivity extends ThemedActivity
                        }
                    };

-                    final AlertDialog dialog = new ThemedAlertDialogBuilder(this, appSettings)
+                    final AlertDialog dialog = new ThemedAlertDialogBuilder(this, _appSettings)
                            .setView(layout).setTitle(R.string.search_alert_title)
                            .setCancelable(true)
-                            .setPositiveButton(R.string.search_alert_tag, clickListener)
-                            .setNegativeButton(R.string.search_alert_people, clickListener)
+                            .setPositiveButton(R.string.by_tags, clickListener)
+                            .setNegativeButton(R.string.by_people, clickListener)
                            .create();

                    input.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@ -944,7 +969,7 @@ public class MainActivity extends ThemedActivity
    private void setSharedTexts(String sharedSubject, String sharedBody) {
        AppLog.i(this, "setSharedTexts()");
        String body = WebHelper.replaceUrlWithMarkdown(sharedBody);
-        if (appSettings.isAppendSharedViaApp()) {
+        if (_appSettings.isAppendSharedViaApp()) {
            AppLog.v(this, "Append app reference to shared text");
            body = body + "\n\n" + getString(R.string.shared_via_app);
        }
@ -981,7 +1006,7 @@ public class MainActivity extends ThemedActivity
    public void onNotificationCountChanged(DiasporaUserProfile diasporaUserProfile, int notificationCount) {
        AppLog.i(this, "onNotificationCountChanged()");
        // Count saved in DiasporaUserProfile
-        // Invalidate the top toolbar to update the unread messages counter
+        // Invalidate the top _toolbar to update the unread messages counter
        invalidateOptionsMenu();
    }

@ -990,7 +1015,7 @@ public class MainActivity extends ThemedActivity
    public void onUnreadMessageCountChanged(DiasporaUserProfile diasporaUserProfile, int unreadMessageCount) {
        AppLog.i(this, "onUnreadMessageCountChanged()");
        // Count saved in DiasporaUserProfile
-        // Invalidate the top toolbar to update the unread messages counter
+        // Invalidate the top _toolbar to update the unread messages counter
        invalidateOptionsMenu();
    }

@ -1031,19 +1056,46 @@ public class MainActivity extends ThemedActivity
            break;

            case R.id.nav_profile: {
-                if (!appSettings.getProfileId().equals("")) {
+                if (!_appSettings.getProfileId().equals("")) {
                    openDiasporaUrl(urls.getProfileUrl());
                }
            }
            break;

            case R.id.nav_followed_tags: {
-                showFragment(getFragment(TagListFragment.TAG));
+                SearchOrCustomTextDialogCreator.showDiasporaTagsDialog(this, arg -> {
+                    if (arg.startsWith(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX)) {
+                        arg = arg.replace(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX, "").trim();
+                        if (arg.equals(getString(R.string.manage_hashtags))) {
+                            openDiasporaUrl(urls.getManageTagsUrl());
+                        } else {
+                            openDiasporaUrl(urls.getAllFollowedTagsUrl());
+                        }
+                    } else {
+                        openDiasporaUrl(urls.getSearchTagsUrl(arg));
+                    }
+                });
            }
            break;

            case R.id.nav_aspects: {
-                showFragment(getFragment(AspectListFragment.TAG));
+                SearchOrCustomTextDialogCreator.showDiasporaAspectsDialog(this, arg -> {
+                    if (arg.startsWith(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX)) {
+                        arg = arg.replace(SearchOrCustomTextDialogCreator.SPECIAL_PREFIX, "").trim();
+                        if (arg.equals(getString(R.string.manage_your_contact_list))) {
+                            openDiasporaUrl(urls.getContactsUrl());
+                        } else if (arg.equals(getString(R.string.nav_profile))) {
+                            openDiasporaUrl(urls.getProfileUrl());
+                        }
+                    } else {
+                        for (DiasporaAspect daspect : _appSettings.getAspects()) {
+                            if (arg.equals(daspect.name)) {
+                                openDiasporaUrl(urls.getAspectUrl(Long.toString(daspect.id)));
+                                break;
+                            }
+                        }
+                    }
+                });
            }
            break;

@ -1124,6 +1176,11 @@ public class MainActivity extends ThemedActivity
            }
            break;

+            case R.id.nav_product_support: {
+                openDiasporaUrl(urls.getProfileUrl("d1cbdd70095301341e834860008dbc6c"));
+            }
+            break;
+
            case R.id.nav_exit: {
                moveTaskToBack(true);
                finish();
@ -1192,32 +1249,31 @@ public class MainActivity extends ThemedActivity
    @Override
    protected void applyColorToViews() {
        ThemeHelper.updateToolbarColor(toolbarTop);
-        ThemeHelper.updateActionMenuViewColor(toolbarBottom);
-        navDrawerLayout.setBackgroundColor(appSettings.getPrimaryColor());
-        navProfilePictureArea.setBackgroundColor(appSettings.getPrimaryColor());
-        if (appSettings.isAmoledColorMode()) {
+        navDrawerLayout.setBackgroundColor(_appSettings.getPrimaryColor());
+        navProfilePictureArea.setBackgroundColor(_appSettings.getPrimaryColor());
+        if (_appSettings.isAmoledColorMode()) {
            navView.setItemTextColor(ColorStateList.valueOf(Color.GRAY));
            navView.setItemIconTintList(ColorStateList.valueOf(Color.GRAY));
            navView.setBackgroundColor(Color.BLACK);
            navheaderTitle.setTextColor(Color.GRAY);
            navheaderDescription.setTextColor(Color.DKGRAY);
        }
+
+        int popupTheme = ContextUtils.get().shouldColorOnTopBeLight(AppSettings.get().getPrimaryColor())
+                ? R.style.AppTheme_PopupOverlay_Dark : R.style.AppTheme_PopupOverlay_Light;
+        toolbarTop.setPopupTheme(popupTheme);
    }

-    @Override
-    public void enableToolbarHiding() {
-        AppLog.d(this, "Enable Intellihide");
+    public void setToolbarIntellihide(boolean enable) {
        AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams();
-        //scroll|enterAlways|snap
-        params.setScrollFlags(toolbarDefaultScrollFlags);
-        appBarLayout.setExpanded(true, true);
-    }
+        if (enable) {
+            AppLog.d(this, "Enable Intellihide");
+            params.setScrollFlags(toolbarDefaultScrollFlags);

-    @Override
-    public void disableToolbarHiding() {
-        AppLog.d(this, "Disable Intellihide");
-        AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams();
-        params.setScrollFlags(0);  // clear all scroll flags
+        } else {
+            AppLog.d(this, "Disable Intellihide");
+            params.setScrollFlags(0);  // clear all scroll flags
+        }
        appBarLayout.setExpanded(true, true);
    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java
@ -22,17 +22,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.SearchView;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@ -52,10 +51,10 @@ import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
 import com.github.dfa.diaspora_android.service.FetchPodsService;
 import com.github.dfa.diaspora_android.ui.PodSelectionDialog;
 import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
-import com.github.dfa.diaspora_android.util.AppLog;
+import com.github.dfa.diaspora_android.util.ActivityUtils;
 import com.github.dfa.diaspora_android.util.AppSettings;
+import com.github.dfa.diaspora_android.util.ContextUtils;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-import com.github.dfa.diaspora_android.util.Helpers;

 import org.json.JSONException;
 import org.json.JSONObject;
@ -91,16 +90,14 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
    private String filterString = "";

    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        AppLog.d(this, "onCreateView()");
-        View view = inflater.inflate(R.layout.podselection__fragment, container, false);
-        ButterKnife.bind(this, view);
-        return view;
+    protected int getLayoutResId() {
+        return R.layout.podselection__fragment;
    }

    @Override
    public void onViewCreated(View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
+        ButterKnife.bind(this, view);
        app = (App) getActivity().getApplication();
        appSettings = app.getSettings();

@ -128,11 +125,11 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
            }
        });
        LocalBroadcastManager.getInstance(getContext()).registerReceiver(podListReceiver, new IntentFilter(FetchPodsService.MESSAGE_PODS_RECEIVED));
-        Helpers.get().showInfoIfUserNotConnectedToInternet(getActivity(), listViewPod);
+        ActivityUtils.get(getActivity()).showInfoIfUserNotConnectedToInternet(listViewPod);
    }

    public void mergePodlistWithRessources(DiasporaPodList podlist) {
-        String sPodlist = Helpers.get().readTextfileFromRawRes(R.raw.podlist, "", "");
+        String sPodlist = ContextUtils.get().readTextfileFromRawRes(R.raw.podlist, "", "");
        try {
            JSONObject jPodlist = new JSONObject(sPodlist);
            podlist.mergeWithNewerEntries(new DiasporaPodList().fromJson(jPodlist));
@ -164,7 +161,7 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
                    } catch (JSONException ignored) {
                    }
                } else {
-                    Snackbar.make(listViewPod, R.string.podlist_error, Snackbar.LENGTH_SHORT).show();
+                    Snackbar.make(listViewPod, R.string.could_not_retrieve_list_of_pods__appspecific, Snackbar.LENGTH_SHORT).show();
                }
            }
        }
@ -176,8 +173,10 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
        rootView.setBackgroundColor(appSettings.isAmoledColorMode() ? Color.BLACK : Color.WHITE);
        listViewPod.setDivider(new ColorDrawable(Color.GRAY));
        listViewPod.setDividerHeight(dividerHeight);
-        buttonUseCustomPod.setSupportBackgroundTintList(ColorStateList.valueOf(appSettings.isAmoledColorMode() ? Color.DKGRAY : Color.WHITE));
-        buttonUseCustomPod.setTextColor(appSettings.isAmoledColorMode() ? Color.WHITE : Color.BLACK);
+        int bgcolor = appSettings.isAmoledColorMode() ? Color.DKGRAY : appSettings.getAccentColor();
+        buttonUseCustomPod.setBackgroundColor(bgcolor);
+        buttonUseCustomPod.setTextColor(_cu.shouldColorOnTopBeLight(bgcolor) ? Color.WHITE : Color.BLACK);
+
    }

    @Override
@ -200,7 +199,7 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
            @Override
            public View getView(int position, View convertView, ViewGroup parent) {
                View view = super.getView(position, convertView, parent);
-                TextView textView = (TextView) view.findViewById(android.R.id.text1);
+                TextView textView = view.findViewById(android.R.id.text1);
                textView.setTextColor(appSettings.isAmoledColorMode() ? Color.GRAY : Color.BLACK);
                return view;
            }
@ -229,6 +228,7 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O

    @Override
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
        inflater.inflate(R.menu.podselection__menu, menu);

        MenuItem searchItem = menu.findItem(R.id.podselection__action_search);
@ -237,14 +237,15 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
            searchView.setOnQueryTextListener(this);
        }

-        super.onCreateOptionsMenu(menu, inflater);
+        final boolean darkBg = ContextUtils.get().shouldColorOnTopBeLight(AppSettings.get().getPrimaryColor());
+        ContextUtils.get().tintMenuItems(menu, true, ContextCompat.getColor(getActivity(), darkBg ? R.color.white : R.color.black));
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.action_reload: {
-                if (!Helpers.get().showInfoIfUserNotConnectedToInternet(getActivity(), listViewPod)) {
+                if (!ActivityUtils.get(getActivity()).showInfoIfUserNotConnectedToInternet(listViewPod)) {
                    Intent i = new Intent(getContext(), FetchPodsService.class);
                    getContext().startService(i);
                    return true;
@ -293,11 +294,6 @@ public class PodSelectionFragment extends ThemedFragment implements SearchView.O
    /*
     *  Dummy implementations
     */
-
-    @Override
-    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-    }
-
    @Override
    public boolean onQueryTextSubmit(String query) {
        return false;
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
@ -38,11 +38,6 @@ import butterknife.ButterKnife;
 import uz.shift.colorpicker.LineColorPicker;
 import uz.shift.colorpicker.OnColorChangedListener;

-/**
- * SettingsActivity
- * Created by vanitas on 24.10.16.
- */
-
 public class SettingsActivity extends ThemedActivity implements SharedPreferences.OnSharedPreferenceChangeListener {

    //Toolbar
@ -136,7 +131,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
        if (top != null && top.getFragmentTag().equals(SettingsFragmentProxy.TAG)) {
            ProxyHandler.ProxySettings newProxySettings = getAppSettings().getProxySettings();
            if (oldProxySettings.isEnabled() && !newProxySettings.isEnabled()) {
-                Toast.makeText(this, R.string.toast__proxy_disabled__restart_required, Toast.LENGTH_LONG).show();
+                Toast.makeText(this, R.string.app_needs_restart_to_disable_proxy_usage, Toast.LENGTH_LONG).show();
            }
        }
        super.onBackPressed();
@ -192,6 +187,12 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                    ((SettingsActivity) getActivity()).showFragment(SettingsFragmentDebugging.TAG, true);
                    return true;
                }
+                /** Usability */
+                else if (settings.isKeyEqual(key, R.string.pref_key__is_overview_statusbar_hidden)) {
+                    AppSettings.get().setRecreateMainActivity(true);
+                } else if (settings.isKeyEqual(key, R.string.pref_key__language)) {
+                    AppSettings.get().setRecreateMainActivity(true);
+                }
                /** Network */
                else if (settings.isKeyEqual(key, R.string.pref_key__clear_cache)) {
                    Intent intent = new Intent(getActivity(), MainActivity.class);
@ -225,7 +226,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                } else if (settings.isKeyEqual(key, R.string.pref_key__change_account)) {
                    new ThemedAlertDialogBuilder(getActivity(), AppSettings.get())
                            .setTitle(getString(R.string.confirmation))
-                            .setMessage(getString(R.string.pref_warning__change_account))
+                            .setMessage(getString(R.string.logout_warning_description))
                            .setNegativeButton(android.R.string.no, null)
                            .setPositiveButton(android.R.string.yes,
                                    new DialogInterface.OnClickListener() {
@ -270,6 +271,8 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference

        @Override
        public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+            AppSettings settings = ((App) getActivity().getApplication()).getSettings();
+            DiasporaUrlHelper diasporaUrlHelper = new DiasporaUrlHelper(settings);
            if (isAdded() && preference.hasKey()) {
                String key = preference.getKey();
                if (key.equals(getString(R.string.pref_key__primary_color__preference_click))) {
@ -278,6 +281,13 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                } else if (key.equals(getString(R.string.pref_key__accent_color__preference_click))) {
                    showColorPickerDialog(2);
                    return true;
+                } else if (key.equals(getString(R.string.pref_key__manage_theme))) {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    intent.setAction(MainActivity.ACTION_OPEN_URL);
+                    intent.putExtra(MainActivity.URL_MESSAGE, diasporaUrlHelper.getThemeUrl());
+                    startActivity(intent);
+                    getActivity().finish();
+                    return true;
                }
            }
            return super.onPreferenceTreeClick(screen, preference);
@ -304,12 +314,12 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
            final ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(context, appSettings);
            builder.setView(dialogLayout);

-            final FrameLayout titleBackground = (FrameLayout) dialogLayout.findViewById(R.id.color_picker_dialog__title_background);
-            final TextView title = (TextView) dialogLayout.findViewById(R.id.color_picker_dialog__title);
-            final LineColorPicker base = (LineColorPicker) dialogLayout.findViewById(R.id.color_picker_dialog__base_picker);
-            final LineColorPicker shade = (LineColorPicker) dialogLayout.findViewById(R.id.color_picker_dialog__shade_picker);
+            final FrameLayout titleBackground = dialogLayout.findViewById(R.id.color_picker_dialog__title_background);
+            final TextView title = dialogLayout.findViewById(R.id.color_picker_dialog__title);
+            final LineColorPicker base = dialogLayout.findViewById(R.id.color_picker_dialog__base_picker);
+            final LineColorPicker shade = dialogLayout.findViewById(R.id.color_picker_dialog__shade_picker);

-            title.setText(type == 1 ? R.string.pref_title__primary_color : R.string.pref_title__accent_color);
+            title.setText(type == 1 ? R.string.primary_colors : R.string.accent_color);
            title.setTextColor(getResources().getColor(R.color.white));
            final int[] current = (type == 1 ? appSettings.getPrimaryColorSettings() : appSettings.getAccentColorSettings());
            base.setColors((type == 1 ? ColorPalette.getBaseColors(context) : ColorPalette.getAccentColors(context)));
@ -411,7 +421,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
                if (appSettings.isKeyEqual(key, R.string.pref_key__http_proxy_load_tor_preset)) {
                    appSettings.setProxyHttpHost("127.0.0.1");
                    appSettings.setProxyHttpPort(8118);
-                    Toast.makeText(screen.getContext(), R.string.toast__proxy_orbot_preset_loaded, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(screen.getContext(), R.string.orbot_proxy_preset_loaded, Toast.LENGTH_SHORT).show();
                    return true;
                }
            }
@ -476,17 +486,13 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference

            ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(getActivity(), appSettings);
            builder.setTitle(R.string.confirmation)
-                    .setMessage(R.string.dialog_content__wipe_settings)
+                    .setMessage(R.string.wipe_settings_warning__appspecific)
                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                        @Override
                        public void onClick(DialogInterface dialogInterface, int i) {
                            appSettings.resetAppSettings();
                            appSettings.resetPodSettings();
-                            Intent restartActivity = new Intent(getActivity(), MainActivity.class);
-                            PendingIntent pendingIntent = PendingIntent.getActivity(getActivity(), 12374, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
-                            AlarmManager mgr = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE);
-                            mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent);
-                            System.exit(0);
+                            new net.gsantner.opoc.util.ContextUtils(appSettings.getContext()).restartApp(MainActivity.class);
                        }
                    }).setNegativeButton(android.R.string.cancel, null)
                    .create().show();
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java
@ -1,215 +0,0 @@
-/*
-    This file is part of the dandelion*.
-
-    dandelion* 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.
-
-    dandelion* 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 the dandelion*.
-
-    If not, see <http://www.gnu.org/licenses/>.
- */
-package com.github.dfa.diaspora_android.activity;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.os.Bundle;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.github.dfa.diaspora_android.App;
-import com.github.dfa.diaspora_android.R;
-import com.github.dfa.diaspora_android.listener.OnSomethingClickListener;
-import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
-import com.github.dfa.diaspora_android.util.AppLog;
-import com.github.dfa.diaspora_android.util.AppSettings;
-import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
-import com.github.dfa.diaspora_android.util.Helpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Fragment that shows a list of the HashTags the user follows
- */
-public class TagListFragment extends ThemedFragment implements OnSomethingClickListener<Object> {
-
-    public static final String TAG = "com.github.dfa.diaspora_android.TagListFragment";
-
-    @BindView(R.id.fragment_list__recycler_view)
-    public RecyclerView followedTagsRecyclerView;
-
-    @BindView(R.id.fragment_list__spacer)
-    public View space;
-
-    @BindView(R.id.fragment_list__root)
-    public RelativeLayout rootView;
-
-    protected App app;
-    protected DiasporaUrlHelper urls;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        AppLog.d(this, "onCreateView()");
-        return inflater.inflate(R.layout.recycler_list__fragment, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
-        app = (App) getActivity().getApplication();
-        AppSettings appSettings = app.getSettings();
-        urls = new DiasporaUrlHelper(appSettings);
-
-        followedTagsRecyclerView.setHasFixedSize(true);
-        followedTagsRecyclerView.setNestedScrollingEnabled(false);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
-        followedTagsRecyclerView.setLayoutManager(layoutManager);
-
-        final FollowedTagsAdapter adapter = new FollowedTagsAdapter(appSettings, this);
-        followedTagsRecyclerView.setAdapter(adapter);
-
-        //Set window title
-        getActivity().setTitle(R.string.nav_followed_tags);
-    }
-
-    @Override
-    public String getFragmentTag() {
-        return TAG;
-    }
-
-    @Override
-    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-        /* Nothing to do */
-    }
-
-    @Override
-    public boolean onBackPressed() {
-        return false;
-    }
-
-    @Override
-    public void onSomethingClicked(Object null1, Integer null2, String tag) {
-        ((MainActivity) getActivity()).openDiasporaUrl(urls.getSearchTagsUrl(tag));
-    }
-
-    @Override
-    protected void applyColorToViews() {
-        followedTagsRecyclerView.invalidate();
-        if (getAppSettings().isAmoledColorMode()) {
-            rootView.setBackgroundColor(Color.BLACK);
-            space.setBackgroundColor(Color.BLACK);
-        }
-    }
-
-    public static class FollowedTagsAdapter extends RecyclerView.Adapter<FollowedTagsAdapter.ViewHolder> {
-        private boolean isAmoledColorMode;
-        private AppSettings appSettings;
-        private String[] followedTagsList;
-        private List<String> followedTagsFavsList;
-        private OnSomethingClickListener<Object> tagClickedListener;
-
-        static class ViewHolder extends RecyclerView.ViewHolder {
-            @BindView(R.id.recycler_view__list_item__text)
-            public TextView title;
-            @BindView(R.id.recycler_view__list_item__favourite)
-            AppCompatImageView favouriteImage;
-            @BindView(R.id.recycler_view__list_item__root)
-            RelativeLayout root;
-
-            ViewHolder(View v) {
-                super(v);
-                ButterKnife.bind(this, v);
-            }
-        }
-
-
-        FollowedTagsAdapter(AppSettings appSettings, OnSomethingClickListener<Object> tagClickedListener) {
-            this.appSettings = appSettings;
-            this.followedTagsList = appSettings.getFollowedTags();
-            this.followedTagsFavsList = new ArrayList<>(Arrays.asList(appSettings.getFollowedTagsFavs()));
-            this.tagClickedListener = tagClickedListener;
-            this.isAmoledColorMode = appSettings.isAmoledColorMode();
-        }
-
-        @Override
-        public int getItemCount() {
-            return followedTagsList.length;
-        }
-
-        @Override
-        public FollowedTagsAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View v = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.recycler_list__list_item_with_fav, parent, false);
-            return new ViewHolder(v);
-        }
-
-        @Override
-        public void onBindViewHolder(final ViewHolder holder, final int position) {
-            // Alternating colors
-            final Context c = holder.root.getContext();
-            final String tag = followedTagsList[position];
-            holder.title.setText(tag);
-            if (position % 2 == 1) {
-                holder.root.setBackgroundColor(isAmoledColorMode ? Color.BLACK : Helpers.get().color(R.color.alternate_row_color));
-                holder.title.setTextColor(isAmoledColorMode ? Color.GRAY : Color.BLACK);
-            } else {
-                holder.root.setBackgroundColor(isAmoledColorMode ? Color.BLACK : Color.WHITE);
-                holder.title.setTextColor(isAmoledColorMode ? Color.GRAY : Color.BLACK);
-            }
-
-            // Favourite (Star) Image
-            applyFavouriteImage(holder.favouriteImage, isFollowedTagFaved(tag));
-
-            // Click on fav button
-            holder.favouriteImage.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    if (isFollowedTagFaved(tag)) {
-                        followedTagsFavsList.remove(followedTagsFavsList.indexOf(tag));
-                    } else {
-                        followedTagsFavsList.add(tag);
-                    }
-                    appSettings.setFollowedTagsFavs(followedTagsFavsList);
-                    applyFavouriteImage(holder.favouriteImage, isFollowedTagFaved(tag));
-                }
-            });
-
-            holder.root.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    tagClickedListener.onSomethingClicked(null, null, tag);
-                }
-            });
-        }
-
-        private boolean isFollowedTagFaved(String tag) {
-            return followedTagsFavsList.contains(tag);
-        }
-
-        private void applyFavouriteImage(AppCompatImageView imageView, boolean isFaved) {
-            imageView.setImageResource(isFaved ? R.drawable.ic_star_filled_48px : R.drawable.ic_star_border_black_48px);
-            imageView.setColorFilter(isFaved ? appSettings.getAccentColor() : (isAmoledColorMode ? Color.GRAY : 0), PorterDuff.Mode.SRC_ATOP);
-        }
-    }
-}
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java
@ -6,20 +6,22 @@ import org.json.JSONObject;

 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;


 /**
- * Created by gsantner (https://gsantner.github.io/ on 30.09.16.
+ * Created by gsantner (gsantner AT mailbox DOT org on 30.09.16.
 * DiasporaPodList  - List container for DiasporaPod's, with methods to merge with other DiasporaPodLists
 * DiasporaPod      - Data container for a Pod, can include N DiasporaPodUrl's
 * DiasporaPodUrl   - A Url of an DiasporaPod
 * For all Classes a loading and saving to JSON method is available
 */
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection", "UnusedReturnValue", "JavaDoc", "FieldCanBeLocal"})
 public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, Serializable {
-    private static final boolean EXPORT_TOJSON_ACTIVE6 = false;
+    private static final boolean EXPORT_TOJSON_POST_COUNT_LOCAL = true;
    private List<DiasporaPod> pods = new ArrayList<>();
    private boolean trackMergeChanges = false;
    private Integer trackAddedIndexStart = -1;
@ -88,8 +90,8 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                if (updatePodBak.getId() != 0 && updatePod.getId() == 0) {
                    updatePod.setId(updatePodBak.getId());
                }
-                if (updatePodBak.getActive6() != 0 && updatePod.getActive6() == 0) {
-                    updatePod.setActive6(updatePodBak.getActive6());
+                if (updatePodBak.getPostCountLocal() != 0 && updatePod.getPostCountLocal() == 0) {
+                    updatePod.setPostCountLocal(updatePodBak.getPostCountLocal());
                }
                if (updatePodBak.getScore() != 0 && updatePod.getScore() == 0) {
                    updatePod.setScore(updatePodBak.getScore());
@ -179,12 +181,12 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
     *      ╚═╝      ╚═════╝ ╚═════╝
     */
    public static class DiasporaPod implements Iterable<DiasporaPodList.DiasporaPod.DiasporaPodUrl>, Comparable<DiasporaPod>, Serializable {
-        private List<DiasporaPodUrl> podUrls = new ArrayList<>();
-        private List<String> mainLangs = new ArrayList<>();
-        private String name = "";
-        private int score = 0;
-        private int id = 0;
-        private long active6 = 0;
+        private List<DiasporaPodUrl> _podUrls = new ArrayList<>();
+        private List<String> _mainLangs = new ArrayList<>();
+        private String _name = "";
+        private int _score = 0;
+        private int _id = 0;
+        private long _postCountLocal = 0;


        public DiasporaPod() {
@ -199,14 +201,14 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
            JSONArray jarr;

            if (json.has("name")) {
-                name = json.getString("name");
+                _name = json.getString("name");
            }
            if (json.has("mainLangs")) {
                jarr = json.getJSONArray("mainLangs");
                for (int i = 0; i < jarr.length(); i++) {
                    String val = jarr.getString(i);
-                    if (!mainLangs.contains(val)) {
-                        mainLangs.add(val);
+                    if (!_mainLangs.contains(val)) {
+                        _mainLangs.add(val);
                    }
                }
            }
@ -214,19 +216,19 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                jarr = json.getJSONArray("podUrls");
                for (int i = 0; i < jarr.length(); i++) {
                    DiasporaPodUrl podUrl = new DiasporaPodUrl().fromJson(jarr.getJSONObject(i));
-                    if (!podUrls.contains(podUrl)) {
-                        podUrls.add(podUrl);
+                    if (!_podUrls.contains(podUrl)) {
+                        _podUrls.add(podUrl);
                    }
                }
            }
            if (json.has("score")) {
-                score = json.getInt("score");
+                _score = json.getInt("score");
            }
-            if (json.has("active6")) {
-                active6 = json.getLong("active6");
+            if (json.has("postCountLocal")) {
+                _postCountLocal = json.getLong("postCountLocal");
            }
            if (json.has("id")) {
-                id = json.getInt("id");
+                _id = json.getInt("id");
            }
            return this;
        }
@ -236,25 +238,28 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
         */
        public JSONObject toJson() throws JSONException {
            JSONObject json = new JSONObject();
-            json.put("name", name);
-            json.put("score", score);
-            json.put("id", id);
+            json.put("name", _name);
+            json.put("id", _id);
+
+            if (_score != 0) {
+                json.put("score", _score);
+            }

            // Only export active6 (frequently changing if told to do)
-            if (EXPORT_TOJSON_ACTIVE6) {
-                json.put("active6", active6);
+            if (EXPORT_TOJSON_POST_COUNT_LOCAL && _postCountLocal > 0) {
+                json.put("postCountLocal", _postCountLocal);
            }

            // Pod urls
            JSONArray jarr = new JSONArray();
-            for (DiasporaPodUrl value : podUrls) {
+            for (DiasporaPodUrl value : _podUrls) {
                jarr.put(value.toJson());
            }
            json.put("podUrls", jarr);

            // main langs
            jarr = new JSONArray();
-            for (String value : mainLangs) {
+            for (String value : _mainLangs) {
                jarr.put(value);
            }
            json.put("mainLangs", jarr);
@ -268,11 +273,11 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                DiasporaPod otherPod = (DiasporaPod) o;

                // Check if id is equal
-                ret = this.id != 0 && this.id == otherPod.id;
+                ret = _id != 0 && _id == otherPod._id;

-                // Check if host is the same (fallback if id is 0)
+                // Check if _host is the same (fallback if id is 0)
                if (!ret) {
-                    for (DiasporaPodUrl podUrl : podUrls) {
+                    for (DiasporaPodUrl podUrl : _podUrls) {
                        for (DiasporaPodUrl otherPodUrl : otherPod.getPodUrls()) {
                            if (podUrl.getBaseUrl().equals(otherPodUrl.getBaseUrl())) {
                                ret = true;
@ -292,45 +297,46 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                if (!myPodUrls.isEmpty() && !otherPodUrls.isEmpty()) {
                    return myPodUrls.get(0).getHost().compareTo(otherPodUrls.get(0).getHost());
                }
+                return _name.compareTo(otherPod.getName());
            }
-            return name.compareTo(otherPod.getName());
+            return _name.compareTo("");
        }

        @Override
        public String toString() {
-            return name + "(" + id + ")";
+            return _name + "(" + _id + ")";
        }

        /**
         * Iterator for Iterable interface (forEach, ..)
         */
        public Iterator<DiasporaPodUrl> iterator() {
-            return podUrls.iterator();
+            return _podUrls.iterator();
        }

        /*
-        * Getter & Setter
-        */
+         * Getter & Setter
+         */
        public List<DiasporaPodUrl> getPodUrls() {
-            return podUrls;
+            return _podUrls;
        }

        public DiasporaPod setPodUrls(List<DiasporaPodUrl> podUrls) {
-            this.podUrls = podUrls;
+            _podUrls = podUrls;
            return this;
        }

        public List<String> getMainLangs() {
-            return mainLangs;
+            return _mainLangs;
        }

        public DiasporaPod setMainLangs(List<String> mainLangs) {
-            this.mainLangs = mainLangs;
+            _mainLangs = mainLangs;
            return this;
        }

        public DiasporaPod appendMainLangs(String... values) {
-            Collections.addAll(this.mainLangs, values);
+            _mainLangs.addAll(Arrays.asList(values));
            return this;
        }

@ -338,50 +344,50 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
         * Returns the first DiasporaPodUrl in the list
         */
        public DiasporaPodUrl getPodUrl() {
-            if (podUrls.size() > 0) {
-                return podUrls.get(0);
+            if (_podUrls.size() > 0) {
+                return _podUrls.get(0);
            }
            return null;
        }

        public DiasporaPod appendPodUrls(DiasporaPodUrl... values) {
-            Collections.addAll(this.podUrls, values);
+            _podUrls.addAll(Arrays.asList(values));
            return this;
        }

        public String getName() {
-            return name;
+            return _name;
        }

        public DiasporaPod setName(String name) {
-            this.name = name;
+            _name = name;
            return this;
        }

        public int getScore() {
-            return score;
+            return _score;
        }

        public DiasporaPod setScore(int score) {
-            this.score = score;
+            _score = score;
            return this;
        }

-        public long getActive6() {
-            return active6;
+        public long getPostCountLocal() {
+            return _postCountLocal;
        }

-        public DiasporaPod setActive6(long active6) {
-            this.active6 = active6;
+        public DiasporaPod setPostCountLocal(long postCountLocal) {
+            _postCountLocal = postCountLocal;
            return this;
        }

        public int getId() {
-            return id;
+            return _id;
        }

        public DiasporaPod setId(int id) {
-            this.id = id;
+            _id = id;
            return this;
        }

@ -393,9 +399,9 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
         *      ╚═╝      ╚═════╝ ╚═════╝      ╚═════╝ ╚═╝  ╚═╝╚══════╝
         */
        public static class DiasporaPodUrl implements Serializable {
-            private String host = "";
-            private String protocol = "https";
-            private Integer port = 443;
+            private String _host = "";
+            private String _protocol = "https";
+            private Integer _port = 443;

            public DiasporaPodUrl() {
            }
@ -407,10 +413,10 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
            /**
             * Get the base url
             *
-             * @return base url with port
+             * @return
             */
            public String getBaseUrl() {
-                return protocol + "://" + host + (isPortNeeded() ? port : "");
+                return _protocol + "://" + _host + (isPortNeeded() ? _port : "");
            }

            /**
@ -420,13 +426,13 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             */
            public DiasporaPodUrl fromJson(JSONObject json) throws JSONException {
                if (json.has("host")) {
-                    host = json.getString("host");
+                    _host = json.getString("host");
                }
                if (json.has("protocol")) {
-                    protocol = json.getString("protocol");
+                    _protocol = json.getString("protocol");
                }
                if (json.has("port")) {
-                    port = json.getInt("port");
+                    _port = json.getInt("port");
                }
                return this;
            }
@ -436,12 +442,12 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             */
            public JSONObject toJson() throws JSONException {
                JSONObject json = new JSONObject();
-                json.put("host", host);
-                if (!protocol.equals("https")) {
-                    json.put("protocol", protocol);
+                json.put("host", _host);
+                if (!_protocol.equals("https")) {
+                    json.put("protocol", _protocol);
                }
-                if (port != 443) {
-                    json.put("port", port);
+                if (_port != 443) {
+                    json.put("port", _port);
                }
                return json;
            }
@ -467,7 +473,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             * Tells if the ports needs to shown
             */
            public boolean isPortNeeded() {
-                return !((port == 80 && protocol.equals("http")) || (port == 443 && protocol.equals("https")));
+                return !((_port == 80 && _protocol.equals("http")) || (_port == 443 && _protocol.equals("https")));
            }

            @Override
@ -476,6 +482,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
            }

            @Override
+            @SuppressWarnings("SimplifiableIfStatement")
            public boolean equals(Object o) {
                if (o instanceof DiasporaPodUrl) {
                    return getBaseUrl().equals(((DiasporaPodUrl) o).getBaseUrl());
@ -487,29 +494,29 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             *  GETTER & SETTER
             */
            public String getHost() {
-                return host;
+                return _host;
            }

            public DiasporaPodUrl setHost(String host) {
-                this.host = host;
+                _host = host;
                return this;
            }

            public String getProtocol() {
-                return protocol;
+                return _protocol;
            }

            public DiasporaPodUrl setProtocol(String protocol) {
-                this.protocol = protocol;
+                _protocol = protocol;
                return this;
            }

            public Integer getPort() {
-                return port;
+                return _port;
            }

            public DiasporaPodUrl setPort(Integer port) {
-                this.port = port;
+                _port = port;
                return this;
            }
        }
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java
@ -32,7 +32,7 @@ import org.json.JSONObject;

 /**
 * User profile
- * Created by gsantner (https://gsantner.github.io/) on 24.03.16.  Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 24.03.16.  Part of dandelion*.
 */
 public class DiasporaUserProfile {
    private static final int MINIMUM_USERPROFILE_LOAD_TIMEDIFF = 5000;
@ -103,7 +103,7 @@ public class DiasporaUserProfile {
            }

            // GUID (User id)
-            if (json.has("guid") && loadGuid(json.getString("guid"))) {
+            if (json.has("guid") && loadGuid(json.getString("guid")) && !guid.isEmpty()) {
                appSettings.setProfileId(guid);
            }

--- a/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/DiasporaUserProfileChangedListener.java
@ -21,7 +21,7 @@ package com.github.dfa.diaspora_android.listener;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;

 /**
- * Created by gsantner (https://gsantner.github.io/) on 26.03.16.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 26.03.16.
 * Interface that needs to be implemented by classes that listen for Profile related changes
 */
 public interface DiasporaUserProfileChangedListener {
--- a/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java
@ -10,7 +10,5 @@ import android.support.design.widget.AppBarLayout;
 public interface IntellihideToolbarActivityListener {
    int toolbarDefaultScrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP;

-    void enableToolbarHiding();
-
-    void disableToolbarHiding();
+    void setToolbarIntellihide(boolean enable);
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/service/AvatarImageLoader.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/service/AvatarImageLoader.java
@ -24,6 +24,8 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;

+import net.gsantner.opoc.util.DownloadTask;
+
 import java.io.File;

 public class AvatarImageLoader {
@ -52,7 +54,9 @@ public class AvatarImageLoader {

    public void startImageDownload(ImageView imageView, String avatarUrl) {
        if (!avatarUrl.equals("")) {
-            new ImageDownloadTask(imageView, avatarFile.getAbsolutePath()).execute(avatarUrl);
+            new DownloadTask(new File(avatarFile.getAbsolutePath()), (ok, file) -> {
+                loadToImageView(imageView);
+            }).execute(avatarUrl);
        }
    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java
@ -59,7 +59,7 @@ public class FetchPodsService extends Service {
 }

 class GetPodsTask extends AsyncTask<Void, Void, DiasporaPodList> {
-    private static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/Diaspora-for-Android/dandelion/master/app/src/main/res/raw/podlist.json";
+    private static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/gsantner/dandelion/master/app/src/main/res/raw/podlist.json";

    private final Service service;

--- a/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/service/ImageDownloadTask.java
@ -1,98 +0,0 @@
-/*
-    This file is part of the dandelion*.
-
-    dandelion* 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.
-
-    dandelion* 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 the dandelion*.
-
-    If not, see <http://www.gnu.org/licenses/>.
- */
-package com.github.dfa.diaspora_android.service;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.AsyncTask;
-import android.support.annotation.Nullable;
-import android.widget.ImageView;
-
-import com.github.dfa.diaspora_android.util.AppLog;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import info.guardianproject.netcipher.NetCipher;
-
-/**
- * Task that can be used to download images from URLs and store them in storage
- * Created by gsantner (https://gsantner.github.io/) on 24.03.16.
- */
-public class ImageDownloadTask extends AsyncTask<String, Void, Bitmap> {
-    private final ImageView imageView;
-    private String savePath;
-
-    /**
-     * Download image from URL
-     *
-     * @param imageView ImageView to set image to (null = don't set)
-     * @param savePath  Save image to file (null = don't save)
-     */
-    public ImageDownloadTask(@Nullable ImageView imageView, @Nullable String savePath) {
-        this.imageView = imageView;
-        this.savePath = savePath;
-    }
-
-    protected Bitmap doInBackground(String... urls) {
-        String url = urls[0];
-        Bitmap bitmap = null;
-        FileOutputStream out = null;
-        InputStream inStream;
-        HttpsURLConnection connection;
-        try {
-            connection = NetCipher.getHttpsURLConnection(url);
-            inStream = connection.getInputStream();
-            bitmap = BitmapFactory.decodeStream(inStream);
-
-            // Save to file if not null
-            if (savePath != null) {
-                out = new FileOutputStream(savePath);
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            }
-
-            try {
-                inStream.close();
-            } catch (IOException e) {/*Nothing*/}
-
-            connection.disconnect();
-
-        } catch (Exception e) {
-            AppLog.e(this, e.getMessage());
-        } finally {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-            } catch (IOException ignored) {
-            }
-        }
-        return bitmap;
-    }
-
-    protected void onPostExecute(Bitmap result) {
-        // Display on imageview if not null
-        if (imageView != null) {
-            imageView.setImageBitmap(result);
-        }
-    }
-}
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java
@ -28,95 +28,80 @@ import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.v4.content.ContextCompat;
+import android.support.annotation.NonNull;

 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.util.AppSettings;
+import com.github.dfa.diaspora_android.util.ContextUtils;

+@SuppressWarnings("WeakerAccess")
 public class BadgeDrawable extends Drawable {
    // Source: http://mobikul.com/adding-badge-count-on-menu-items-like-cart-notification-etc/
    private static final String BADGE_VALUE_OVERFLOW = "*";

-    private Paint badgeBackground;
-    private Paint badgeStroke;
-    private Paint badgeText;
-    private Rect textRect = new Rect();
+    private Paint _badgeBackground;
+    private Paint _badgeText;
+    private Rect _textRect = new Rect();

-    private String badgeValue = "";
-    private boolean shouldDraw;
+    private String _badgeValue = "";
+    private boolean _shouldDraw;

    public BadgeDrawable(Context context) {
        float textSize = context.getResources().getDimension(R.dimen.textsize_badge_count);

        AppSettings settings = AppSettings.get();
-        badgeBackground = new Paint();
-        badgeBackground.setColor(settings.getAccentColor());
-        badgeBackground.setAntiAlias(true);
-        badgeBackground.setStyle(Paint.Style.FILL);
-        badgeStroke = new Paint();
-        badgeStroke.setColor(ContextCompat.getColor(context.getApplicationContext(), R.color.colorPrimaryDark));
-        badgeStroke.setAntiAlias(true);
-        badgeStroke.setStyle(Paint.Style.FILL);
+        _badgeBackground = new Paint();
+        _badgeBackground.setColor(settings.getAccentColor());
+        _badgeBackground.setAntiAlias(true);
+        _badgeBackground.setStyle(Paint.Style.FILL);

-        badgeText = new Paint();
-        badgeText.setColor(Color.WHITE);
-        badgeText.setTypeface(Typeface.DEFAULT);
-        badgeText.setTextSize(textSize);
-        badgeText.setAntiAlias(true);
-        badgeText.setTextAlign(Paint.Align.CENTER);
+        _badgeText = new Paint();
+        _badgeText.setColor(ContextUtils.get().shouldColorOnTopBeLight(settings.getAccentColor()) ? Color.WHITE : Color.BLACK);
+        _badgeText.setTypeface(Typeface.DEFAULT);
+        _badgeText.setTextSize(textSize);
+        _badgeText.setAntiAlias(true);
+        _badgeText.setTextAlign(Paint.Align.CENTER);
    }

    @Override
-    public void draw(Canvas canvas) {
-        if (!shouldDraw) {
+    public void draw(@NonNull Canvas canvas) {
+        if (!_shouldDraw) {
            return;
        }
        Rect bounds = getBounds();
        float width = bounds.right - bounds.left;
        float height = bounds.bottom - bounds.top;
+        float oneDp = ContextUtils.get().convertDpToPx(1);

        // Position the badge in the top-right quadrant of the icon.
        float radius = ((Math.max(width, height) / 2)) / 2;
-        float centerX = (width - radius - 1) + 5;
-        float centerY = radius - 5;
-        if (badgeValue.length() <= 2) {
-            // Draw badge circle.
-            canvas.drawCircle(centerX, centerY, (int) (radius + 7.5), badgeStroke);
-            canvas.drawCircle(centerX, centerY, (int) (radius + 5.5), badgeBackground);
-        } else {
-            canvas.drawCircle(centerX, centerY, (int) (radius + 8.5), badgeStroke);
-            canvas.drawCircle(centerX, centerY, (int) (radius + 6.5), badgeBackground);
-            //canvas.drawRoundRect(radius, radius, radius, radius, 10, 10, badgeBackground);
-        }
+        float centerX = (width - radius - 1) + oneDp * 2;
+        float centerY = radius - 2 * oneDp;
+        canvas.drawCircle(centerX, centerY, (int) (radius + oneDp * 5), _badgeBackground);
+
        // Draw badge count message inside the circle.
-        badgeText.getTextBounds(badgeValue, 0, badgeValue.length(), textRect);
-        float textHeight = textRect.bottom - textRect.top;
+        _badgeText.getTextBounds(_badgeValue, 0, _badgeValue.length(), _textRect);
+        float textHeight = _textRect.bottom - _textRect.top;
        float textY = centerY + (textHeight / 2f);
-        if (badgeValue.length() > 2)
-            canvas.drawText(BADGE_VALUE_OVERFLOW, centerX, textY, badgeText);
-        else
-            canvas.drawText(badgeValue, centerX, textY, badgeText);
+        canvas.drawText(_badgeValue.length() > 2 ? BADGE_VALUE_OVERFLOW : _badgeValue,
+                centerX, textY, _badgeText);
    }

-    /*
-    Sets the count (i.e notifications) to display.
-     */
-    public void setCount(String count) {
-        badgeValue = count;
+    // Sets the text to display. Badge displays a '*' if more than 2 characters
+    private void setBadgeText(String text) {
+        _badgeValue = text;

-        // Only draw a badge if there are notifications.
-        shouldDraw = !count.equalsIgnoreCase("0");
+        // Only draw a badge if the value isn't a zero
+        _shouldDraw = !text.equalsIgnoreCase("0");
        invalidateSelf();
    }

    @Override
    public void setAlpha(int alpha) {
-        // do nothing
    }

    @Override
    public void setColorFilter(ColorFilter cf) {
-        // do nothing
    }

    @Override
@ -125,11 +110,11 @@ public class BadgeDrawable extends Drawable {
    }

    public static void setBadgeCount(Context context, LayerDrawable icon, Integer count) {
-        setBadgeCount(context, icon, count.toString());
+        setBadgeText(context, icon, count.toString());
    }

-    public static void setBadgeCount(Context context, LayerDrawable icon, String count) {
-
+    // Max of 2 characters
+    public static void setBadgeText(Context context, LayerDrawable icon, String text) {
        BadgeDrawable badge;

        // Reuse drawable if possible
@ -140,7 +125,7 @@ public class BadgeDrawable extends Drawable {
            badge = new BadgeDrawable(context);
        }

-        badge.setCount(count);
+        badge.setBadgeText(text);
        icon.mutate();
        icon.setDrawableByLayerId(R.id.ic_badge, badge);
    }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java
@ -18,14 +18,13 @@
 */
 package com.github.dfa.diaspora_android.ui;

-import android.annotation.TargetApi;
 import android.content.Context;
+import android.support.v7.widget.AppCompatTextView;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Patterns;
-import android.widget.TextView;

 import com.github.dfa.diaspora_android.activity.MainActivity;

@ -38,7 +37,7 @@ import java.util.regex.Pattern;
 * Hashtags open the MainActivity, load the new-post site of the selected pod and insert the
 * hashtag into the post editor. See data/HashtagContentProvider.
 */
-public class HtmlTextView extends TextView {
+public class HtmlTextView extends AppCompatTextView {

    public HtmlTextView(Context context) {
        super(context);
@ -55,12 +54,6 @@ public class HtmlTextView extends TextView {
        init();
    }

-    @TargetApi(21)
-    public HtmlTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
    /**
     * Linkify, format markdown and escape the displayed message.
     */
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
@ -37,7 +37,7 @@ import butterknife.OnItemSelected;

 /**
 * Dialog that helps the user configure a pod
- * Created by gsantner (https://gsantner.github.io) on 06.10.16.
+ * Created by gsantner on 06.10.16.
 */
 public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
    public static final String TAG = "com.github.dfa.diaspora_android.ui.PodSelectionDialog";
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/SearchOrCustomTextDialogCreator.java
@ -0,0 +1,85 @@
+package com.github.dfa.diaspora_android.ui;
+
+import android.app.Activity;
+import android.support.v4.content.ContextCompat;
+
+import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.data.DiasporaAspect;
+import com.github.dfa.diaspora_android.util.AppSettings;
+
+import net.gsantner.opoc.ui.SearchOrCustomTextDialog;
+import net.gsantner.opoc.util.Callback;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class SearchOrCustomTextDialogCreator {
+    public static final String SPECIAL_PREFIX = "\uD83D\uDCA0";
+
+    public static void showDiasporaTagsDialog(final Activity activity, final Callback.a1<String> callback) {
+        SearchOrCustomTextDialog.DialogOptions dopt = new SearchOrCustomTextDialog.DialogOptions();
+        baseConf(activity, dopt);
+        dopt.callback = callback;
+        dopt.isSearchEnabled = true;
+        dopt.searchHintText = R.string.search;
+        dopt.titleText = R.string.tags;
+
+        new Thread(() -> {
+            AppSettings appSettings = AppSettings.get();
+            ArrayList<String> hl = new ArrayList<>();
+            ArrayList<String> data = new ArrayList<>(Arrays.asList(appSettings.getFollowedTags()));
+            if (data.size() > 0) {
+                String highlighted = surroundString(data.remove(0));
+                data.add(0, highlighted);
+                hl.add(highlighted);
+            }
+
+            for (int strid : new int[]{R.string.manage_hashtags}) {
+                String special = surroundString(appSettings.rstr(strid));
+                data.add(0, special);
+                hl.add(special);
+            }
+            dopt.data = data;
+            dopt.highlightData = hl;
+            activity.runOnUiThread(() -> SearchOrCustomTextDialog.showMultiChoiceDialogWithSearchFilterUI(activity, dopt));
+        }).start();
+    }
+
+    private static String surroundString(String text) {
+        return SPECIAL_PREFIX + " " + text + " ";
+    }
+
+
+    public static void showDiasporaAspectsDialog(final Activity activity, final Callback.a1<String> callback) {
+        SearchOrCustomTextDialog.DialogOptions dopt = new SearchOrCustomTextDialog.DialogOptions();
+        baseConf(activity, dopt);
+        dopt.callback = callback;
+        dopt.isSearchEnabled = false;
+        dopt.titleText = R.string.contacts;
+
+        new Thread(() -> {
+            AppSettings appSettings = AppSettings.get();
+            ArrayList<String> hl = new ArrayList<>();
+            ArrayList<String> data = new ArrayList<>();
+            for (DiasporaAspect aspect : AppSettings.get().getAspects()) {
+                data.add(aspect.name);
+            }
+            for (int strid : new int[]{R.string.nav_profile, R.string.manage_your_contact_list}) {
+                String special = surroundString(appSettings.rstr(strid));
+                data.add(0, special);
+                hl.add(special);
+            }
+            dopt.data = data;
+            dopt.highlightData = hl;
+            activity.runOnUiThread(() -> SearchOrCustomTextDialog.showMultiChoiceDialogWithSearchFilterUI(activity, dopt));
+        }).start();
+    }
+
+
+    private static void baseConf(Activity activity, SearchOrCustomTextDialog.DialogOptions dopt) {
+        AppSettings as = new AppSettings(activity);
+        dopt.isDarkDialog = as.isAmoledColorMode();
+        dopt.textColor = ContextCompat.getColor(activity, dopt.isDarkDialog ? R.color.white : R.color.primary_text);
+        dopt.highlightColor = as.getAccentColor();
+    }
+}
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java
@ -1,73 +0,0 @@
-/*
-    This file is part of the dandelion*.
-
-    dandelion* 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.
-
-    dandelion* 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 the dandelion*.
-
-    If not, see <http://www.gnu.org/licenses/>.
- */
-package com.github.dfa.diaspora_android.ui.theme;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.Menu;
-import android.view.MenuInflater;
-
-/**
- * Customized abstract Fragment class with some useful methods
- * Created by vanitas on 21.09.16.
- */
-
-public abstract class CustomFragment extends Fragment {
-
-    public static final String TAG = "com.github.dfa.diaspora_android.ui.theme.CustomFragment";
-
-    /**
-     * We have an optionsMenu
-     *
-     * @param savedInstanceState state
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    /**
-     * Return the tag used to identify the Fragment.
-     *
-     * @return tag
-     */
-    public abstract String getFragmentTag();
-
-    /**
-     * Add fragment-dependent options to the bottom options toolbar
-     *
-     * @param menu     bottom menu
-     * @param inflater inflater
-     */
-    public abstract void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater);
-
-    /**
-     * Return true if the fragment reacted to a back button press, false else.
-     * In case the fragment returned false, the parent activity should handle the backPress.
-     *
-     * @return did we react to the back press?
-     */
-    public abstract boolean onBackPressed();
-
-    public boolean isAllowedIntellihide() {
-        return true;
-    }
-}
-
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java
@ -19,19 +19,14 @@
 package com.github.dfa.diaspora_android.ui.theme;

 import android.annotation.TargetApi;
-import android.app.ActivityManager;
 import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.support.v7.app.AppCompatActivity;

 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.util.AppSettings;
-import com.github.dfa.diaspora_android.util.Helpers;
-
-import java.util.Locale;
+import com.github.dfa.diaspora_android.util.ContextUtils;

 /**
 * Activity that supports color schemes
@ -72,15 +67,7 @@ public abstract class ThemedActivity extends AppCompatActivity {
     */
    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
    private void updateRecentAppColor() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            BitmapDrawable drawable = ((BitmapDrawable) getDrawable(R.drawable.ic_launcher));
-            if (drawable != null) {
-                setTaskDescription(new ActivityManager.TaskDescription(
-                        getResources().getString(R.string.app_name),
-                        drawable.getBitmap(),
-                        getAppSettings().getPrimaryColor()));
-            }
-        }
+
    }

    protected void updateScreenRotation() {
@ -99,9 +86,6 @@ public abstract class ThemedActivity extends AppCompatActivity {

    public void updateLanguage() {
        AppSettings appSettings = getAppSettings();
-        Locale locale = Helpers.get().getLocaleByAndroidCode(appSettings.getLanguage());
-        Configuration config = appSettings.getContext().getResources().getConfiguration();
-        config.locale = locale != null ? locale : Locale.getDefault();
-        appSettings.getContext().getResources().updateConfiguration(config, null);
+        ContextUtils.get().setAppLanguage(appSettings.getLanguage());
    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedCheckBoxPreference.java
@ -41,7 +41,7 @@ public class ThemedCheckBoxPreference extends CheckBoxPreference implements Them

    @Override
    public void setColors() {
-        CheckBox checkBox = (CheckBox) rootLayout.findViewById(android.R.id.checkbox);
+        CheckBox checkBox = rootLayout.findViewById(android.R.id.checkbox);
        ThemeHelper.getInstance(AppSettings.get());
        ThemeHelper.updateCheckBoxColor(checkBox);
    }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedColorPickerPreference.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedColorPickerPreference.java
@ -10,7 +10,7 @@ import android.widget.ImageView;

 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.util.AppSettings;
-import com.github.dfa.diaspora_android.util.Helpers;
+import com.github.dfa.diaspora_android.util.ContextUtils;

 /**
 * Preference that shows selected Color in a circle
@ -38,7 +38,7 @@ public class ThemedColorPickerPreference extends Preference implements Themeable
    @Override
    protected void onBindView(View view) {
        super.onBindView(view);
-        colorPreview = (ImageView) view.findViewById(android.R.id.icon);
+        colorPreview = view.findViewById(android.R.id.icon);
        setColors();
    }

@ -50,13 +50,13 @@ public class ThemedColorPickerPreference extends Preference implements Themeable
            AppSettings appSettings = AppSettings.get();
            String key = getKey();

-            int color = Helpers.get().color(R.color.primary);
+            int color = ContextUtils.get().rcolor(R.color.primary);
            if ((appSettings.isKeyEqual(key, R.string.pref_key__primary_color_shade))) {
                color = appSettings.getPrimaryColor();
            } else if ((appSettings.isKeyEqual(key, R.string.pref_key__accent_color_shade))) {
                color = appSettings.getAccentColor();
            } else {
-                color = appSettings.getColor(getSharedPreferences(), key, color);
+                color = appSettings.getColor(key, color, getSharedPreferences());
            }
            circle.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
        }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedFragment.java
@ -21,12 +21,14 @@ package com.github.dfa.diaspora_android.ui.theme;
 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.util.AppSettings;

+import net.gsantner.opoc.activity.GsFragmentBase;
+
 /**
 * Fragment that supports color schemes
 * Created by vanitas on 06.10.16.
 */

-public abstract class ThemedFragment extends CustomFragment {
+public abstract class ThemedFragment extends GsFragmentBase {
    protected AppSettings getAppSettings() {
        return ((App) getActivity().getApplication()).getSettings();
    }
@ -39,4 +41,9 @@ public abstract class ThemedFragment extends CustomFragment {
        ThemeHelper.getInstance(getAppSettings());
        applyColorToViews();
    }
+
+
+    public boolean isAllowedIntellihide() {
+        return true;
+    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceCategory.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedPreferenceCategory.java
@ -36,7 +36,7 @@ public class ThemedPreferenceCategory extends PreferenceCategory implements Them
    @Override
    protected View onCreateView(ViewGroup parent) {
        View rootLayout = super.onCreateView(parent);
-        this.titleTextView = (TextView) rootLayout.findViewById(android.R.id.title);
+        this.titleTextView = rootLayout.findViewById(android.R.id.title);
        setColors();
        return rootLayout;
    }
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedVisibilityPreference.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedVisibilityPreference.java
@ -27,7 +27,7 @@ public class ThemedVisibilityPreference extends ThemedCheckBoxPreference {

    @Override
    public void setColors() {
-        CheckBox checkBox = (CheckBox) rootLayout.findViewById(android.R.id.checkbox);
+        CheckBox checkBox = rootLayout.findViewById(android.R.id.checkbox);
        checkBox.setButtonDrawable(R.drawable.ic_visibility_selector);
        ThemeHelper.getInstance(AppSettings.get());
        ThemeHelper.updateCheckBoxColor(checkBox);
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
@ -2,11 +2,13 @@ package com.github.dfa.diaspora_android.util;

 import android.app.Activity;
 import android.content.Context;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.content.FileProvider;
 import android.view.View;

-import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.web.WebHelper;

@ -17,24 +19,22 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;

-import io.github.gsantner.opoc.util.HelpersA;
-
@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
-public class Helpers extends io.github.gsantner.opoc.util.Helpers {
-    protected Helpers(Context context) {
-        super(context);
+public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils {
+    public ActivityUtils(Activity activity) {
+        super(activity);
    }


-    public static Helpers get() {
-        return new Helpers(App.get());
+    public static ActivityUtils get(Activity activity) {
+        return new ActivityUtils(activity);
    }

    public File createImageFile() throws IOException {
        // Create an image file name
        String timeStamp = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault()).format(new Date());
        String imageFileName = "JPEG_" + timeStamp + "_";
-        AppLog.d(Helpers.class, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
+        AppLog.d(ActivityUtils.class, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
        File storageDir = Environment.getExternalStoragePublicDirectory(
                Environment.DIRECTORY_PICTURES);
        return new File(
@ -47,13 +47,12 @@ public class Helpers extends io.github.gsantner.opoc.util.Helpers {
    /**
     * Show Information if user is offline, returns true if is not connected to internet
     *
-     * @param activity Activity
-     * @param anchor   A view anchor
+     * @param anchor A view anchor
     */
-    public boolean showInfoIfUserNotConnectedToInternet(Activity activity, View anchor) {
-        boolean isOnline = WebHelper.isOnline(context);
+    public boolean showInfoIfUserNotConnectedToInternet(View anchor) {
+        boolean isOnline = WebHelper.isOnline(_context);
        if (!isOnline) {
-            HelpersA.get(activity).showSnackBar(R.string.no_internet, true);
+            showSnackBar(R.string.sorry_need_to_be_connected_to_internet, true);
        }
        return !isOnline;
    }
@ -75,4 +74,13 @@ public class Helpers extends io.github.gsantner.opoc.util.Helpers {
            }
        }
    }
+
+    /**
+     * This method creates file sharing uri by using FileProvider
+     *
+     * @return
+     */
+    public static Uri getFileSharingUri(Context context, File file) {
+        return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AndroidBug5497Workaround.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AndroidBug5497Workaround.java
@ -0,0 +1,58 @@
+package com.github.dfa.diaspora_android.util;
+
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.FrameLayout;
+
+// From https://stackoverflow.com/a/19494006
+public class AndroidBug5497Workaround {
+
+    // For more information, see https://code.google.com/p/android/issues/detail?id=5497
+    // To use this class, simply invoke assistActivity() on an Activity that already has its content view set.
+
+    public static void assistActivity(Activity activity) {
+        new AndroidBug5497Workaround(activity);
+    }
+
+    private View mChildOfContent;
+    private int usableHeightPrevious;
+    private FrameLayout.LayoutParams frameLayoutParams;
+
+    private AndroidBug5497Workaround(Activity activity) {
+        FrameLayout content = activity.findViewById(android.R.id.content);
+        mChildOfContent = content.getChildAt(0);
+        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            public void onGlobalLayout() {
+                possiblyResizeChildOfContent();
+            }
+        });
+        frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams();
+    }
+
+    private void possiblyResizeChildOfContent() {
+        int usableHeightNow = computeUsableHeight();
+        if (usableHeightNow != usableHeightPrevious) {
+            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
+            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
+            if (heightDifference > (usableHeightSansKeyboard / 4)) {
+                // keyboard probably just became visible
+                frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
+            } else {
+                // keyboard probably just became hidden
+                frameLayoutParams.height = usableHeightSansKeyboard;
+            }
+            mChildOfContent.requestLayout();
+            usableHeightPrevious = usableHeightNow;
+        }
+    }
+
+    private int computeUsableHeight() {
+        Rect r = new Rect();
+        mChildOfContent.getWindowVisibleDisplayFrame(r);
+        return (r.bottom - r.top);
+    }
+
+}
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
@ -18,6 +18,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Environment;

 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.BuildConfig;
@ -26,70 +27,71 @@ import com.github.dfa.diaspora_android.data.DiasporaAspect;
 import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
 import com.github.dfa.diaspora_android.web.ProxyHandler;

+import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend;
+
 import org.json.JSONException;
 import org.json.JSONObject;

+import java.io.File;
 import java.util.List;

-import io.github.gsantner.opoc.util.AppSettingsBase;
-
 /**
 * Settings
- * Created by gsantner (https://gsantner.github.io/) on 20.03.16. Part of dandelion*.
+ * Created by gsantner (gsantner AT mailbox DOT org) on 20.03.16. Part of dandelion*.
 */
@SuppressWarnings("ConstantConditions")
-public class AppSettings extends AppSettingsBase {
-    private final SharedPreferences prefPod;
+public class AppSettings extends SharedPreferencesPropertyBackend {
+    private final SharedPreferences _prefPod;
    private DiasporaPod currentPod0Cached;

    public static AppSettings get() {
        return new AppSettings(App.get());
    }

-    private AppSettings(Context context) {
+    public AppSettings(Context context) {
        super(context);
-        prefPod = this.context.getSharedPreferences("pod0", Context.MODE_PRIVATE);
+        _prefPod = _context.getSharedPreferences("pod0", Context.MODE_PRIVATE);
    }

    /**
-     * Clear all settings in prefPod (Settings related to the configured pod)
+     * Clear all settings in _prefPod (Settings related to the configured pod)
     * This uses commit instead of apply, since
     * SettingsActivity.SettingsFragmentDebugging.showWipeSettingsDialog()
     * kills the app after the calling this, so we have to block until we are finished.
     */
    @SuppressLint("CommitPrefEdits")
    public void resetPodSettings() {
-        super.resetSettings(prefPod);
+        super.resetSettings(_prefPod);
    }

    /**
-     * Clear all settings in prefApp (related to the App itself)
+     * Clear all settings in _prefApp (related to the App itself)
     * This uses commit instead of apply, since
     * SettingsActivity.SettingsFragmentDebugging.showWipeSettingsDialog()
     * kills the app after the calling this, so we have to block until we are finished.
     */
    @SuppressLint("CommitPrefEdits")
    public void resetAppSettings() {
-        super.resetSettings(prefApp);
+        super.resetSettings(_prefApp);
    }

    //#################################
    //## Getter & Setter for settings
    //#################################
    public String getProfileId() {
-        return getString(prefPod, R.string.pref_key__podprofile_id, "");
+        return getString(R.string.pref_key__podprofile_id, "", _prefPod);
    }

    public void setProfileId(String profileId) {
-        setString(prefPod, R.string.pref_key__podprofile_id, profileId);
+        setString(R.string.pref_key__podprofile_id, profileId, _prefPod);
    }

    public boolean isLoadImages() {
-        return getBool(prefApp, R.string.pref_key__load_images, true);
+        return getBool(R.string.pref_key__load_images, true);
    }

    public int getMinimumFontSize() {
-        switch (getString(prefApp, R.string.pref_key__font_size, "")) {
+        switch (getString(R.string.pref_key__font_size, "")) {
            case "huge":
                return 20;
            case "large":
@ -97,30 +99,30 @@ public class AppSettings extends AppSettingsBase {
            case "normal":
                return 8;
            default:
-                setString(prefApp, R.string.pref_key__font_size, "normal");
+                setString(R.string.pref_key__font_size, "normal");
                return 8;
        }
    }

    public String getAvatarUrl() {
-        return getString(prefPod, R.string.pref_key__podprofile_avatar_url, "");
+        return getString(R.string.pref_key__podprofile_avatar_url, "", _prefPod);
    }

    public void setAvatarUrl(String avatarUrl) {
-        setString(prefPod, R.string.pref_key__podprofile_avatar_url, avatarUrl);
+        setString(R.string.pref_key__podprofile_avatar_url, avatarUrl, _prefPod);
    }

    public String getName() {
-        return getString(prefPod, R.string.pref_key__podprofile_name, "");
+        return getString(R.string.pref_key__podprofile_name, "", _prefPod);
    }

    public void setName(String name) {
-        setString(prefPod, R.string.pref_key__podprofile_name, name);
+        setString(R.string.pref_key__podprofile_name, name, _prefPod);
    }

    public DiasporaPod getPod() {
        if (currentPod0Cached == null) {
-            String pref = getString(prefPod, R.string.pref_key__current_pod_0, "");
+            String pref = getString(R.string.pref_key__current_pod_0, "", _prefPod);

            try {
                currentPod0Cached = new DiasporaPod().fromJson(new JSONObject(pref));
@ -133,23 +135,27 @@ public class AppSettings extends AppSettingsBase {

    public void setPod(DiasporaPod pod) {
        try {
-            setString(prefPod, R.string.pref_key__current_pod_0,
-                    pod == null ? null : pod.toJson().toString());
+            setString(R.string.pref_key__current_pod_0,
+                    pod == null ? null : pod.toJson().toString(), _prefPod);
            currentPod0Cached = pod;
        } catch (JSONException ignored) {
        }
    }

    public boolean hasPod() {
-        return !getString(prefPod, R.string.pref_key__current_pod_0, "").equals("");
+        return !getString(R.string.pref_key__current_pod_0, "", _prefPod).equals("");
    }

    public void setPodAspects(DiasporaAspect[] aspects) {
-        setStringArray(prefPod, R.string.pref_key__podprofile_aspects, aspects);
+        String[] strs = new String[aspects.length];
+        for (int i = 0; i < strs.length; i++) {
+            strs[i] = aspects[i].toShareAbleText();
+        }
+        setStringArray(R.string.pref_key__podprofile_aspects, strs, _prefPod);
    }

    public DiasporaAspect[] getAspects() {
-        String[] s = getStringArray(prefPod, R.string.pref_key__podprofile_aspects);
+        String[] s = getStringArray(R.string.pref_key__podprofile_aspects, _prefPod);
        DiasporaAspect[] aspects = new DiasporaAspect[s.length];
        for (int i = 0; i < aspects.length; i++) {
            aspects[i] = new DiasporaAspect(s[i]);
@ -158,53 +164,53 @@ public class AppSettings extends AppSettingsBase {
    }

    public String[] getFollowedTags() {
-        return getStringArray(prefPod, R.string.pref_key__podprofile_followed_tags);
+        return getStringArray(R.string.pref_key__podprofile_followed_tags, _prefPod);
    }

    public void setFollowedTags(String[] values) {
-        setStringArray(prefPod, R.string.pref_key__podprofile_followed_tags, values);
+        setStringArray(R.string.pref_key__podprofile_followed_tags, values, _prefPod);
    }

    public String[] getFollowedTagsFavs() {
-        return getStringArray(prefPod, R.string.pref_key__podprofile_followed_tags_favs);
+        return getStringArray(R.string.pref_key__podprofile_followed_tags_favs, _prefPod);
    }

    public void setFollowedTagsFavs(List<String> values) {
-        setStringList(prefPod, R.string.pref_key__podprofile_followed_tags_favs, values);
+        setStringList(R.string.pref_key__podprofile_followed_tags_favs, values, _prefPod);
    }

    public String[] getAspectFavs() {
-        return getStringArray(prefPod, R.string.pref_key__podprofile_aspects_favs);
+        return getStringArray(R.string.pref_key__podprofile_aspects_favs, _prefPod);
    }

    public void setAspectFavs(List<String> values) {
-        setStringList(prefPod, R.string.pref_key__podprofile_aspects_favs, values);
+        setStringList(R.string.pref_key__podprofile_aspects_favs, values, _prefPod);
    }

    public int getUnreadMessageCount() {
-        return getInt(prefPod, R.string.pref_key__podprofile_unread_message_count, 0);
+        return getInt(R.string.pref_key__podprofile_unread_message_count, 0, _prefPod);
    }

    public void setUnreadMessageCount(int unreadMessageCount) {
-        setInt(prefPod, R.string.pref_key__podprofile_unread_message_count, unreadMessageCount);
+        setInt(R.string.pref_key__podprofile_unread_message_count, unreadMessageCount, _prefPod);
    }

    public int getNotificationCount() {
-        return getInt(prefPod, R.string.pref_key__podprofile_notification_count, 0);
+        return getInt(R.string.pref_key__podprofile_notification_count, 0, _prefPod);
    }

    public void setNotificationCount(int notificationCount) {
-        setInt(prefPod, R.string.pref_key__podprofile_notification_count, notificationCount);
+        setInt(R.string.pref_key__podprofile_notification_count, notificationCount, _prefPod);
    }

    public boolean isAppendSharedViaApp() {
-        return getBool(prefApp, R.string.pref_key__append_shared_via_app, true);
+        return getBool(R.string.pref_key__append_shared_via_app, true);
    }

    @SuppressLint("CommitPrefEdits")
    public void setProxyHttpEnabled(boolean enabled) {
        //commit instead of apply because the app is likely to be killed before apply is called.
-        prefApp.edit().putBoolean(context.getString(R.string.pref_key__http_proxy_enabled), enabled).commit();
+        _prefApp.edit().putBoolean(rstr(R.string.pref_key__http_proxy_enabled), enabled).commit();
    }

    /**
@ -214,7 +220,7 @@ public class AppSettings extends AppSettingsBase {
     */
    public boolean isProxyHttpEnabled() {
        try {
-            return getBool(prefApp, R.string.pref_key__http_proxy_enabled, false);
+            return getBool(R.string.pref_key__http_proxy_enabled, false);
        } catch (ClassCastException e) {
            setProxyHttpEnabled(false);
            return false;
@ -222,7 +228,7 @@ public class AppSettings extends AppSettingsBase {
    }

    public boolean wasProxyEnabled() {
-        return getBool(prefApp, R.string.pref_key__proxy_was_enabled, false);
+        return getBool(R.string.pref_key__proxy_was_enabled, false);
    }

    /**
@ -233,7 +239,7 @@ public class AppSettings extends AppSettingsBase {
     */
    @SuppressLint("CommitPrefEdits")
    public void setProxyWasEnabled(boolean b) {
-        prefApp.edit().putBoolean(context.getString(R.string.pref_key__proxy_was_enabled), b).commit();
+        _prefApp.edit().putBoolean(rstr(R.string.pref_key__proxy_was_enabled), b).commit();
    }

    /**
@ -242,11 +248,11 @@ public class AppSettings extends AppSettingsBase {
     * @return proxy host
     */
    public String getProxyHttpHost() {
-        return getString(prefApp, R.string.pref_key__http_proxy_host, "");
+        return getString(R.string.pref_key__http_proxy_host, "");
    }

    public void setProxyHttpHost(String value) {
-        setString(prefApp, R.string.pref_key__http_proxy_host, value);
+        setString(R.string.pref_key__http_proxy_host, value);
    }

    /**
@ -256,17 +262,17 @@ public class AppSettings extends AppSettingsBase {
     */
    public int getProxyHttpPort() {
        try {
-            String str = getString(prefApp, R.string.pref_key__http_proxy_port, "0");
+            String str = getString(R.string.pref_key__http_proxy_port, "0");
            return Integer.parseInt(str);
        } catch (ClassCastException e) {
-            int port = getInt(prefApp, R.string.pref_key__http_proxy_port, 0);
+            int port = getInt(R.string.pref_key__http_proxy_port, 0);
            setProxyHttpPort(port);
            return port;
        }
    }

    public void setProxyHttpPort(int value) {
-        setString(prefApp, R.string.pref_key__http_proxy_port, Integer.toString(value));
+        setString(R.string.pref_key__http_proxy_port, Integer.toString(value));
    }

    public ProxyHandler.ProxySettings getProxySettings() {
@ -274,122 +280,141 @@ public class AppSettings extends AppSettingsBase {
    }

    public boolean isIntellihideToolbars() {
-        return getBool(prefApp, R.string.pref_key__intellihide_toolbars, true);
+        return getBool(R.string.pref_key__intellihide_toolbars, false);
    }

    public boolean isChromeCustomTabsEnabled() {
-        return getBool(prefApp, R.string.pref_key__chrome_custom_tabs_enabled, true);
+        return getBool(R.string.pref_key__chrome_custom_tabs_enabled, true);
    }

    public boolean isLoggingEnabled() {
-        return getBool(prefApp, R.string.pref_key__logging_enabled, false);
+        return getBool(R.string.pref_key__logging_enabled, false);
    }

    public boolean isLoggingSpamEnabled() {
-        return getBool(prefApp, R.string.pref_key__logging_spam_enabled, false);
+        return getBool(R.string.pref_key__logging_spam_enabled, false);
    }

    public boolean isVisibleInNavExit() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__exit, false);
+        return getBool(R.string.pref_key__visibility_nav__exit, true);
    }

    public boolean isVisibleInNavHelp_license() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__help_license, true);
+        return getBool(R.string.pref_key__visibility_nav__help_license, true);
    }

    public boolean isVisibleInNavPublic_activities() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__public_activities, false);
+        return getBool(R.string.pref_key__visibility_nav__public_activities, false);
    }

    public boolean isVisibleInNavMentions() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__mentions, false);
+        return getBool(R.string.pref_key__visibility_nav__mentions, false);
    }

    public boolean isVisibleInNavCommented() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__commented, true);
+        return getBool(R.string.pref_key__visibility_nav__commented, true);
    }

    public boolean isVisibleInNavLiked() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__liked, true);
+        return getBool(R.string.pref_key__visibility_nav__liked, true);
    }

    public boolean isVisibleInNavActivities() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__activities, true);
+        return getBool(R.string.pref_key__visibility_nav__activities, true);
    }

    public boolean isVisibleInNavAspects() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__aspects, true);
+        return getBool(R.string.pref_key__visibility_nav__aspects, true);
    }

    public boolean isVisibleInNavFollowed_tags() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__followed_tags, true);
+        return getBool(R.string.pref_key__visibility_nav__followed_tags, true);
    }

    public boolean isVisibleInNavProfile() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__profile, true);
+        return getBool(R.string.pref_key__visibility_nav__profile, true);
    }

    public boolean isVisibleInNavContacts() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__contacts, false);
+        return getBool(R.string.pref_key__visibility_nav__contacts, false);
    }

    public boolean isVisibleInNavStatistics() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__statistics, false);
+        return getBool(R.string.pref_key__visibility_nav__statistics, false);
    }

    public boolean isVisibleInNavReports() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__reports, false);
+        return getBool(R.string.pref_key__visibility_nav__reports, false);
    }

-    public boolean isVisibleToggleMobileDesktop() {
-        return getBool(prefApp, R.string.pref_key__visibility_nav__toggle_mobile_desktop, false);
+    public boolean isVisibleInNavGsantnerAccount() {
+        return getBool(R.string.pref_key__visibility_nav__gsantner_account, false);
+    }
+
+    public boolean isVisibleInNavToggleMobileDesktop() {
+        return getBool(R.string.pref_key__visibility_nav__toggle_mobile_desktop, false);
    }

    public boolean isTopbarStreamShortcutEnabled() {
-        return getBool(prefApp, R.string.pref_key__topbar_stream_shortcut, false);
+        return getBool(R.string.pref_key__topbar_stream_shortcut, false);
+    }
+
+    public boolean isOpenYoutubeExternalEnabled() {
+        return getBool(R.string.pref_key__open_youtube_external_enabled, true);
+    }
+
+    public boolean isSwipeRefreshEnabled() {
+        return getBool(R.string.pref_key__swipe_refresh_enabled, true);
    }

    public String getScreenRotation() {
-        return getString(prefApp, R.string.pref_key__screen_rotation, R.string.rotation_val_system);
+        return getString(R.string.pref_key__screen_rotation, R.string.rotation_val_system);
    }

    public boolean isAppFirstStart() {
-        boolean value = getBool(prefApp, R.string.pref_key__app_first_start, true);
-        setBool(prefApp, R.string.pref_key__app_first_start, false);
+        boolean value = getBool(R.string.pref_key__app_first_start, true);
+        setBool(R.string.pref_key__app_first_start, false);
        return value;
    }

-    public boolean isAppCurrentVersionFirstStart() {
-        int value = getInt(prefApp, R.string.pref_key__app_first_start_current_version, -1);
-        setInt(prefApp, R.string.pref_key__app_first_start_current_version, BuildConfig.VERSION_CODE);
+    public boolean isAppCurrentVersionFirstStart(boolean doSet) {
+        int value = getInt(R.string.pref_key__app_first_start_current_version, -1);
+        if (doSet) {
+            setInt(R.string.pref_key__app_first_start_current_version, BuildConfig.VERSION_CODE);
+        }
        return value != BuildConfig.VERSION_CODE && !BuildConfig.IS_TEST_BUILD;
    }

+    public File getAppSaveDirectory() {
+        return new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/dandelion");
+
+    }
+
    public long getLastVisitedPositionInStream() {
-        return getLong(prefPod, R.string.pref_key__podprofile_last_stream_position, -1);
+        return getLong(R.string.pref_key__podprofile_last_stream_position, -1, _prefPod);
    }

    public void setLastVisitedPositionInStream(long timestamp) {
-        setLong(prefPod, R.string.pref_key__podprofile_last_stream_position, timestamp);
+        setLong(R.string.pref_key__podprofile_last_stream_position, timestamp, _prefPod);
    }

    public void setLanguage(String value) {
-        setString(prefApp, R.string.pref_key__language, value);
+        setString(R.string.pref_key__language, value);
    }

    public String getLanguage() {
-        return getString(prefApp, R.string.pref_key__language, "");
+        return getString(R.string.pref_key__language, "");
    }

    public void setPrimaryColorSettings(int base, int shade) {
-        setInt(prefApp, R.string.pref_key__primary_color_base, base);
-        setInt(prefApp, R.string.pref_key__primary_color_shade, shade);
+        setInt(R.string.pref_key__primary_color_base, base);
+        setInt(R.string.pref_key__primary_color_shade, shade);
    }

    public int[] getPrimaryColorSettings() {
        return new int[]{
-                getInt(prefApp, R.string.pref_key__primary_color_base, rcolor(R.color.md_blue_650)),
-                getInt(prefApp, R.string.pref_key__primary_color_shade, rcolor(R.color.primary))
+                getInt(R.string.pref_key__primary_color_base, rcolor(R.color.md_blue_650)),
+                getInt(R.string.pref_key__primary_color_shade, rcolor(R.color.primary))
        };
    }

@ -398,36 +423,58 @@ public class AppSettings extends AppSettingsBase {
        if (isAmoledColorMode()) {
            return Color.BLACK;
        } else {
-            return getInt(prefApp, R.string.pref_key__primary_color_shade, rcolor(
+            return getInt(R.string.pref_key__primary_color_shade, rcolor(
                    BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
        }
    }

    public void setAccentColorSettings(int base, int shade) {
-        setInt(prefApp, R.string.pref_key__accent_color_base, base);
-        setInt(prefApp, R.string.pref_key__accent_color_shade, shade);
+        setInt(R.string.pref_key__accent_color_base, base);
+        setInt(R.string.pref_key__accent_color_shade, shade);
    }

    public int[] getAccentColorSettings() {
        return new int[]{
-                getInt(prefApp, R.string.pref_key__accent_color_base, rcolor(R.color.md_green_400)),
-                getInt(prefApp, R.string.pref_key__accent_color_shade, rcolor(R.color.accent))
+                getInt(R.string.pref_key__accent_color_base, rcolor(R.color.md_green_400)),
+                getInt(R.string.pref_key__accent_color_shade, rcolor(R.color.accent))
        };
    }

    public int getAccentColor() {
-        return getInt(prefApp, R.string.pref_key__accent_color_shade, rcolor(R.color.accent));
+        return getInt(R.string.pref_key__accent_color_shade, rcolor(R.color.accent));
    }

    public boolean isExtendedNotificationsActivated() {
-        return getBool(prefApp, R.string.pref_key__extended_notifications, false);
+        return getBool(R.string.pref_key__extended_notifications, false);
    }

    public boolean isAmoledColorMode() {
-        return getBool(prefApp, R.string.pref_key__primary_color__amoled_mode, false);
+        return getBool(R.string.pref_key__primary_color__amoled_mode, false);
+    }
+
+    public void setAmoledColorMode(boolean enable) {
+        setBool(R.string.pref_key__primary_color__amoled_mode, enable);
    }

    public boolean isAdBlockEnabled() {
-        return getBool(prefApp, R.string.pref_key__adblock_enable, true);
+        return getBool(R.string.pref_key__adblock_enable, true);
    }
-}
+
+    public boolean isEditorStatusBarHidden() {
+        return getBool(R.string.pref_key__is_overview_statusbar_hidden, false);
+    }
+
+    public void setRecreateMainActivity(boolean value) {
+        setBool(R.string.pref_key__recreate_main_activity, value);
+    }
+
+    public boolean isRecreateMainActivity() {
+        boolean value = getBool(R.string.pref_key__recreate_main_activity, false);
+        setRecreateMainActivity(false);
+        return value;
+    }
+
+    public boolean isShowTitleInMainView() {
+        return getBool(R.string.pref_key__show_title, false);
+    }
+}
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/ContextUtils.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/ContextUtils.java
@ -0,0 +1,58 @@
+package com.github.dfa.diaspora_android.util;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Environment;
+
+import com.github.dfa.diaspora_android.App;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Locale;
+
+@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
+public class ContextUtils extends net.gsantner.opoc.util.ContextUtils {
+    protected ContextUtils(Context context) {
+        super(context);
+    }
+
+
+    public static ContextUtils get() {
+        return new ContextUtils(App.get());
+    }
+
+    public File createImageFile() throws IOException {
+        // Create an image file name
+        String timeStamp = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault()).format(new Date());
+        String imageFileName = "JPEG_" + timeStamp + "_";
+        AppLog.d(ContextUtils.class, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
+        File storageDir = Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_PICTURES);
+        return new File(
+                imageFileName +  /* prefix */
+                        ".jpg",         /* suffix */
+                storageDir.getAbsolutePath()      /* directory */
+        );
+    }
+
+    public void logBundle(Bundle savedInstanceState, String k) {
+        if (savedInstanceState != null) {
+            for (String key : savedInstanceState.keySet()) {
+                AppLog.d("Bundle", key + " is a key in the bundle " + k);
+                Object bun = savedInstanceState.get(key);
+                if (bun != null) {
+                    if (bun instanceof Bundle) {
+                        logBundle((Bundle) bun, k + "." + key);
+                    } else if (bun instanceof byte[]) {
+                        AppLog.d("Bundle", "Key: " + k + "." + key + ": " + Arrays.toString((byte[]) bun));
+                    } else {
+                        AppLog.d("Bundle", "Key: " + k + "." + key + ": " + bun.toString());
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
@ -27,7 +27,7 @@ import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
 * Helper class that provides easy access to specific urls related to diaspora
 * Created by vanitasvitae on 10.08.16.
 */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "SpellCheckingInspection", "SameParameterValue", "WeakerAccess"})
 public class DiasporaUrlHelper {
    private final AppSettings settings;

@ -62,6 +62,7 @@ public class DiasporaUrlHelper {
    public static final String SUBURL_NOTIFICATIONS_MENTIONED = "/notifications?type=mentioned";
    public static final String SUBURL_NOTIFICATIONS_RESHARED = "/notifications?type=reshared";
    public static final String SUBURL_NOTIFICATIONS_STARTED_SHARING = "/notifications?type=started_sharing";
+    public static final String SUBURL_THEME = "/user/edit";

    public DiasporaUrlHelper(AppSettings settings) {
        this.settings = settings;
@ -151,7 +152,7 @@ public class DiasporaUrlHelper {
     * @param profileId Id of the profile to be shown
     * @return https://(pod-domain.tld)/people/(profileId)
     */
-    public String getProfileUrl(long profileId) {
+    public String getProfileUrl(String profileId) {
        return getPodUrl() + SUBURL_PEOPLE + profileId;
    }

@ -229,6 +230,15 @@ public class DiasporaUrlHelper {
        return getPodUrl() + SUBURL_SEARCH_TAGS + query;
    }

+    /**
+     * Return a url that queries posts for the given hashtag query
+     *
+     * @return https://(pod-domain.tld)/followed_tags
+     */
+    public String getAllFollowedTagsUrl() {
+        return getPodUrl() + SUBURL_FOLOWED_TAGS;
+    }
+
    /**
     * Return a url that queries user accounts for query
     *
@ -344,4 +354,13 @@ public class DiasporaUrlHelper {
        }
        return app.getString(R.string.aspects);
    }
+
+    /**
+     * Return a url that points to the settings of the pod.
+     *
+     * @return https://(pod-domain.tld)/user/edit
+     */
+    public String getThemeUrl() {
+        return getPodUrl() + SUBURL_THEME;
+    }
 }
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
@ -18,21 +18,10 @@
 */
 package com.github.dfa.diaspora_android.web;

-import android.Manifest;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.MutableContextWrapper;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
@ -41,21 +30,11 @@ import android.widget.ProgressBar;

 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
-import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;

-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 /**
 * Fragment with a webView and a ProgressBar.
 * This Fragment retains its instance.
@ -65,7 +44,6 @@ import java.util.Locale;
 public class BrowserFragment extends ThemedFragment {
    public static final String TAG = "com.github.dfa.diaspora_android.BrowserFragment";

-    protected View rootLayout;
    protected ContextMenuWebView webView;
    protected ProgressBar progressBar;
    protected AppSettings appSettings;
@ -73,20 +51,14 @@ public class BrowserFragment extends ThemedFragment {
    protected WebSettings webSettings;

    protected String pendingUrl;
+    protected SwipeRefreshLayout swipe;//pull to refresh

    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        AppLog.d(this, "onCreateView()");
-        if (rootLayout == null) {
-            LayoutInflater inflater1 = inflater.cloneInContext(new MutableContextWrapper(getContext()));
-            rootLayout = inflater1.inflate(R.layout.browser__fragment, container, false);
-        } else {
-            MutableContextWrapper context = (MutableContextWrapper) rootLayout.getContext();
-            context.setBaseContext(getContext());
-        }
-        return rootLayout;
+    protected int getLayoutResId() {
+        return R.layout.browser__fragment;
    }

+
    @Override
    public void onViewCreated(View view, Bundle savedInstanceState) {
        AppLog.d(this, "onViewCreated()");
@ -97,7 +69,7 @@ public class BrowserFragment extends ThemedFragment {
        }

        if (this.webView == null) {
-            this.webView = (ContextMenuWebView) view.findViewById(R.id.webView);
+            this.webView = view.findViewById(R.id.webView);
            getActivity().runOnUiThread(new Runnable() {
                @Override
                public void run() {
@ -109,7 +81,7 @@ public class BrowserFragment extends ThemedFragment {
        }

        if (this.progressBar == null) {
-            this.progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
+            this.progressBar = view.findViewById(R.id.progressBar);
        }

        if (pendingUrl != null) {
@ -120,14 +92,26 @@ public class BrowserFragment extends ThemedFragment {
        webView.setParentActivity(getActivity());

        this.setRetainInstance(true);
+
+        //pull to refresh
+        swipe = view.findViewById(R.id.swipe);
+        swipe.setDistanceToTriggerSync(2000);
+        swipe.setOnRefreshListener(() -> reloadUrl());
+        if (appSettings.isSwipeRefreshEnabled()) {
+            swipe.setEnabled(true);
+        } else {
+            swipe.setRefreshing(false);
+            swipe.setEnabled(false);
+            return;
+        }
    }

    @Override
    public void onDestroyView() {
        super.onDestroyView();

-        if (getRetainInstance() && rootLayout.getParent() instanceof ViewGroup) {
-            ((ViewGroup) rootLayout.getParent()).removeView(rootLayout);
+        if (getRetainInstance() && getView() != null && getView().getParent() instanceof ViewGroup) {
+            ((ViewGroup) getView().getParent()).removeView(getView());
        }
    }

@ -165,98 +149,11 @@ public class BrowserFragment extends ThemedFragment {
        }
    }

-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    protected boolean makeScreenshotOfWebView(boolean hasToShareScreenshot) {
-        AppLog.i(this, "StreamFragment.makeScreenshotOfWebView()");
-        if (android.os.Build.VERSION.SDK_INT >= 23) {
-            int hasWRITE_EXTERNAL_STORAGE = getActivity().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-            if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
-                if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                    new AlertDialog.Builder(getContext())
-                            .setMessage(R.string.permissions_screenshot)
-                            .setNegativeButton(android.R.string.no, null)
-                            .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    if (android.os.Build.VERSION.SDK_INT >= 23)
-                                        requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                                MainActivity.REQUEST_CODE_ASK_PERMISSIONS);
-                                }
-                            })
-                            .show();
-                    return false;
-                }
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        MainActivity.REQUEST_CODE_ASK_PERMISSIONS);
-                return false;
-            }
-        }
-
-        Date dateNow = new Date();
-        DateFormat dateFormat = new SimpleDateFormat("yy_MM_dd--HH_mm_ss", Locale.getDefault());
-        File fileSaveDirectory = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/Diaspora");
-
-        String fileSaveName = hasToShareScreenshot ? ".DfA_share.jpg" : String.format("DfA_%s.jpg", dateFormat.format(dateNow));
-        if (!fileSaveDirectory.exists()) {
-            if (!fileSaveDirectory.mkdirs()) {
-                AppLog.w(this, "Could not mkdir " + fileSaveDirectory.getAbsolutePath());
-            }
-        }
-
-        if (!hasToShareScreenshot) {
-            Snackbar.make(webView, getString(R.string.share__toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
-        }
-
-        Bitmap bitmap;
-        webView.setDrawingCacheEnabled(true);
-        bitmap = Bitmap.createBitmap(webView.getDrawingCache());
-        webView.setDrawingCacheEnabled(false);
-
-        OutputStream bitmapWriter = null;
-        try {
-            bitmapWriter = new FileOutputStream(new File(fileSaveDirectory, fileSaveName));
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 85, bitmapWriter);
-            bitmapWriter.flush();
-            bitmap.recycle();
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (bitmapWriter != null) {
-                try {
-                    bitmapWriter.close();
-                } catch (IOException _ignSaveored) {/* Nothing */}
-            }
-        }
-
-        // Only show share intent when Action Share Screenshot was selected
-        if (hasToShareScreenshot) {
-            Intent sharingIntent = new Intent(Intent.ACTION_SEND);
-            sharingIntent.setType("image/jpeg");
-            sharingIntent.putExtra(Intent.EXTRA_SUBJECT, webView.getTitle());
-            sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
-            Uri bmpUri = Uri.fromFile(new File(fileSaveDirectory, fileSaveName));
-            sharingIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
-            startActivity(Intent.createChooser(sharingIntent, getString(R.string.action_share_dotdotdot)));
-        } else {
-            // Broadcast that this file is indexable
-            File file = new File(fileSaveDirectory, fileSaveName);
-            Uri uri = Uri.fromFile(file);
-            Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri);
-            getActivity().sendBroadcast(intent);
-        }
-        return true;
-    }
-
    @Override
    public String getFragmentTag() {
        return TAG;
    }

-    @Override
-    public void onCreateBottomOptionsMenu(Menu menu, MenuInflater inflater) {
-        /* Nothing to do here */
-    }
-
    @Override
    public void onAttach(Context context) {
        super.onAttach(context);
@ -309,6 +206,7 @@ public class BrowserFragment extends ThemedFragment {
                @Override
                public void run() {
                    getWebView().reload();
+                    swipe.setRefreshing(false);//pull to refresh
                }
            });

--- a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
@ -18,29 +18,27 @@
 */
 package com.github.dfa.diaspora_android.web;

-import android.Manifest;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.DownloadManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
 import android.net.Uri;
-import android.os.Environment;
 import android.util.AttributeSet;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.widget.Toast;

+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
-import com.github.dfa.diaspora_android.activity.MainActivity;
-import com.github.dfa.diaspora_android.service.ImageDownloadTask;
+import com.github.dfa.diaspora_android.util.AppSettings;
+
+import net.gsantner.opoc.util.DownloadTask;
+import net.gsantner.opoc.util.PermissionChecker;
+import net.gsantner.opoc.util.ShareUtil;

 import java.io.File;
+import java.util.Date;

 /**
 * Subclass of WebView which adds a context menu for long clicks on images or links to share, save
@ -80,106 +78,46 @@ public class ContextMenuWebView extends NestedWebView {
            public boolean onMenuItemClick(MenuItem item) {
                HitTestResult result = getHitTestResult();
                String url = result.getExtra();
+                final ShareUtil shu = new ShareUtil(context);
+                final PermissionChecker permc = new PermissionChecker(parentActivity);
+                final AppSettings appSettings = new AppSettings(context);
+
                switch (item.getItemId()) {
                    //Save image to external memory
                    case ID_SAVE_IMAGE: {
-                        boolean writeToStoragePermitted = true;
-                        if (android.os.Build.VERSION.SDK_INT >= 23) {
-                            int hasWRITE_EXTERNAL_STORAGE = parentActivity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                            if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
-                                writeToStoragePermitted = false;
-                                if (!parentActivity.shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                                    new AlertDialog.Builder(parentActivity)
-                                            .setMessage(R.string.permissions_image)
-                                            .setPositiveButton(context.getText(android.R.string.yes), new DialogInterface.OnClickListener() {
-                                                @Override
-                                                public void onClick(DialogInterface dialog, int which) {
-                                                    if (android.os.Build.VERSION.SDK_INT >= 23)
-                                                        parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                                                MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
-                                                }
-                                            })
-                                            .setNegativeButton(context.getText(android.R.string.no), null)
-                                            .show();
-                                }
-                                parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                        MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
-                            }
-                        }
-                        if (writeToStoragePermitted) {
-                            //Make sure, Diaspora Folder exists
-                            File destinationFolder = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora");
-                            if (!destinationFolder.exists()) {
-                                destinationFolder.mkdirs();
-                            }
-
-                            if (url != null) {
-                                Uri source = Uri.parse(url);
+                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.image_permission_description__appspecific))) {
+                            File fileSaveDirectory = appSettings.getAppSaveDirectory();
+                            if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
+                                String filename = "dandelion-" + ShareUtil.SDF_SHORT.format(new Date()) + url.substring(url.lastIndexOf("."));
+                                /*Uri source = Uri.parse(url);
                                DownloadManager.Request request = new DownloadManager.Request(source);
-                                File destinationFile = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + System.currentTimeMillis() + ".png");
-
-                                request.setDestinationUri(Uri.fromFile(destinationFile));
-                                ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
-
-                                Toast.makeText(context, context.getText(R.string.share__toast_saved_image_to_location) + " " +
-                                        destinationFile.getAbsolutePath(), Toast.LENGTH_LONG).show();
+                                request.setDestinationUri(Uri.fromFile(new File(fileSaveDirectory, filename)));
+                                ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);*/
+                                new DownloadTask(new File(fileSaveDirectory, filename), (ok, dlfile) -> {
+                                    if (ok) {
+                                        Toast.makeText(context, context.getText(R.string.saving_image_to) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
+                                    }
+                                }).execute(url);
                            }
                        }
-                    }
-                    break;
-
-                    case ID_SHARE_IMAGE:
-                        if (url != null) {
-                            boolean writeToStoragePermitted = true;
-                            if (android.os.Build.VERSION.SDK_INT >= 23) {
-                                int hasWRITE_EXTERNAL_STORAGE = parentActivity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                                if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
-                                    writeToStoragePermitted = false;
-                                    if (!parentActivity.shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                                        new AlertDialog.Builder(parentActivity)
-                                                .setMessage(R.string.permissions_image)
-                                                .setPositiveButton(context.getText(android.R.string.yes), new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-                                                        if (android.os.Build.VERSION.SDK_INT >= 23)
-                                                            parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                                                    MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
-                                                    }
-                                                })
-                                                .setNegativeButton(context.getText(android.R.string.no), null)
-                                                .show();
-                                    } else {
-                                        parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                                MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
-                                    }
-                                }
-                            }
-                            if (writeToStoragePermitted) {
-                                //Make sure, Diaspora Folder exists
-                                File destinationFolder = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora");
-                                if (!destinationFolder.exists()) {
-                                    destinationFolder.mkdirs();
-                                }
-
-                                final Uri local = Uri.parse(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + System.currentTimeMillis() + ".png");
-                                new ImageDownloadTask(null, local.getPath()) {
-                                    @Override
-                                    protected void onPostExecute(Bitmap result) {
-                                        Uri myUri = Uri.fromFile(new File(local.getPath()));
-                                        Intent sharingIntent = new Intent();
-                                        sharingIntent.setAction(Intent.ACTION_SEND);
-                                        sharingIntent.putExtra(Intent.EXTRA_STREAM, myUri);
-                                        sharingIntent.setType("image/png");
-                                        sharingIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                                        context.startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.action_share_dotdotdot)));
-                                    }
-                                }.execute(url);
-                            }
-                        } else {
-                            Toast.makeText(context, "Cannot share image: url is null", Toast.LENGTH_SHORT).show();
-                        }
-
                        break;
+                    }
+
+                    case ID_SHARE_IMAGE: {
+                        if (permc.doIfExtStoragePermissionGranted(context.getString(R.string.image_permission_description__appspecific))) {
+                            File fileSaveDirectory = appSettings.getAppSaveDirectory();
+                            if (permc.mkdirIfStoragePermissionGranted(fileSaveDirectory)) {
+                                String filename = ".dandelion-shared" + url.substring(url.lastIndexOf("."));
+                                new DownloadTask(new File(fileSaveDirectory, filename), (ok, dlfile) -> {
+                                    if (ok) {
+                                        Toast.makeText(context, context.getText(R.string.saving_image_to) + " " + dlfile.getName(), Toast.LENGTH_LONG).show();
+                                        shu.shareStream(dlfile, "image/" + dlfile.getAbsolutePath().lastIndexOf(".") + 1);
+                                    }
+                                }).execute(url);
+                            }
+                        }
+                        break;
+                    }

                    case ID_IMAGE_EXTERNAL_BROWSER:
                        if (url != null) {
@ -194,7 +132,7 @@ public class ContextMenuWebView extends NestedWebView {
                        if (url != null) {
                            ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
                            clipboard.setPrimaryClip(ClipData.newPlainText("text", url));
-                            Toast.makeText(context, R.string.share__toast_link_address_copied, Toast.LENGTH_SHORT).show();
+                            Toast.makeText(context, R.string.link_adress_copied, Toast.LENGTH_SHORT).show();
                        }
                        break;

@ -206,7 +144,7 @@ public class ContextMenuWebView extends NestedWebView {
                            sendIntent.putExtra(Intent.EXTRA_TEXT, url);
                            sendIntent.setType("text/plain");
                            context.startActivity(Intent.createChooser(sendIntent, getResources()
-                                    .getText(R.string.context_menu_share_link)));
+                                    .getText(R.string.share_link_address)));
                        }
                        break;
                }
@ -219,16 +157,16 @@ public class ContextMenuWebView extends NestedWebView {
                result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
            // Menu options for an image.
            menu.setHeaderTitle(result.getExtra());
-            menu.add(0, ID_SAVE_IMAGE, 0, context.getString(R.string.context_menu_save_image)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_IMAGE_EXTERNAL_BROWSER, 0, context.getString(R.string.context_menu_open_external_browser)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_SHARE_IMAGE, 0, context.getString(R.string.context_menu_share_image)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_COPY_IMAGE_LINK, 0, context.getString(R.string.context_menu_copy_image_link)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SAVE_IMAGE, 0, context.getString(R.string.save_image)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_IMAGE_EXTERNAL_BROWSER, 0, context.getString(R.string.open_in_external_browser)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SHARE_IMAGE, 0, context.getString(R.string.share_image)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_COPY_IMAGE_LINK, 0, context.getString(R.string.copy_image_address_to_clipboard)).setOnMenuItemClickListener(handler);
        } else if (result.getType() == HitTestResult.ANCHOR_TYPE ||
                result.getType() == HitTestResult.SRC_ANCHOR_TYPE) {
            // Menu options for a hyperlink.
            menu.setHeaderTitle(result.getExtra());
-            menu.add(0, ID_COPY_LINK, 0, context.getString(R.string.context_menu_copy_link)).setOnMenuItemClickListener(handler);
-            menu.add(0, ID_SHARE_LINK, 0, context.getString(R.string.context_menu_share_link)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_COPY_LINK, 0, context.getString(R.string.copy_link_adress_to_clipboard)).setOnMenuItemClickListener(handler);
+            menu.add(0, ID_SHARE_LINK, 0, context.getString(R.string.share_link_address)).setOnMenuItemClickListener(handler);
        }
    }

--- a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
@ -20,6 +20,7 @@ package com.github.dfa.diaspora_android.web;

 import android.annotation.TargetApi;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.LocalBroadcastManager;
 import android.webkit.CookieManager;
@ -32,12 +33,13 @@ import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.data.DiasporaPodList;
 import com.github.dfa.diaspora_android.util.AppSettings;

-import io.github.gsantner.opoc.util.AdBlock;
+import net.gsantner.opoc.util.AdBlock;

 public class CustomWebViewClient extends WebViewClient {
    private final App app;
    private String lastLoadUrl = "";
    private boolean isAdBlockEnabled = false;
+    AppSettings appSettings = AppSettings.get();

    public CustomWebViewClient(App app, WebView webView) {
        this.app = app;
@ -56,6 +58,11 @@ public class CustomWebViewClient extends WebViewClient {
                || (host != null && (url.startsWith("https://" + host)
                || url.startsWith("http://" + host)))) {
            return false;
+        }//make youtube links open external-->never customtab
+        else if (appSettings.isOpenYoutubeExternalEnabled() && (url.startsWith("https://youtube.com/") || url.startsWith("https://www.youtube.com/") || url.startsWith("https://m.youtube.com/") || url.startsWith("https://youtu.be/"))) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            view.getContext().startActivity(intent);
+            return true;
        } else {
            Intent i = new Intent(MainActivity.ACTION_OPEN_EXTERNAL_URL);
            i.putExtra(MainActivity.EXTRA_URL, url);
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java
@ -18,7 +18,6 @@
 */
 package com.github.dfa.diaspora_android.web;

-import android.content.DialogInterface;
 import android.webkit.JsResult;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
@ -65,20 +64,13 @@ public class DiasporaStreamWebChromeClient extends FileUploadWebChromeClient {
        ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(view.getContext(), AppSettings.get());
        builder.setTitle(view.getContext().getString(R.string.confirmation))
                .setMessage(message)
-                .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                result.confirm();
-                            }
-                        })
-                .setNegativeButton(android.R.string.cancel,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                result.cancel();
-                            }
-                        })
-                .create()
-                .show();
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm())
+                .setNegativeButton(android.R.string.cancel, (dialog, which) -> result.cancel())
+                .setOnCancelListener(dialog -> {
+                    result.cancel();
+                    dialog.dismiss();
+                })
+                .create().show();
        return true;
    }

--- a/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/WebHelper.java
@ -32,7 +32,6 @@ import com.github.dfa.diaspora_android.activity.MainActivity;

 /**
 * Created by Gregor Santner on 07.08.16.
- * https://gsantner.github.io
 */
 public class WebHelper {

--- a/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabsHelper.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabsHelper.java
@ -41,6 +41,9 @@ public class CustomTabsHelper {
    static final String BETA_PACKAGE = "com.chrome.beta";
    static final String DEV_PACKAGE = "com.chrome.dev";
    static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
+    static final String CHROMIUM = "org.chromium.chrome";
+    static final String FENNEC = "org.mozilla.fennec_fdroid";
+    static final String KLAR = "org.mozilla.klar";
    private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
            "android.support.customtabs.extra.KEEP_ALIVE";

@ -101,6 +104,12 @@ public class CustomTabsHelper {
            sPackageNameToUse = DEV_PACKAGE;
        } else if (packagesSupportingCustomTabs.contains(LOCAL_PACKAGE)) {
            sPackageNameToUse = LOCAL_PACKAGE;
+        } else if (packagesSupportingCustomTabs.contains(CHROMIUM)) {
+            sPackageNameToUse = CHROMIUM;
+        } else if (packagesSupportingCustomTabs.contains(FENNEC)) {
+            sPackageNameToUse = FENNEC;
+        } else if (packagesSupportingCustomTabs.contains(KLAR)) {
+            sPackageNameToUse = KLAR;
        }
        return sPackageNameToUse;
    }
@ -137,6 +146,6 @@ public class CustomTabsHelper {
     * @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};
+        return new String[]{"", STABLE_PACKAGE, BETA_PACKAGE, DEV_PACKAGE, LOCAL_PACKAGE, CHROMIUM, FENNEC, KLAR};
    }
 }
--- a/app/src/main/java/io/github/gsantner/opoc/util/AppSettingsBase.java
+++ b/app/src/main/java/io/github/gsantner/opoc/util/AppSettingsBase.java
@ -1,325 +0,0 @@
-/*
- * ---------------------------------------------------------------------------- *
- * Gregor Santner <gsantner.github.io> wrote this file. You can do whatever
- * you want with this stuff. If we meet some day, and you think this stuff is
- * worth it, you can buy me a coke in return. Provided as is without any kind
- * of warranty. No attribution required.                  - Gregor Santner
- *
- * License: Creative Commons Zero (CC0 1.0)
- *  http://creativecommons.org/publicdomain/zero/1.0/
- * ----------------------------------------------------------------------------
- */
-
-/*
- * Get updates:
- *  https://github.com/gsantner/onePieceOfCode/blob/master/java/AppSettingsBase.java
- * This is a wrapper for settings based on SharedPreferences
- * with keys in resources. Extend from this class and add
- * getters/setters for the app's settings.
- * Example:
-    public boolean isAppFirstStart() {
-    return getBool(prefApp, R.string.pref_key__app_first_start, true);
-    }
-
-    public void setAppFirstStart(boolean value) {
-    setBool(prefApp, R.string.pref_key__app_first_start, value);
-    }
-
-    public boolean isAppFirstStartCurrentVersion() {
-    int value = getInt(prefApp, R.string.pref_key__app_first_start_current_version, -1);
-    setInt(prefApp, R.string.pref_key__app_first_start_current_version, BuildConfig.VERSION_CODE);
-    return value != BuildConfig.VERSION_CODE && !BuildConfig.IS_TEST_BUILD;
-    }
-
- * Maybe add a singleton for this:
- * Whereas App.get() is returning ApplicationContext
-    private AppSettings(Context context) {
-        super(context);
-    }
-
-    public static AppSettings get() {
-        return new AppSettings(App.get());
-    }
- */
-
-package io.github.gsantner.opoc.util;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-/**
- * Wrapper for settings based on SharedPreferences
- * with keys in resources
- */
-@SuppressWarnings({"WeakerAccess", "unused"})
-public class AppSettingsBase {
-    protected static final String ARRAY_SEPARATOR = "%%%";
-    protected static final String ARRAY_SEPARATOR_SUBSTITUTE = "§§§";
-    public static final String SHARED_PREF_APP = "app";
-
-    //#####################
-    //## Members
-    //#####################
-    protected final SharedPreferences prefApp;
-    protected final Context context;
-
-    //#####################
-    //## Methods
-    //#####################
-    public AppSettingsBase(Context context) {
-        this(context, SHARED_PREF_APP);
-    }
-
-    public AppSettingsBase(Context context, String prefAppName) {
-        this.context = context.getApplicationContext();
-        prefApp = this.context.getSharedPreferences(prefAppName, Context.MODE_PRIVATE);
-    }
-
-    public Context getContext() {
-        return context;
-    }
-
-    public boolean isKeyEqual(String key, int stringKeyResourceId) {
-        return key.equals(rstr(stringKeyResourceId));
-    }
-
-    public void resetSettings() {
-        resetSettings(prefApp);
-    }
-
-    @SuppressLint("ApplySharedPref")
-    public void resetSettings(SharedPreferences pref) {
-        pref.edit().clear().commit();
-    }
-
-    public boolean isPrefSet(@StringRes int stringKeyResourceId) {
-        return isPrefSet(prefApp, stringKeyResourceId);
-    }
-
-    public boolean isPrefSet(SharedPreferences pref, @StringRes int stringKeyResourceId) {
-        return pref.contains(rstr(stringKeyResourceId));
-    }
-
-    public void registerPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener value) {
-        registerPreferenceChangedListener(prefApp, value);
-    }
-
-    public void registerPreferenceChangedListener(SharedPreferences pref, SharedPreferences.OnSharedPreferenceChangeListener value) {
-        pref.registerOnSharedPreferenceChangeListener(value);
-    }
-
-    public void unregisterPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener value) {
-        unregisterPreferenceChangedListener(prefApp, value);
-    }
-
-    public void unregisterPreferenceChangedListener(SharedPreferences pref, SharedPreferences.OnSharedPreferenceChangeListener value) {
-        pref.unregisterOnSharedPreferenceChangeListener(value);
-    }
-
-    //#################################
-    //## Getter for resources
-    //#################################
-    public String rstr(@StringRes int stringKeyResourceId) {
-        return context.getString(stringKeyResourceId);
-    }
-
-    public int rcolor(@ColorRes int resColorId) {
-        return ContextCompat.getColor(context, resColorId);
-    }
-
-    //#################################
-    //## Getter & Setter for settings
-    //#################################
-    public void setString(@StringRes int keyResourceId, String value) {
-        setString(prefApp, keyResourceId, value);
-    }
-
-    public void setString(SharedPreferences pref, @StringRes int keyResourceId, String value) {
-        pref.edit().putString(rstr(keyResourceId), value).apply();
-    }
-
-    public String getString(@StringRes int keyResourceId, String defaultValue) {
-        return getString(prefApp, keyResourceId, defaultValue);
-    }
-
-    public String getString(SharedPreferences pref, @StringRes int keyResourceId, String defaultValue) {
-        return pref.getString(rstr(keyResourceId), defaultValue);
-    }
-
-    public String getString(@StringRes int keyResourceId, @StringRes int keyResourceIdDefaultValue) {
-        return getString(prefApp, keyResourceId, keyResourceIdDefaultValue);
-    }
-
-    public String getString(SharedPreferences pref, @StringRes int keyResourceId, @StringRes int keyResourceIdDefaultValue) {
-        return pref.getString(rstr(keyResourceId), rstr(keyResourceIdDefaultValue));
-    }
-
-    public void setStringArray(@StringRes int keyResourceId, Object[] values) {
-        setStringArray(prefApp, keyResourceId, values);
-    }
-
-    public void setStringArray(SharedPreferences pref, @StringRes int keyResourceId, Object[] values) {
-        StringBuilder sb = new StringBuilder();
-        for (Object value : values) {
-            sb.append(ARRAY_SEPARATOR);
-            sb.append(value.toString().replace(ARRAY_SEPARATOR, ARRAY_SEPARATOR_SUBSTITUTE));
-        }
-        setString(pref, keyResourceId, sb.toString().replaceFirst(ARRAY_SEPARATOR, ""));
-    }
-
-    @NonNull
-    public String[] getStringArray(@StringRes int keyResourceId) {
-        return getStringArray(prefApp, keyResourceId);
-    }
-
-    @NonNull
-    public String[] getStringArray(SharedPreferences pref, @StringRes int keyResourceId) {
-        String value = pref.getString(rstr(keyResourceId), ARRAY_SEPARATOR);
-        if (value.equals(ARRAY_SEPARATOR)) {
-            return new String[0];
-        }
-        return value.split(ARRAY_SEPARATOR);
-    }
-
-    public void setStringList(@StringRes int keyResourceId, List<String> values) {
-        setStringList(prefApp, keyResourceId, values);
-    }
-
-    public void setStringList(SharedPreferences pref, @StringRes int keyResourceId, List<String> values) {
-        setStringArray(pref, keyResourceId, values.toArray(new String[values.size()]));
-    }
-
-    public ArrayList<String> getStringList(@StringRes int keyResourceId) {
-        return getStringList(prefApp, keyResourceId);
-    }
-
-    public ArrayList<String> getStringList(SharedPreferences pref, @StringRes int keyResourceId) {
-        return new ArrayList<>(Arrays.asList(getStringArray(pref, keyResourceId)));
-    }
-
-    public void setLong(@StringRes int keyResourceId, long value) {
-        setLong(prefApp, keyResourceId, value);
-    }
-
-    public void setLong(SharedPreferences pref, @StringRes int keyResourceId, long value) {
-        pref.edit().putLong(rstr(keyResourceId), value).apply();
-    }
-
-    public long getLong(@StringRes int keyResourceId, long defaultValue) {
-        return getLong(prefApp, keyResourceId, defaultValue);
-    }
-
-    public long getLong(SharedPreferences pref, @StringRes int keyResourceId, long defaultValue) {
-        return pref.getLong(rstr(keyResourceId), defaultValue);
-    }
-
-    public void setBool(@StringRes int keyResourceId, boolean value) {
-        setBool(prefApp, keyResourceId, value);
-    }
-
-    public void setBool(SharedPreferences pref, @StringRes int keyResourceId, boolean value) {
-        pref.edit().putBoolean(rstr(keyResourceId), value).apply();
-    }
-
-    public boolean getBool(@StringRes int keyResourceId, boolean defaultValue) {
-        return getBool(prefApp, keyResourceId, defaultValue);
-    }
-
-    public boolean getBool(SharedPreferences pref, @StringRes int keyResourceId, boolean defaultValue) {
-        return pref.getBoolean(rstr(keyResourceId), defaultValue);
-    }
-
-    public int getColor(String key, int defaultColor) {
-        return getColor(prefApp, key, defaultColor);
-    }
-
-    public int getColor(SharedPreferences pref, String key, int defaultColor) {
-        return pref.getInt(key, defaultColor);
-    }
-
-    public int getColor(@StringRes int keyResourceId, int defaultColor) {
-        return getColor(prefApp, keyResourceId, defaultColor);
-    }
-
-    public int getColor(SharedPreferences pref, @StringRes int keyResourceId, int defaultColor) {
-        return pref.getInt(rstr(keyResourceId), defaultColor);
-    }
-
-    public void setDouble(@StringRes int keyResId, double value) {
-        setDouble(prefApp, keyResId, value);
-    }
-
-    public void setDouble(SharedPreferences pref, @StringRes int keyResId, double value) {
-        prefApp.edit().putLong(rstr(keyResId), Double.doubleToRawLongBits(value)).apply();
-    }
-
-    public double getDouble(@StringRes int keyResId, double defaultValue) {
-        return getDouble(prefApp, keyResId, defaultValue);
-    }
-
-    public double getDouble(SharedPreferences pref, @StringRes int keyResId, double defaultValue) {
-        return Double.longBitsToDouble(prefApp.getLong(rstr(keyResId), Double.doubleToLongBits(defaultValue)));
-    }
-
-    public int getIntOfStringPref(@StringRes int keyResId, int defaultValue) {
-        String strNum = prefApp.getString(context.getString(keyResId), Integer.toString(defaultValue));
-        return Integer.valueOf(strNum);
-    }
-
-    public void setInt(@StringRes int keyResourceId, int value) {
-        setInt(prefApp, keyResourceId, value);
-    }
-
-    public void setInt(SharedPreferences pref, @StringRes int keyResourceId, int value) {
-        pref.edit().putInt(rstr(keyResourceId), value).apply();
-    }
-
-    public int getInt(@StringRes int keyResourceId, int defaultValue) {
-        return getInt(prefApp, keyResourceId, defaultValue);
-    }
-
-    public int getInt(SharedPreferences pref, @StringRes int keyResourceId, int defaultValue) {
-        return pref.getInt(rstr(keyResourceId), defaultValue);
-    }
-
-    public void setIntList(@StringRes int keyResId, List<Integer> values) {
-        setIntList(prefApp, keyResId, values);
-    }
-
-    public void setIntList(SharedPreferences pref, @StringRes int keyResId, List<Integer> values) {
-        StringBuilder sb = new StringBuilder();
-        for (int value : values) {
-            sb.append(ARRAY_SEPARATOR);
-            sb.append(Integer.toString(value));
-        }
-        setString(prefApp, keyResId, sb.toString().replaceFirst(ARRAY_SEPARATOR, ""));
-    }
-
-    @NonNull
-    public ArrayList<Integer> getIntList(@StringRes int keyResId) {
-        return getIntList(prefApp, keyResId);
-    }
-
-    @NonNull
-    public ArrayList<Integer> getIntList(SharedPreferences pref, @StringRes int keyResId) {
-        ArrayList<Integer> ret = new ArrayList<>();
-        String value = getString(prefApp, keyResId, ARRAY_SEPARATOR);
-        if (value.equals(ARRAY_SEPARATOR)) {
-            return ret;
-        }
-        for (String s : value.split(ARRAY_SEPARATOR)) {
-            ret.add(Integer.parseInt(s));
-        }
-        return ret;
-    }
-}
--- a/app/src/main/java/io/github/gsantner/opoc/util/Helpers.java
+++ b/app/src/main/java/io/github/gsantner/opoc/util/Helpers.java
@ -1,221 +0,0 @@
-/*
- * ---------------------------------------------------------------------------- *
- * Gregor Santner <gsantner.github.io> wrote this file. You can do whatever
- * you want with this stuff. If we meet some day, and you think this stuff is
- * worth it, you can buy me a coke in return. Provided as is without any kind
- * of warranty. No attribution required.                  - Gregor Santner
- *
- * License: Creative Commons Zero (CC0 1.0)
- *  http://creativecommons.org/publicdomain/zero/1.0/
- * ----------------------------------------------------------------------------
- */
-package io.github.gsantner.opoc.util;
-
-import android.annotation.SuppressLint;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.RawRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatButton;
-import android.text.TextUtils;
-import android.util.DisplayMetrics;
-import android.webkit.WebView;
-
-import com.github.dfa.diaspora_android.App;
-import com.github.dfa.diaspora_android.BuildConfig;
-import com.github.dfa.diaspora_android.R;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Locale;
-
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
-public class Helpers {
-    protected Context context;
-
-    protected Helpers(Context context) {
-        this.context = context;
-    }
-
-    public static Helpers get() {
-        return new Helpers(App.get());
-    }
-
-    public String str(@StringRes int strResId) {
-        return context.getString(strResId);
-    }
-
-    public Drawable drawable(@DrawableRes int resId) {
-        return ContextCompat.getDrawable(context, resId);
-    }
-
-    public int color(@ColorRes int resId) {
-        return ContextCompat.getColor(context, resId);
-    }
-
-    public Context context() {
-        return context;
-    }
-
-    public String colorToHexString(int intColor) {
-        return String.format("#%06X", 0xFFFFFF & intColor);
-    }
-
-    public String getAppVersionName() {
-        try {
-            PackageManager manager = context.getPackageManager();
-            PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
-            return info.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return "unknown";
-        }
-    }
-
-
-    public void openWebpageInExternalBrowser(String url) {
-        Uri uri = Uri.parse(url);
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    public void showDonateBitcoinRequest() {
-        if (!BuildConfig.IS_GPLAY_BUILD) {
-            String btcUri = String.format("bitcoin:%s?amount=%s&label=%s&message=%s",
-                    str(R.string.donate__bitcoin_id), str(R.string.donate__bitcoin_amount),
-                    str(R.string.donate__bitcoin_message), str(R.string.donate__bitcoin_message));
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(btcUri));
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            try {
-                context.startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                openWebpageInExternalBrowser(str(R.string.donate__bitcoin_url));
-            }
-        }
-    }
-
-    public String readTextfileFromRawRes(@RawRes int rawResId, String linePrefix, String linePostfix) {
-        StringBuilder sb = new StringBuilder();
-        BufferedReader br = null;
-        String line;
-
-        linePrefix = linePrefix == null ? "" : linePrefix;
-        linePostfix = linePostfix == null ? "" : linePostfix;
-
-        try {
-            br = new BufferedReader(new InputStreamReader(context.getResources().openRawResource(rawResId)));
-            while ((line = br.readLine()) != null) {
-                sb.append(linePrefix);
-                sb.append(line);
-                sb.append(linePostfix);
-                sb.append("\n");
-            }
-        } catch (Exception ignored) {
-        } finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (IOException ignored) {
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    public void showDialogWithRawFileInWebView(String fileInRaw, @StringRes int resTitleId) {
-        WebView wv = new WebView(context);
-        wv.loadUrl("file:///android_res/raw/" + fileInRaw);
-        AlertDialog.Builder dialog = new AlertDialog.Builder(context)
-                .setPositiveButton(android.R.string.ok, null)
-                .setTitle(resTitleId)
-                .setView(wv);
-        dialog.show();
-    }
-
-    @SuppressLint("RestrictedApi")
-    public void setTintColorOfButton(AppCompatButton button, @ColorRes int resColor) {
-        button.setSupportBackgroundTintList(ColorStateList.valueOf(
-                color(resColor)
-        ));
-    }
-
-    public boolean isConnectedToInternet() {
-        ConnectivityManager connectivityManager = (ConnectivityManager)
-                context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo activeNetInfo = connectivityManager.getActiveNetworkInfo();
-        return activeNetInfo != null && activeNetInfo.isConnectedOrConnecting();
-    }
-
-    public void restartApp(Class classToStartupWith) {
-        Intent restartIntent = new Intent(context, classToStartupWith);
-        PendingIntent restartIntentP = PendingIntent.getActivity(context, 555,
-                restartIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-        AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, restartIntentP);
-        System.exit(0);
-    }
-
-    public String loadMarkdownForTextViewFromRaw(@RawRes int rawMdFile, String prepend) {
-        try {
-            return new SimpleMarkdownParser()
-                    .parse(context.getResources().openRawResource(rawMdFile),
-                            SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, prepend)
-                    .replaceColor("#000001", color(R.color.accent))
-                    .removeMultiNewlines().replaceBulletCharacter("*").getHtml();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    public double getEstimatedScreenSizeInches() {
-        DisplayMetrics dm = context.getResources().getDisplayMetrics();
-
-        double density = dm.density * 160;
-        double x = Math.pow(dm.widthPixels / density, 2);
-        double y = Math.pow(dm.heightPixels / density, 2);
-        double screenInches = Math.sqrt(x + y) * 1.16;  // 1.16 = est. Nav/Statusbar
-        screenInches = screenInches < 4.0 ? 4.0 : screenInches;
-        screenInches = screenInches > 12.0 ? 12.0 : screenInches;
-        return screenInches;
-    }
-
-    public boolean isInPortraitMode() {
-        return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
-    }
-
-    public Locale getLocaleByAndroidCode(String code) {
-        if (!TextUtils.isEmpty(code)) {
-            return code.contains("-r")
-                    ? new Locale(code.substring(0, 2), code.substring(4, 6)) // de-rAt
-                    : new Locale(code); // de
-        }
-        return Locale.getDefault();
-    }
-
-    //  "en"/"de"/"de-rAt"; Empty string = default locale
-    public void setAppLanguage(String androidLocaleString) {
-        Locale locale = getLocaleByAndroidCode(androidLocaleString);
-        Configuration config = context.getResources().getConfiguration();
-        config.locale = locale != null ? locale : Locale.getDefault();
-        context.getResources().updateConfiguration(config, null);
-    }
-}
--- a/app/src/main/java/io/github/gsantner/opoc/util/HelpersA.java
+++ b/app/src/main/java/io/github/gsantner/opoc/util/HelpersA.java
@ -1,112 +0,0 @@
-/*
- * ---------------------------------------------------------------------------- *
- * Gregor Santner <gsantner.github.io> wrote this file. You can do whatever
- * you want with this stuff. If we meet some day, and you think this stuff is
- * worth it, you can buy me a coke in return. Provided as is without any kind
- * of warranty. No attribution required.                  - Gregor Santner
- *
- * License: Creative Commons Zero (CC0 1.0)
- *  http://creativecommons.org/publicdomain/zero/1.0/
- * ----------------------------------------------------------------------------
- */
-package io.github.gsantner.opoc.util;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatTextView;
-import android.text.Html;
-import android.text.SpannableString;
-import android.text.method.ScrollingMovementMethod;
-import android.util.TypedValue;
-import android.view.inputmethod.InputMethodManager;
-
-import com.github.dfa.diaspora_android.R;
-
-
-@SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
-public class HelpersA extends Helpers {
-    protected Activity activity;
-
-    protected HelpersA(Activity activity) {
-        super(activity);
-        this.activity = activity;
-    }
-
-    public static HelpersA get(Activity activity) {
-        return new HelpersA(activity);
-    }
-
-
-    //########################
-    //##     Methods
-    //########################
-
-    /**
-     * Animate to specified Activity
-     *
-     * @param to                 The class of the activity
-     * @param finishFromActivity true: Finish the current activity
-     * @param requestCode        Request code for stating the activity, not waiting for result if null
-     */
-    public void animateToActivity(Class to, Boolean finishFromActivity, Integer requestCode) {
-        animateToActivity(new Intent(activity, to), finishFromActivity, requestCode);
-    }
-
-    /**
-     * Animate to activity specified in intent
-     *
-     * @param intent             Intent to open start an activity
-     * @param finishFromActivity true: Finish the current activity
-     * @param requestCode        Request code for stating the activity, not waiting for result if null
-     */
-    public void animateToActivity(Intent intent, Boolean finishFromActivity, Integer requestCode) {
-        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        if (requestCode != null) {
-            activity.startActivityForResult(intent, requestCode);
-        } else {
-            activity.startActivity(intent);
-
-        }
-        activity.overridePendingTransition(R.anim.fadein, R.anim.fadeout);
-        if (finishFromActivity != null && finishFromActivity) {
-            activity.finish();
-        }
-    }
-
-
-    public void showSnackBar(@StringRes int stringId, boolean showLong) {
-        Snackbar.make(activity.findViewById(android.R.id.content), stringId,
-                showLong ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
-    }
-
-    public void hideSoftKeyboard() {
-        InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        if (activity.getCurrentFocus() != null && activity.getCurrentFocus().getWindowToken() != null) {
-            inputMethodManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 0);
-        }
-    }
-
-    public void showDialogWithHtmlTextView(@StringRes int resTitleId, String html) {
-        showDialogWithHtmlTextView(resTitleId, html, null);
-    }
-
-    public void showDialogWithHtmlTextView(@StringRes int resTitleId, String html, DialogInterface.OnDismissListener dismissedListener) {
-        AppCompatTextView textView = new AppCompatTextView(context);
-        int padding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16,
-                context.getResources().getDisplayMetrics());
-        textView.setMovementMethod(new ScrollingMovementMethod());
-        textView.setPadding(padding, 0, padding, 0);
-
-        textView.setText(new SpannableString(Html.fromHtml(html)));
-        AlertDialog.Builder dialog = new AlertDialog.Builder(context)
-                .setPositiveButton(android.R.string.ok, null)
-                .setOnDismissListener(dismissedListener)
-                .setTitle(resTitleId)
-                .setView(textView);
-        dialog.show();
-    }
-}
--- a/app/src/main/java/io/github/gsantner/opoc/util/SimpleMarkdownParser.java
+++ b/app/src/main/java/io/github/gsantner/opoc/util/SimpleMarkdownParser.java
@ -1,160 +0,0 @@
-/*
- * ---------------------------------------------------------------------------- *
- * Gregor Santner <gsantner.github.io> wrote this file. You can do whatever
- * you want with this stuff. If we meet some day, and you think this stuff is
- * worth it, you can buy me a coke in return. Provided as is without any kind
- * of warranty. No attribution required.                  - Gregor Santner
- *
- * License: Creative Commons Zero (CC0 1.0)
- *  http://creativecommons.org/publicdomain/zero/1.0/
- * ----------------------------------------------------------------------------
- */
- 
- /*
- * Get updates:
- *  https://github.com/gsantner/onePieceOfCode/blob/master/java/SimpleMarkdownParser.java
- * Apply to TextView:
- *   See https://github.com/gsantner/onePieceOfCode/blob/master/android/Helpers.get().java
- * Parses most common markdown tags. Only inline tags are supported, multiline/block syntax
- * is not supported (citation, multiline code, ..). This is intended to stay as easy as possible.
- *
- * You can e.g. apply a accent color by replacing #000001 with your accentColor string.
- *
- * FILTER_ANDROID_TEXTVIEW output is intended to be used at simple Android TextViews,
- * were a limited set of html tags is supported. This allow to still display e.g. a simple
- * CHANGELOG.md file without inlcuding a WebView for showing HTML, or other additional UI-libraries.
- *
- * FILTER_HTMLPART is intended to be used at engines understanding most common HTML tags.
- */
-
-package io.github.gsantner.opoc.util;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Simple Markdown Parser
- */
-@SuppressWarnings({"WeakerAccess", "CaughtExceptionImmediatelyRethrown"})
-public class SimpleMarkdownParser {
-    public interface SimpleLineFilter {
-        String filterLine(String line);
-    }
-
-    public static final SimpleLineFilter FILTER_ANDROID_TEXTVIEW = new SimpleLineFilter() {
-        @Override
-        public String filterLine(String line) {
-            // TextView supports a limited set of html tags, most notably
-            // a href, b, big, font size&color, i, li, small, u
-            line = line
-                    .replace("~°", "&nbsp;&nbsp;") // double space/half tab
-                    .replaceAll("^### ([^<]*)", "<br/><big><b><font color='#000000'>$1</font></b></big>  ") // h3
-                    .replaceAll("^## ([^<]*)", "<br/><big><big><b><font color='#000000'>$1</font></b></big></big><br/>  ") // h2 (DEP: h3)
-                    .replaceAll("^# ([^<]*)", "<br/><big><big><big><b><font color='#000000'>$1</font></b></big></big></big><br/>  ") // h1 (DEP: h2,h3)
-                    .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // img
-                    .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
-                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
-                    .replaceAll("^(-|\\*) ([^<]*)", "<font color='#000001'>&#8226;</font> $2  ") // unordered list + end line
-                    .replaceAll("^  (-|\\*) ([^<]*)", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $2  ") // unordered list2 + end line
-                    .replaceAll("`([^<]*)`", "<font face='monospace'>$1</font>") // code
-                    .replace("\\*", "●") // temporary replace escaped star symbol
-                    .replaceAll("\\*\\*([^<]*)\\*\\*", "<b>$1</b>") // bold (DEP: temp star)
-                    .replaceAll("\\*([^<]*)\\*", "<i>$1</i>") // italic (DEP: temp star code)
-                    .replace("●", "*") // restore escaped star symbol (DEP: b,i)
-                    .replaceAll("  $", "<br/>") // new line (DEP: ul)
-            ;
-            return line.isEmpty() ? line + "<br/>" : line;
-        }
-    };
-
-    public static final SimpleLineFilter FILTER_HTMLPART = new SimpleLineFilter() {
-        @Override
-        public String filterLine(String line) {
-            line = line
-                    .replaceAll("~°", "&nbsp;&nbsp;") // double space/half tab
-                    .replaceAll("^### ([^<]*)", "<h3>$1</h3>") // h3
-                    .replaceAll("^## ([^<]*)", "<h2>$1</h2>") /// h2 (DEP: h3)
-                    .replaceAll("^# ([^<]*)", "<h1>$1</h1>") // h1 (DEP: h2,h3)
-                    .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<img src=\\'$2\\' alt='$1' />") // img
-                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
-                    .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
-                    .replaceAll("^(-|\\*) ([^<]*)", "<font color='#000001'>&#8226;</font> $2  ") // unordered list + end line
-                    .replaceAll("^  (-|\\*) ([^<]*)", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $2  ") // unordered list2 + end line
-                    .replaceAll("`([^<]*)`", "<code>$1</code>") // code
-                    .replace("\\*", "●") // temporary replace escaped star symbol
-                    .replaceAll("\\*\\*([^<]*)\\*\\*", "<b>$1</b>") // bold (DEP: temp star)
-                    .replaceAll("\\*([^<]*)\\*", "<b>$1</b>") // italic (DEP: temp star)
-                    .replace("●", "*") // restore escaped star symbol (DEP: b,i)
-                    .replaceAll("  $", "<br/>") // new line (DEP: ul)
-            ;
-            return line.isEmpty() ? line + "<br/>" : line;
-        }
-    };
-
-    //########################
-    //##     Members
-    //########################
-    private String html;
-
-    public SimpleMarkdownParser parse(String filepath, SimpleLineFilter simpleLineFilter) throws IOException {
-        return parse(new FileInputStream(filepath), simpleLineFilter, "");
-    }
-
-    public SimpleMarkdownParser parse(InputStream inputStream, SimpleLineFilter simpleLineFilter, String lineMdPrefix) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        BufferedReader br = null;
-        String line;
-
-        try {
-            br = new BufferedReader(new InputStreamReader(inputStream));
-            while ((line = br.readLine()) != null) {
-                sb.append(simpleLineFilter.filterLine(lineMdPrefix + line));
-                sb.append("\n");
-            }
-        } catch (IOException rethrow) {
-            html = "";
-            throw rethrow;
-        } finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (IOException ignored) {
-                }
-            }
-        }
-        html = sb.toString().trim();
-        return this;
-    }
-
-    public String getHtml() {
-        return html;
-    }
-
-    public SimpleMarkdownParser setHtml(String html) {
-        this.html = html;
-        return this;
-    }
-
-    public SimpleMarkdownParser removeMultiNewlines() {
-        html = html.replace("\n", "").replaceAll("(<br/>){3,}", "<br/><br/>");
-        return this;
-    }
-
-    public SimpleMarkdownParser replaceBulletCharacter(String replacment) {
-        html = html.replace("&#8226;", replacment);
-        return this;
-    }
-
-    public SimpleMarkdownParser replaceColor(String hexColor, int newIntColor) {
-        html = html.replace(hexColor, String.format("#%06X", 0xFFFFFF & newIntColor));
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return html != null ? html : "";
-    }
-}
--- a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
+++ b/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
@ -0,0 +1,160 @@
+/*#######################################################
+ *
+ *   Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ *
+ *   License: Apache 2.0
+ *  https://github.com/gsantner/opoc/#licensing
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+#########################################################*/
+package net.gsantner.opoc.activity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.gsantner.opoc.android.dummy.MenuItemDummy;
+import net.gsantner.opoc.util.ContextUtils;
+
+import butterknife.ButterKnife;
+
+/**
+ * A common base fragment to extend from
+ */
+public abstract class GsFragmentBase extends Fragment {
+    private boolean _fragmentFirstTimeVisible = true;
+    private final Object _fragmentFirstTimeVisibleSync = new Object();
+
+    protected ContextUtils _cu;
+    protected Bundle _savedInstanceState = null;
+    protected Menu _fragmentMenu = new MenuItemDummy.Menu();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    /**
+     * Inflate the fragments layout. Don't override this method, just supply the needed
+     * {@link LayoutRes} via abstract method {@link #getLayoutResId()}, super does the rest
+     */
+    @Deprecated
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        _cu = new ContextUtils(inflater.getContext());
+        _cu.setAppLanguage(getAppLanguage());
+        _savedInstanceState = savedInstanceState;
+        if (getLayoutResId() == 0) {
+            Log.e(getClass().getCanonicalName(), "Error: GsFragmentbase.onCreateview: Returned 0 for getLayoutResId");
+        }
+        View view = inflater.inflate(getLayoutResId(), container, false);
+        ButterKnife.bind(this, view);
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.postDelayed(() -> {
+            synchronized (_fragmentFirstTimeVisibleSync) {
+                if (getUserVisibleHint() && isVisible() && _fragmentFirstTimeVisible) {
+                    _fragmentFirstTimeVisible = false;
+                    onFragmentFirstTimeVisible();
+                }
+            }
+        }, 1);
+    }
+
+    /**
+     * Get a tag from the fragment, allows faster distinction
+     *
+     * @return This fragments tag
+     */
+    public abstract String getFragmentTag();
+
+
+    /**
+     * Get the layout to be inflated in the fragment
+     *
+     * @return Layout resource id
+     */
+    @LayoutRes
+    protected abstract int getLayoutResId();
+
+    /**
+     * Event to be called when the back button was pressed
+     * True should be returned when this was handled by the fragment
+     * and  no further handling in the view hierarchy is needed
+     *
+     * @return True if back handled by fragment
+     */
+    public boolean onBackPressed() {
+        return false;
+    }
+
+    /**
+     * Set the language to be used in this fragment
+     * Defaults to resolve the language from sharedpreferences: pref_key__language
+     *
+     * @return Empty string for system language, or an android locale code
+     */
+    public String getAppLanguage() {
+        if (getContext() != null) {
+            return getContext().getSharedPreferences("app", Context.MODE_PRIVATE)
+                    .getString("pref_key__language", "");
+        }
+        return "";
+    }
+
+    /**
+     * This will be called when this fragment gets the first time visible
+     */
+    public void onFragmentFirstTimeVisible() {
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        synchronized (_fragmentFirstTimeVisibleSync) {
+            if (isVisibleToUser && _fragmentFirstTimeVisible) {
+                _fragmentFirstTimeVisible = false;
+                onFragmentFirstTimeVisible();
+            }
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        _fragmentMenu = menu;
+    }
+
+    public Menu getFragmentMenu() {
+        return _fragmentMenu;
+    }
+
+    /**
+     * Get the toolbar from activity
+     * Requires id to be set to @+id/toolbar
+     */
+    @SuppressWarnings("ConstantConditions")
+    protected Toolbar getToolbar() {
+        try {
+            return (Toolbar) getActivity().findViewById(new ContextUtils(getActivity()).getResId(ContextUtils.ResType.ID, "toolbar"));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
--- a/app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java
+++ b/app/src/main/java/net/gsantner/opoc/android/dummy/MenuItemDummy.java
@ -0,0 +1,351 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+public class MenuItemDummy implements MenuItem {
+    private final int _itemId;
+
+    public MenuItemDummy(final int itemId) {
+        _itemId = itemId;
+    }
+
+    @Override
+    public int getItemId() {
+        return _itemId;
+    }
+
+    @Override
+    public int getGroupId() {
+        return 0;
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setTitle(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitle(int title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setTitleCondensed(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitleCondensed() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(Drawable icon) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIcon(int iconRes) {
+        return null;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setIntent(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public Intent getIntent() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setShortcut(char numericChar, char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setNumericShortcut(char numericChar) {
+        return null;
+    }
+
+    @Override
+    public char getNumericShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setAlphabeticShortcut(char alphaChar) {
+        return null;
+    }
+
+    @Override
+    public char getAlphabeticShortcut() {
+        return 0;
+    }
+
+    @Override
+    public MenuItem setCheckable(boolean checkable) {
+        return null;
+    }
+
+    @Override
+    public boolean isCheckable() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setChecked(boolean checked) {
+        return null;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setVisible(boolean visible) {
+        return null;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean hasSubMenu() {
+        return false;
+    }
+
+    @Override
+    public SubMenu getSubMenu() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener menuItemClickListener) {
+        return null;
+    }
+
+    @Override
+    public ContextMenu.ContextMenuInfo getMenuInfo() {
+        return null;
+    }
+
+    @Override
+    public void setShowAsAction(int actionEnum) {
+    }
+
+    @Override
+    public MenuItem setShowAsActionFlags(int actionEnum) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(View view) {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionView(int resId) {
+        return null;
+    }
+
+    @Override
+    public View getActionView() {
+        return null;
+    }
+
+    @Override
+    public MenuItem setActionProvider(ActionProvider actionProvider) {
+        return null;
+    }
+
+    @Override
+    public ActionProvider getActionProvider() {
+        return null;
+    }
+
+    @Override
+    public boolean expandActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean collapseActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean isActionViewExpanded() {
+        return false;
+    }
+
+    @Override
+    public MenuItem setOnActionExpandListener(OnActionExpandListener listener) {
+        return null;
+    }
+
+
+    public static class Menu implements android.view.Menu {
+        @Override
+        public MenuItem add(CharSequence title) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
+            return new MenuItemDummy(itemId);
+        }
+
+        @Override
+        public MenuItem add(int groupId, int itemId, int order, int titleRes) {
+            return add(0, 0, 0, "");
+        }
+
+        @Override
+        public SubMenu addSubMenu(CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int titleRes) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
+            return null;
+        }
+
+        @Override
+        public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
+            return null;
+        }
+
+        @Override
+        public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
+            return 0;
+        }
+
+        @Override
+        public void removeItem(int id) {
+        }
+
+        @Override
+        public void removeGroup(int groupId) {
+        }
+
+        @Override
+        public void clear() {
+        }
+
+        @Override
+        public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
+        }
+
+        @Override
+        public void setGroupVisible(int group, boolean visible) {
+        }
+
+        @Override
+        public void setGroupEnabled(int group, boolean enabled) {
+        }
+
+        @Override
+        public boolean hasVisibleItems() {
+            return false;
+        }
+
+        @Override
+        public MenuItem findItem(int id) {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+        @Override
+        public MenuItem getItem(int index) {
+            return null;
+        }
+
+        @Override
+        public void close() {
+        }
+
+        @Override
+        public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
+            return false;
+        }
+
+        @Override
+        public boolean isShortcutKey(int keyCode, KeyEvent event) {
+            return false;
+        }
+
+        @Override
+        public boolean performIdentifierAction(int id, int flags) {
+            return false;
+        }
+
+        @Override
+        public void setQwertyMode(boolean isQwerty) {
+        }
+    }
+}
--- a/app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java
+++ b/app/src/main/java/net/gsantner/opoc/android/dummy/TextWatcherDummy.java
@ -0,0 +1,58 @@
+/*
+ * Maintained 2017-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ * License: Creative Commons Zero (CC0 1.0) / Public Domain
+ *  http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * You can do whatever you want with this. If we meet some day, and you think it is worth it,
+ * you can buy me a drink in return. Provided as is without any kind of warranty. Do not blame
+ * or ask for support if something goes wrong.  - Gregor Santner
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package net.gsantner.opoc.android.dummy;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+import net.gsantner.opoc.util.Callback;
+
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
+public class TextWatcherDummy implements TextWatcher {
+    @Override
+    public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
+    }
+
+    @Override
+    public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+    }
+
+    @Override
+    public void afterTextChanged(final Editable s) {
+    }
+
+    public static TextWatcher before(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                impl.callback(s, start, count, after);
+            }
+        };
+    }
+
+    public static TextWatcher on(final Callback.a4<CharSequence, Integer, Integer, Integer> impl) {
+        return new TextWatcherDummy() {
+            public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+                impl.callback(s, start, before, count);
+            }
+        };
+    }
+
+    public static TextWatcher after(final Callback.a1<Editable> impl) {
+        return new TextWatcherDummy() {
+            public void afterTextChanged(final Editable s) {
+                impl.callback(s);
+            }
+        };
+    }
+}
--- a/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java
+++ b/app/src/main/java/net/gsantner/opoc/format/markdown/SimpleMarkdownParser.java
@ -0,0 +1,248 @@
+/*#######################################################
+ *
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ *
+ *   License: Apache 2.0
+ *  https://github.com/gsantner/opoc/#licensing
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+#########################################################*/
+
+/*
+ * Parses most common markdown tags. Only inline tags are supported, multiline/block syntax
+ * is not supported (citation, multiline code, ..). This is intended to stay as easy as possible.
+ *
+ * You can e.g. apply a accent color by replacing #000001 with your accentColor string.
+ *
+ * FILTER_ANDROID_TEXTVIEW output is intended to be used at simple Android TextViews,
+ * were a limited set of _html tags is supported. This allow to still display e.g. a simple
+ * CHANGELOG.md file without including a WebView for showing HTML, or other additional UI-libraries.
+ *
+ * FILTER_WEB is intended to be used at engines understanding most common HTML tags.
+ */
+
+package net.gsantner.opoc.format.markdown;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+/**
+ * Simple Markdown Parser
+ */
+@SuppressWarnings({"WeakerAccess", "CaughtExceptionImmediatelyRethrown", "SameParameterValue", "unused", "SpellCheckingInspection", "RepeatedSpace", "SingleCharAlternation", "Convert2Lambda"})
+public class SimpleMarkdownParser {
+    //########################
+    //## Statics
+    //########################
+    public interface SmpFilter {
+        String filter(String text);
+    }
+
+    public final static SmpFilter FILTER_ANDROID_TEXTVIEW = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            // TextView supports a limited set of html tags, most notably
+            // a href, b, big, font size&color, i, li, small, u
+
+            // Don't start new line if 2 empty lines and heading
+            while (text.contains("\n\n#")) {
+                text = text.replace("\n\n#", "\n#");
+            }
+
+            return text
+                    .replaceAll("(?s)<!--.*?-->", "")  // HTML comments
+                    .replace("\n\n", "\n<br/>\n") // Start new line if 2 empty lines
+                    .replace("~°", "&nbsp;&nbsp;") // double space/half tab
+                    .replaceAll("(?m)^### (.*)$", "<br/><big><b><font color='#000000'>$1</font></b></big><br/>") // h3
+                    .replaceAll("(?m)^## (.*)$", "<br/><big><big><b><font color='#000000'>$1</font></b></big></big><br/><br/>") // h2 (DEP: h3)
+                    .replaceAll("(?m)^# (.*)$", "<br/><big><big><big><b><font color='#000000'>$1</font></b></big></big></big><br/><br/>") // h1 (DEP: h2,h3)
+                    .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // img
+                    .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
+                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
+                    .replaceAll("(?m)^([-*] )(.*)$", "<font color='#000001'>&#8226;</font> $2<br/>") // unordered list + end line
+                    .replaceAll("(?m)^  (-|\\*) ([^<]*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $2<br/>") // unordered list2 + end line
+                    .replaceAll("`([^<]*)`", "<font face='monospace'>$1</font>") // code
+                    .replace("\\*", "●") // temporary replace escaped star symbol
+                    .replaceAll("(?m)\\*\\*(.*)\\*\\*", "<b>$1</b>") // bold (DEP: temp star)
+                    .replaceAll("(?m)\\*(.*)\\*", "<i>$1</i>") // italic (DEP: temp star code)
+                    .replace("●", "*") // restore escaped star symbol (DEP: b,i)
+                    .replaceAll("(?m)  $", "<br/>") // new line (DEP: ul)
+                    ;
+        }
+    };
+
+    public final static SmpFilter FILTER_WEB = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            // Don't start new line if 2 empty lines and heading
+            while (text.contains("\n\n#")) {
+                text = text.replace("\n\n#", "\n#");
+            }
+
+            text = text
+                    .replaceAll("(?s)<!--.*?-->", "")  // HTML comments
+                    .replace("\n\n", "\n<br/>\n") // Start new line if 2 empty lines
+                    .replaceAll("~°", "&nbsp;&nbsp;") // double space/half tab
+                    .replaceAll("(?m)^### (.*)$", "<h3>$1</h3>") // h3
+                    .replaceAll("(?m)^## (.*)$", "<h2>$1</h2>") /// h2 (DEP: h3)
+                    .replaceAll("(?m)^# (.*)$", "<h1>$1</h1>") // h1 (DEP: h2,h3)
+                    .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<img src=\\'$2\\' alt='$1' />") // img
+                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
+                    .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
+                    .replaceAll("(?m)^[-*] (.*)$", "<font color='#000001'>&#8226;</font> $1  ") // unordered list + end line
+                    .replaceAll("(?m)^  [-*] (.*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $1  ") // unordered list2 + end line
+                    .replaceAll("`([^<]*)`", "<code>$1</code>") // code
+                    .replace("\\*", "●") // temporary replace escaped star symbol
+                    .replaceAll("(?m)\\*\\*(.*)\\*\\*", "<b>$1</b>") // bold (DEP: temp star)
+                    .replaceAll("(?m)\\*(.*)\\*", "<i>$1</i>") // italic (DEP: temp star code)
+                    .replace("●", "*") // restore escaped star symbol (DEP: b,i)
+                    .replaceAll("(?m)  $", "<br/>") // new line (DEP: ul)
+            ;
+            return text;
+        }
+    };
+
+    public final static SmpFilter FILTER_CHANGELOG = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            text = text
+                    .replace("New:", "<font color='#276230'>New:</font>")
+                    .replace("New features:", "<font color='#276230'>New:</font>")
+                    .replace("Added:", "<font color='#276230'>Added:</font>")
+                    .replace("Add:", "<font color='#276230'>Add:</font>")
+                    .replace("Fixed:", "<font color='#005688'>Fixed:</font>")
+                    .replace("Fix:", "<font color='#005688'>Fix:</font>")
+                    .replace("Removed:", "<font color='#C13524'>Removed:</font>")
+                    .replace("Updated:", "<font color='#555555'>Updated:</font>")
+                    .replace("Improved:", "<font color='#555555'>Improved:</font>")
+                    .replace("Modified:", "<font color='#555555'>Modified:</font>")
+                    .replace("Mod:", "<font color='#555555'>Mod:</font>")
+            ;
+            return text;
+        }
+    };
+    public final static SmpFilter FILTER_H_TO_SUP = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            text = text
+                    .replace("<h1>", "<sup><sup><sup>")
+                    .replace("</h1>", "</sup></sup></sup>")
+                    .replace("<h2>", "<sup><sup>")
+                    .replace("</h2>", "</sup></sup>")
+                    .replace("<h3>", "<sup>")
+                    .replace("</h3>", "</sup>")
+            ;
+            return text;
+        }
+    };
+    public final static SmpFilter FILTER_NONE = new SmpFilter() {
+        @Override
+        public String filter(String text) {
+            return text;
+        }
+    };
+
+    //########################
+    //## Singleton
+    //########################
+    private static SimpleMarkdownParser __instance;
+
+    public static SimpleMarkdownParser get() {
+        if (__instance == null) {
+            __instance = new SimpleMarkdownParser();
+        }
+        return __instance;
+    }
+
+    //########################
+    //## Members, Constructors
+    //########################
+    private SmpFilter _defaultSmpFilter;
+    private String _html;
+
+    public SimpleMarkdownParser() {
+        setDefaultSmpFilter(FILTER_WEB);
+    }
+
+    //########################
+    //## Methods
+    //########################
+    public SimpleMarkdownParser setDefaultSmpFilter(SmpFilter defaultSmpFilter) {
+        _defaultSmpFilter = defaultSmpFilter;
+        return this;
+    }
+
+    public SimpleMarkdownParser parse(String filepath, SmpFilter... smpFilters) throws IOException {
+        return parse(new FileInputStream(filepath), "", smpFilters);
+    }
+
+    public SimpleMarkdownParser parse(InputStream inputStream, String lineMdPrefix, SmpFilter... smpFilters) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        BufferedReader br = null;
+        String line;
+
+        try {
+            br = new BufferedReader(new InputStreamReader(inputStream));
+            while ((line = br.readLine()) != null) {
+                sb.append(lineMdPrefix);
+                sb.append(line);
+                sb.append("\n");
+            }
+        } catch (IOException rethrow) {
+            _html = "";
+            throw rethrow;
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException ignored) {
+                }
+            }
+        }
+        _html = parse(sb.toString(), "", smpFilters).getHtml();
+        return this;
+    }
+
+    public SimpleMarkdownParser parse(String markdown, String lineMdPrefix, SmpFilter... smpFilters) throws IOException {
+        _html = markdown;
+        if (smpFilters.length == 0) {
+            smpFilters = new SmpFilter[]{_defaultSmpFilter};
+        }
+        for (SmpFilter smpFilter : smpFilters) {
+            _html = smpFilter.filter(_html).trim();
+        }
+        return this;
+    }
+
+    public String getHtml() {
+        return _html;
+    }
+
+    public SimpleMarkdownParser setHtml(String html) {
+        _html = html;
+        return this;
+    }
+
+    public SimpleMarkdownParser removeMultiNewlines() {
+        _html = _html.replace("\n", "").replaceAll("(<br/>){3,}", "<br/><br/>");
+        return this;
+    }
+
+    public SimpleMarkdownParser replaceBulletCharacter(String replacment) {
+        _html = _html.replace("&#8226;", replacment);
+        return this;
+    }
+
+    public SimpleMarkdownParser replaceColor(String hexColor, int newIntColor) {
+        _html = _html.replace(hexColor, String.format("#%06X", 0xFFFFFF & newIntColor));
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return _html != null ? _html : "";
+    }
+}
--- a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
@ -0,0 +1,47 @@
+/*#######################################################
+ *
+ *   Maintained 2018-2023 by Gregor Santner <gsantner AT mailbox DOT org>
+ *
+ *   License: Apache 2.0
+ *  https://github.com/gsantner/opoc/#licensing
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+#########################################################*/
+package net.gsantner.opoc.preference;
+
+import java.util.List;
+
+@SuppressWarnings({"UnusedReturnValue", "SpellCheckingInspection", "unused", "SameParameterValue"})
+public interface PropertyBackend<TKEY, TTHIS> {
+    String getString(TKEY key, String defaultValue);
+
+    int getInt(TKEY key, int defaultValue);
+
+    long getLong(TKEY key, long defaultValue);
+
+    boolean getBool(TKEY key, boolean defaultValue);
+
+    float getFloat(TKEY key, float defaultValue);
+
+    double getDouble(TKEY key, double defaultValue);
+
+    List<Integer> getIntList(TKEY key);
+
+    List<String> getStringList(TKEY key);
+
+    TTHIS setString(TKEY key, String value);
+
+    TTHIS setInt(TKEY key, int value);
+
+    TTHIS setLong(TKEY key, long value);
+
+    TTHIS setBool(TKEY key, boolean value);
+
+    TTHIS setFloat(TKEY key, float value);
+
+    TTHIS setDouble(TKEY key, double value);
+
+    TTHIS setIntList(TKEY key, List<Integer> value);
+
+    TTHIS setStringList(TKEY key, List<String> value);
+}
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Gregor Santner	774c5bec59	Merge dandelion news and FAQ content all into markdown files in the dandelion repository	2023-02-11 03:07:41 +01:00
Gregor Santner	c65aab3840	Update translations, project info	2023-01-28 17:21:07 +01:00
Gregor Santner	c2bea7bec0	Crowdin add Estonian, Update translations (PR #297 )	2022-12-08 14:16:52 +01:00
Gregor Santner	36bd1af0b9	Translations: Add bulgarian	2022-07-13 01:51:31 +02:00
Gregor Santner	67b0bbbfd2	Update translations (PR #294 )	2022-05-28 19:03:18 +00:00
Gregor Santner	b80cc3ab04	Add croatian & thai language to translation system	2022-05-28 20:55:42 +02:00
Gregor Santner	37f586912f	Change link to domain podupti.me -> diaspora.fediverse.observer, closes #295 , by @gsantner	2021-10-09 20:17:11 +02:00
Gregor Santner	de378b8adc	Add language Odia/Oriya (India), Update translations (#293 )	2021-10-02 13:04:29 +02:00
Gregor Santner	8161353de7	New Crowdin updates (#292 )	2021-09-09 22:46:37 +02:00
Gregor Santner	c42b4995b3	Update crowdin config	2021-09-09 22:43:58 +02:00
Gregor Santner	5a5d1d66b3	Update CHANGELOG	2021-08-01 14:31:44 +02:00
Gregor Santner	ceb0002546	Update translations (PR #286 )	2021-08-01 14:12:24 +02:00
James Addison	0cf003ea38	Update README screenshot references (PR #291 )	2021-08-01 13:38:59 +02:00
Gregor Santner	904f2af20a	Update gs/opoc utilities	2021-08-01 13:30:21 +02:00
Gregor Santner	d923630b42	Update README badges, remove IRC	2021-05-19 20:48:50 +02:00
Gregor Santner	a76a463cd4	Add language Esperanto, by @gsantner	2021-03-13 14:25:09 +01:00
Gregor Santner	c9c10a6fd4	Add language Sinhala (Sri Lanka)	2021-02-28 22:09:03 +01:00
Gregor Santner	e5866ffb2b	Update opoc	2021-01-18 21:32:50 +01:00
Gregor Santner	97d9bf434e	Various additions & improvements to opoc utils	2021-01-12 20:23:10 +01:00
Gregor Santner	f1464b5f8f	ci add comment for cleanup as github has no delete-all button	2020-12-23 14:45:38 +01:00
Gregor Santner	369abf14a5	CI/CD: Remove special junit/lint jobs	2020-12-22 03:39:33 +01:00
Gregor Santner	ceb98c4258	gh actions pull_request action	2020-12-21 23:50:58 +01:00
Gregor Santner	4ebd393250	Update v1.3.5 (translations/libs only)	2020-12-09 12:08:05 +01:00
Gregor Santner	f3b3c6a160	disable AndroidSupportMeWrapper	2020-12-09 11:59:36 +01:00
Gregor Santner	ff62aa5a07	Add Makefile; CI: Remove Circle/Travis, add GitHub Actions	2020-12-09 01:07:24 +01:00
Gregor Santner	6fbd399a4b	Update gsantner/opoc libs/utils	2020-12-09 00:57:31 +01:00
Gregor Santner	fa7e37ccba	Remove Travis CI - Open Source love is gone	2020-12-08 08:41:38 +01:00
Gregor Santner	20d75acd39	New Crowdin updates (#276 )	2020-12-05 22:08:40 +01:00
Gregor Santner	7b1897b2e0	crowdin: Add macedonian	2020-11-13 21:56:27 +01:00
Gregor Santner	93aadae64b	[ci skip] Crowdin translation bot: New translations for Swedish (#272 )	2020-09-24 23:18:12 +02:00
Gregor Santner	a7dd4a6166	New Crowdin translations (#267 )	2020-05-29 21:27:09 +00:00
Gregor Santner	cf1f0100ba	Update crowdin bot commit message template	2020-05-29 23:22:35 +02:00
Gregor Santner	875f613cd9	Update supportme link to https	2020-04-20 02:01:40 +02:00
Gregor Santner	ea1ee6bc40	Update opoc	2020-03-29 19:53:32 +02:00
Gregor Santner	a66d7bf3b2	New Crowdin translations (#264 )	2020-03-29 19:33:19 +02:00
Gregor Santner	c5849d7d6a	Release v1.3.4	2020-02-09 13:12:59 +01:00
Gregor Santner	cc16b84011	Add seconds to 'save picture' date format, closes #262	2020-02-09 13:12:07 +01:00
Gregor Santner	0f6b1c3ec3	Update opoc	2020-02-09 12:49:26 +01:00
Gregor Santner	a686fea141	Bump junit from 4.12 to 4.13 (#261 ); New Crowdin translations (#260 , #263 )	2020-02-09 12:46:29 +01:00
Gregor Santner	f9951f3b16	Release v1.3.3	2019-12-23 21:21:10 +01:00
Gregor Santner	073a688db9	New Crowdin translations (#259 )	2019-12-23 20:18:54 +00:00
Gregor Santner	1f3cde9326	Add albanian / Tamil	2019-12-23 21:11:39 +01:00
Gregor Santner	8326c2196c	Update tools	2019-12-06 22:02:24 +01:00
Gregor Santner	7361d4bc3f	Update opoc Update shared helper utilities of my projects to latest state	2019-11-20 00:34:10 +01:00
Gregor Santner	1948c28cff	Crowdin: Update language mapping	2019-11-04 14:18:40 +01:00
Gregor Santner	d1be7f5215	Bump gradle from 3.5.0 to 3.5.1 (#254 )	2019-10-04 01:38:43 +02:00
Gregor Santner	8d019b6c3b	New Crowdin translations (#253 )	2019-09-22 13:55:33 +00:00
Gregor Santner	0708fcb02b	Update list of languages for crowdin	2019-09-22 13:35:33 +02:00
Gregor Santner	c5e3a42005	Update opoc	2019-09-07 21:54:08 +02:00
Gregor Santner	8c3c7da2ab	Release v1.3.2	2019-08-25 14:19:19 +02:00
Gregor Santner	3bc6afad03	Fix getDateOfDaysAgo	2019-08-25 14:07:07 +02:00
Gregor Santner	194fbf6927	Rename test flavor to atest (so it's default dev flavor when starting android studio)	2019-08-24 14:54:25 +02:00
dependabot-preview[bot]	6d45620181	Bump gradle from 3.4.2 to 3.5.0 (#250 )	2019-08-21 12:22:56 +00:00
Gregor Santner	c9d3693515	New Crowdin translations (#245 )	2019-07-26 01:28:14 +00:00
Gregor Santner	a618da97d8	Update opoc	2019-07-26 03:19:28 +02:00
imgbot[bot]	3ec8ab89c6	[ImgBot] Optimize images (#247 ) *Total -- 1,011.84kb -> 914.41kb (9.63%) /app/src/flavorTest/res/drawable-ldpi/ic_launcher.png -- 1.50kb -> 1.24kb (17.35%) /app/src/main/res/drawable-ldpi/ic_launcher.png -- 1.67kb -> 1.40kb (16.03%) /metadata/en-US/promoGraphic.png -- 3.58kb -> 3.04kb (15.17%) /app/src/flavorDandelior/ic_launcher-web.png -- 29.94kb -> 26.33kb (12.05%) /metadata/en-US/featureGraphic.png -- 861.38kb -> 773.90kb (10.16%) /app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher.png -- 9.28kb -> 8.74kb (5.83%) /app/src/flavorDandelior/res/drawable-xhdpi/ic_launcher_round.png -- 9.28kb -> 8.74kb (5.83%) /app/src/flavorDandelior/res/drawable-hdpi/ic_launcher_round.png -- 8.01kb -> 7.58kb (5.36%) /app/src/flavorDandelior/res/drawable-hdpi/ic_launcher.png -- 8.01kb -> 7.58kb (5.36%) /app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher_round.png -- 11.90kb -> 11.28kb (5.19%) /app/src/flavorDandelior/res/drawable-xxhdpi/ic_launcher.png -- 11.90kb -> 11.28kb (5.19%) /app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher_round.png -- 14.72kb -> 14.08kb (4.31%) /app/src/flavorDandelior/res/drawable-xxxhdpi/ic_launcher.png -- 14.72kb -> 14.08kb (4.31%) /app/src/flavorDandelior/res/drawable-mdpi/ic_launcher_round.png -- 6.80kb -> 6.58kb (3.33%) /app/src/flavorDandelior/res/drawable-mdpi/ic_launcher.png -- 6.80kb -> 6.58kb (3.33%) /app/src/flavorDandelior/res/drawable-ldpi/ic_launcher_round.png -- 6.17kb -> 5.99kb (2.96%) /app/src/flavorDandelior/res/drawable-ldpi/ic_launcher.png -- 6.17kb -> 5.99kb (2.96%) Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>	2019-07-26 00:35:39 +00:00
Gregor Santner	938a54fc74	Release v1.3.1	2019-04-26 00:55:53 +02:00
Gregor Santner	0732fe1b91	New Crowdin translations (#243 )	2019-04-25 22:53:54 +00:00
Gregor Santner	a7054d3ff8	Update metadata	2019-04-21 15:57:49 +02:00
Paul Schaub	25020c1692	Merge pull request #240 from vanitasvitae/de_metadata German translation of metadata	2019-03-11 15:51:39 +01:00
Paul Schaub	b1fb5d646a	German translation of metadata	2019-03-11 14:10:35 +01:00
Gregor Santner	51c3f68f22	Release v1.3.0	2019-03-08 14:49:29 +01:00
Gregor Santner	a80f6ebb45	New Crowdin translations (#238 )	2019-03-08 14:45:02 +01:00
Gregor Santner	49c6a97ce7	Add AndroidSupportMeWrapper	2019-03-08 12:32:10 +01:00
Gregor Santner	4f44d1acd3	New Crowdin translations (#231 )	2019-02-07 09:38:41 +00:00
Gregor Santner	24571f6921	Auto reformat code	2019-02-07 10:31:18 +01:00
massimilianoLe	fb8eb60974	pullRefresh as option + Shortcut to settings @themesettings (#226 ) * pull to refresh page * Make youtube links open external * corrected a bit but still not able to check if app is installed * corrected triggersync * Added option For user to choose how to open youtube links * removed unecessary comment * update with dandelion * pull refresh option+shortcut to themes * Changes request applyed * added name in contributors list	2019-02-07 09:25:06 +00:00
Gregor Santner	b833311353	Release v1.2.5	2019-01-11 02:43:53 +01:00
Gregor Santner	6f310985d6	Update gradle tooling & gsantner-opoc	2019-01-11 02:38:30 +01:00
Gregor Santner	6d62c70359	New Crowdin translations (#224 )	2019-01-11 00:16:10 +00:00
Gregor Santner	d34cbe1ed1	Remove/move serbian	2019-01-11 01:11:05 +01:00
Gregor Santner	66cbf9a47d	update crowdin yaml	2019-01-11 00:56:13 +01:00
Gregor Santner	b1d5e980c2	New Crowdin translations (#221 )	2019-01-10 23:31:30 +00:00
massimilianoLe	f693418d64	Make youtube links open external, by @massimilianoLe (#220 )	2018-12-01 17:12:04 +01:00
Gregor Santner	04e89e516c	New Crowdin translations (#218 )	2018-11-23 10:31:00 +01:00
massimilianoLe	5854075080	pull to refresh page (#219 )	2018-11-23 10:28:37 +01:00
Gregor Santner	1f8babd708	Release v1.2.3	2018-11-12 01:33:36 +01:00
Gregor Santner	2618bdf5ad	New Crowdin translations (#214 )	2018-11-12 01:25:36 +01:00
Gregor Santner	19884c33c1	New Crowdin translations (#212 )	2018-10-09 20:57:57 +02:00
Gregor Santner	2289c04f0f	Update opoc and it's license headers	2018-10-01 21:12:17 +02:00
Gregor Santner	1129f1848a	New Crowdin translations (#210 )	2018-09-27 11:17:17 +02:00
Gregor Santner	c77fd1db01	add more language remappings for crowdin	2018-09-27 11:13:25 +02:00
Gregor Santner	b072111b8b	add more language remappings for crowdin	2018-09-27 10:58:04 +02:00
Gregor Santner	351b2d6447	Mark only strings.xml as translatable on crowdin	2018-09-27 10:49:31 +02:00
Gregor Santner	ddc2549c66	Update Crowdin configuration file	2018-09-25 17:55:04 +02:00
Gregor Santner	c1d34fc5db	Merge pull request #204 from muhaaliss/stringlate-tr-9470 Updated tr (Turkish) translation, by @muhaaliss	2018-09-16 09:32:10 +02:00
Muha Aliss	33db3656fa	Updated tr (Turkish) translation Commit made via Stringlate	2018-09-16 03:17:33 +03:00
Gregor Santner	e194d2159e	Add @vanitasvitae 's unfinished image-viewer patch (deleted all test/demo branches for cleanup	2018-09-05 17:00:04 +02:00
Gregor Santner	e66c72d255	release v1.2.2	2018-09-04 20:00:55 +02:00
Gregor Santner	4cd88400ee	Rework string ids to tell content	2018-09-04 19:16:51 +02:00
Gregor Santner	48a00b099e	.	2018-09-04 17:02:34 +02:00
Gregor Santner	e6b2fa606e	Merge pull request #201 from asereze/patch-1 Updated sc (Sardinian) translation xml file	2018-08-07 23:59:30 +02:00
asereze	0b66ef801f	Updated sc (Sardinian) translation xml file I hope it's ok now.	2018-08-07 23:43:07 +02:00
Gregor Santner	e1ea19f02a	Release v1.2.1	2018-08-06 23:36:04 +02:00
Gregor Santner	af9e3ad8a3	Update metadata	2018-07-30 21:40:30 +02:00
Gregor Santner	d76fe4b82b	Update metadata	2018-07-30 13:32:34 +02:00
Gregor Santner	dc07beafc3	Merge pull request #199 from xmgz/master galician (gl) strings.xml updated, by @xmgz (#199)	2018-07-29 11:55:29 +02:00
Xosé M	423970ce39	faltaban 3 cadeas	2018-07-29 10:30:51 +02:00
Xosé M	215f67308e	eliminar string preferences e about	2018-07-29 09:54:34 +02:00
Xosé M	376449486b	minor gl fixes	2018-07-29 09:50:16 +02:00
Gregor Santner	1e15374229	Release v1.2.0	2018-07-25 03:30:28 +02:00
Gregor Santner	dbbd3cef35	Use searchable dialog for tag and aspect/contact list * Remove seperate fragments for both cases * Make use of opoc/SearchOrCustomTextDialog * Basically also removes all fragment swaps * Only two fragments are stream and podselection * Pod logout restarts app * Thus long known Android Supportlib bug can't occur * Fixes #198	2018-07-25 01:59:25 +02:00
Gregor Santner	918adcf358	Add flavor dandelior*, move flavor specific to folder instead gradle generated	2018-07-22 14:03:29 +02:00
Gregor Santner	957573ea83	Update opoc	2018-05-21 14:57:41 +02:00
Gregor Santner	65ba10712f	Update paths	2018-05-13 12:08:27 +02:00
Gregor Santner	099eb9ca78	Update supportlib	2018-05-09 03:25:23 +02:00
Gregor Santner	ad3966dd85	Merge string resources to one file, propagte change to all translations	2018-05-09 03:23:12 +02:00
Gregor Santner	9a6798f9f4	Update french translation, by @arnaud-jacquemin, (closes #196 )	2018-05-09 03:00:33 +02:00
Gregor Santner	2cc74ea613	Release v1.1.3	2018-04-08 22:10:53 +02:00
Gregor Santner	cebf0f473b	Fix podselection custom button color	2018-04-08 22:08:21 +02:00
Gregor Santner	9da1a910b3	Add existingconnection to opoc:networkutils:performCall	2018-04-08 20:12:51 +02:00
Gregor Santner	38cf36b46c	Improve sharing a lot +GIF - add support for multiple filetypes * now supporting GIFs too ;) * Create connection over netcipher	2018-04-08 19:11:12 +02:00
Gregor Santner	68be2f3a4a	Load README when ow pod URL gets called and no pod selected , fixes #193	2018-04-08 18:05:56 +02:00
Gregor Santner	51093e0c3d	Rework screenshot saving and sharing; add new share options: * Share option: Launcher shortcut (fixes #170) * Share option: Copy link of current page to clipboard * Share otpion: Export as PDF / print	2018-04-08 17:52:04 +02:00
Gregor Santner	d53128e5cb	Merge license and changelog dialog on first start	2018-04-08 09:01:52 +02:00
Gregor Santner	82ccc54436	Add FF Klar to custom tabs list	2018-04-08 08:44:00 +02:00
Gregor Santner	f6ab146fd7	Update github templates	2018-04-03 23:23:16 +02:00
Gregor Santner	80f8f10bf9	Release v1.1.2	2018-03-30 03:03:19 +02:00
Gregor Santner	dcc8728171	Update changelog * fixes #180	2018-03-30 02:52:20 +02:00
Gregor Santner	b48dc5dcac	Fix loading non-pod links outside customtab/external browser	2018-03-30 02:46:44 +02:00
Gregor Santner	618f3eaaba	Fix webview-js dialog not dismissing correctly	2018-03-30 01:41:43 +02:00
Gregor Santner	08242760bb	Migrate to opoc/basefragment; Fix redundant casts	2018-03-30 00:38:31 +02:00
Gregor Santner	a88dc5d13c	.	2018-03-30 00:24:52 +02:00
Gregor Santner	586875e32b	Update gsantner-opoc to latest state	2018-03-30 00:14:54 +02:00
Gregor Santner	43a2ad25bc	Update opoc license headers	2018-03-12 00:05:53 +01:00
Gregor Santner	6cac47763c	Release v1.1.1	2018-03-05 23:45:10 +01:00
Gregor Santner	5921549a9c	Fix secondlion BuildConfig, githash	2018-03-05 23:37:24 +01:00
Gregor Santner	07acb6bd02	Redo icon as adaptive icon	2018-03-05 14:23:51 +01:00
Gregor Santner	dd0432f718	Update to latest opoc version * Move various clases * Especially improve language preference, backported from compat lib	2018-03-02 15:56:14 +01:00
x m l p	1bb061b563	Update galician translation, by @xmgz (#189 )	2018-02-22 22:42:50 +01:00
XoseM	d8d74de22b	actualizando o galego	2018-02-21 12:36:28 +01:00
XoseM	8df13fe283	Merge branch 'master' of https://github.com/xmgz/dandelion pideumo o git	2018-02-21 12:32:21 +01:00
XoseM	724a0dbc9c	actualizando a gl-translation	2018-02-21 12:31:45 +01:00
XoseM	1f873e2057	fixed strings from gl-tranlation branch	2018-02-21 12:14:48 +01:00
x m l p	ea66b57979	Update .gitignore	2018-02-21 12:02:03 +01:00
XoseM	cbb98f7c60	editando desde gl-translation	2018-02-21 11:51:25 +01:00
XoseM	ed511bec01	update using git help from gsantner	2018-02-21 11:45:02 +01:00
Xosé M	204429b8d5	engadido cómo traducir	2018-02-21 08:31:04 +01:00
Xosé M	120c48f702	actualizando segundo contexto	2018-02-21 08:02:47 +01:00
Gregor Santner	e4992870fe	Release v1.1.0	2018-02-07 00:17:24 +01:00
Gregor Santner	be4309ecd6	Replace shortcut's icons with vectors	2018-02-07 00:13:42 +01:00
Gregor Santner	a07bc144d8	Remove line breaks from fdroid metadata	2018-02-06 23:21:10 +01:00
Gregor Santner	3442f018e9	Update buildscript	2018-02-06 23:11:18 +01:00
Paul Schaub	8aec1aa74f	Update podlink dorf-post.de (fix #181 ) (#184 )	2018-01-15 22:52:04 +01:00
Gaukler Faun	a3cb818db4	implemented app shortcuts, template svg-file for shortcut icons (#183 )	2018-01-07 16:03:02 +01:00
Xosé M. Lamas	15240fca49	pequenos erros tipográficos	2017-11-30 08:37:16 +01:00
Xose M	32a74e293a	1a modificacion en github (#179 )	2017-11-28 10:15:54 +01:00
XoseM	b1c2219b4d	1ª modificación en github	2017-11-28 09:47:44 +01:00
Gregor Santner	7215cbd7e6	Update sc localization * Closes #177	2017-11-24 00:55:43 +01:00
Gregor Santner	06119a52cd	Update github templates	2017-11-24 00:21:56 +01:00
Daria Szatan	755adb2ad9	Polish translation (#176 ) Polish translation	2017-11-23 18:07:50 +01:00
Gregor Santner	1a99d53c5d	Last crowdin translation update	2017-11-22 21:02:12 +01:00
Gregor Santner	28dac50d84	Update and improve buildscript	2017-11-18 20:04:59 +01:00
Aditya Mehta	255c6d650e	replaced traditional file sharing with FileProvider (#174 ) replaced traditional file sharing with FileProvider (fixes #173)	2017-11-01 05:23:19 +01:00
Gregor Santner	8ac5c2dee9	Update translations	2017-10-31 18:12:02 +01:00
Gregor Santner	0393bf274f	Fix lint warnings in opoc ; update langprefs; more power for contextutils	2017-10-31 14:18:52 +01:00
Gregor Santner	d1c4e68df3	Release v1.0.8	2017-10-29 19:39:37 +01:00
Gregor Santner	08c450fc99	Update readme	2017-10-29 19:35:35 +01:00
Gregor Santner	ae226c9e16	Add metadata again	2017-10-29 18:05:49 +01:00
Gregor Santner	086f056216	Modify toolbar item positions	2017-10-29 17:26:13 +01:00
Gregor Santner	d1d2d7b4d1	Fix drawable lint issues	2017-10-29 15:33:59 +01:00
Gregor Santner	a96e91aefb	Top toolbar with overflow icons and light/dark theme	2017-10-29 14:47:00 +01:00
Gregor Santner	aaa2445bef	Merge extended notifications menu into main menu	2017-10-29 11:07:52 +01:00
Gregor Santner	cb811d8236	Update Gradle to 3.0/4.1 ; SDK 27	2017-10-29 11:01:27 +01:00
Gregor Santner	496faa7945	Release v1.0.7	2017-10-28 09:56:33 +02:00
Gregor Santner	34882ba69f	Remove metadata...again	2017-10-28 09:56:05 +02:00
Gregor Santner	ac8b8469b0	kabyle_init	2017-09-26 18:13:57 +02:00
Gregor Santner	e767e514f7	Release v1.0.6	2017-09-23 20:33:53 +02:00
Gregor Santner	bf6bdbd821	Re add metadata module	2017-09-23 20:33:28 +02:00
Gregor Santner	fe4d646c47	Release v1.0.5	2017-09-19 15:21:37 +02:00
Gregor Santner	19161ca3e4	Update LangPref ; Remove metadata	2017-09-19 15:19:00 +02:00
Gregor Santner	9767363a7e	Update screenshots in readme	2017-09-17 22:07:39 +02:00
Gregor Santner	184de1931e	Make use of opoc/LanguagePreference (fixes #169 )	2017-09-15 19:56:10 +02:00
Gregor Santner	4ba1b8671d	Release v1.0.4	2017-09-11 21:19:30 +02:00
Gregor Santner	6a0b30dd7b	Add F-Droid metadata ( fixes #161 )	2017-09-11 20:53:09 +02:00
Gregor Santner	58d07f9c6c	Fix profile link	2017-09-11 20:32:40 +02:00
Gregor Santner	b4608794ab	Hide statusbar option for mainacitvity	2017-09-11 18:48:58 +02:00
Gregor Santner	76f33a45ba	Move sardinian	2017-09-11 18:04:22 +02:00
Gregor Santner	eb28ca3f43	Merge branch 'master' of github.com:diaspora-for-android/dandelion	2017-09-09 17:09:14 +02:00
Gregor Santner	15a34a1895	Change package ID of gsantner/opoc	2017-09-09 17:09:04 +02:00
Gregor Santner	548ff25396	Add sardinian	2017-09-08 07:31:21 +02:00
Gregor Santner	b3129e0e91	l10n update	2017-08-29 14:45:54 +02:00
Gregor Santner	05d6efd107	Include String key as parameter in AppSettingsBase	2017-08-29 14:44:43 +02:00
Gregor Santner	e9fa2082d9	Update Readme	2017-08-24 13:34:32 +02:00
Gregor Santner	ea7ceacc12	add metadata	2017-08-15 18:36:39 +02:00
Gregor Santner	23142488c2	Release v1.0.3	2017-08-13 23:05:40 +02:00
Gregor Santner	eb0e2b0997	Improve badge and podselection colors ; Update podlist	2017-08-13 23:02:04 +02:00
Gregor Santner	c988fc3bdd	Lower butterknife version to not pull in more recent appcompat	2017-08-12 22:34:15 +02:00
Gregor Santner	92bd98ea28	Update opoc	2017-08-09 17:23:19 +02:00
Gregor Santner	bdd502174d	Update README.md IRC Channel link badge	2017-08-08 14:02:20 +02:00
Gregor Santner	b07941be75	Release v1.0.2	2017-08-05 14:01:31 +02:00
Gregor Santner	e54dbedec8	Revert: Update android sdk to api 26... Upstream bug still not fixed	2017-08-05 14:00:55 +02:00
Gregor Santner	8a934b4a68	Lower gradle version so F-Droid can build it ==== detail begin ==== Available gradle versions: 4.0 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4 Found 4.0.2 via distributionUrl /opt/gradle/bin/gradle: line 9: /opt/gradle/versions/4.0.2/bin/gradle: No such file or directory ==== detail end ====	2017-08-05 12:26:04 +02:00
Gregor Santner	acb27766a8	Update android sdk to api 26	2017-08-04 05:42:43 +02:00
Gregor Santner	a5a307c076	Update translations and contributors	2017-07-30 15:40:27 +02:00
Gregor Santner	96daa8789a	Release v1.0.1	2017-07-30 12:36:47 +02:00
Gregor Santner	8324fe52ec	Move untranslatable strings	2017-07-29 21:20:39 +02:00
Gregor Santner	99e369088a	Update SimpleMarkdownParser	2017-07-29 04:44:28 +02:00
Gregor Santner	0e7ff63c9a	Update AppSettings.java	2017-06-18 22:24:53 +02:00