`
-
-
-#### Debug output
-
-Please post the output of adb logcat. The log should begin with the start of Diaspora for Android and include all the steps it takes to reproduce the problem.
-
-````
-adb logcat -s com.github.dfa.diaspora_android
-````
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 00000000..863cd426
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml
new file mode 100644
index 00000000..07923101
--- /dev/null
+++ 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
diff --git a/.gitignore b/.gitignore
index 8f72a53d..59057232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,76 @@
-*~
+##############
+### Common ###
+*~*
+tmp/
+*.tmp
+*.bak
+*.log
-# Project specific
-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
+################
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+*.iml
+/out/
+.idea/
+# if you remove the above rule, at least ignore the following:
+## User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+## Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
-# Gradle
-.gradle/
+## File-based project format:
+*.ipr
+*.iws
+
+### Gradle ###
.gradle
build/
-/*/build/
+dist/
+gradle-app.setting
-# User-specific configurations
-local.properties
-crowdin.yaml
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
-.idea
-.idea/libraries/
-.idea/runConfigurations.xml
-.idea/gradle.xml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-*.iml
+###############
+### Eclipse ###
+#.project
+*.pydevproject
+.metadata
+*.swp
+*~.nib
+.settings/
+.loadpath
+.externalToolBuilders/
+*.launch
+.cproject
+.classpath
+.factorypath
+.buildpath
+.target
+.texlipse
-# OS-specific files
-.DS_Store
-.DS_Store?
-._*
-.Trashes
-ehthumbs.db
-Thumbs.db
+############
+### Java ###
+*.class
+.mtj.tmp/
+*.jar
+*.war
+*.ear
+hs_err_pid*
+###############
+### Android ###
# Built application files
*.apk
*.ap_
@@ -50,14 +78,27 @@ Thumbs.db
# Files for the Dalvik VM
*.dex
-# Java class files
-*.class
-
# Generated files
bin/
gen/
+# Local configuration file (sdk path, etc)
local.properties
+
+# Proguard
proguard/
-*.log
+
+# 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
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 74b79b85..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +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.1
- - 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="lintDebug"
- - TASK="build check --stacktrace"
-
-branches:
- except:
- - l10n_master
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/e462044d3105a7bb4b4f
- 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf15a05f..a5861d19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,150 @@
-# v0.1.6
+### 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
+- Improve Shared by notice
+- Use opoc/Helpers,AdBlock
+
+### v0.2.7 (2017-05-26)
+- Small improvements
+
+### v0.2.6 (2017-05-03)
+- Fixed #156 #158 #159
+- Added chinese traditional language
+- Added NavSlider option: Statistics
+- Changed shared-by-notice text
+- Fix bottom bar hint text background color (Fix #157)
+- Color improvements
+
+### v0.2.5 (2017-04-10)
+- Introduce minimalistic Markdown Parser
+- Show LICENSE at first start
+- Show CHANGELOG after update
+- Convert existing Markup files to Markdown
+- Update existing markdown files
+- Update AboutActivity to use new Parser
+- Added translations: Danish, Korean, Galician
+
+### v0.2.4 (2017-03-19)
+- Different icon and color for secondlion
+- Language switcher
+- Handle dia.so links
+- Improve security at internal browser decision
+- More icons for notification dropdown
+- Update gradle build scripts
+- Added CircleCI
+
+### v0.2.3 (2017-02-24)
+- Add Czech translation (thanks @bezcitu)
+- Add option to copy image urls to clipboard
+- Fixed some bugs related to image upload/download
+- Published secondlion\* (nighly version of dandelion\*)
+
+### v0.2.2
+- Move "toggle mobile/deskop" to nav-slider
+- Reduce messages sent via broadcast
+- Allow to jump to last visited page on stream
+- New language: Hungarian
+- FIX NullPtr in shared text methods
+- FIX #117 - Reset NavHeader on change account, reset web profile
+- FIX #92 Roation settings
+- FIX #111 Remove legacy code
+
+### v0.2.1
+- App name changed to **dandelion***
+- Rotation options
+- Top toolbar loads screen again (toggleable in settings)
+- Fixed overlapping fragments
+- Visual rework of the About-section of the app
+
+### v0.2.0a
+- Added: Customizable Theme Colors!
+- Improved account setup with easy tor hidden service configuration
+- Eye candy for the settings activity
+- Added: "Contacts" shortcut in the navigation slider
+- Increased the overall performance by using Fragments
+- Lots of bugfixes
+- Fixes for the bugfixes!
+
+### v0.1.6
- Added: New languages
- Changed: New delicious visual style + launcher icon
- Changed: Notifications-/Messages-indicator does now display number of events!
@@ -10,7 +156,7 @@
- Fixed: Image upload for older devices
- Added: Option to open external links in Chrome CustomTab
-# v0.1.5
+### v0.1.5
- Update title depending on what the user is doing
- New greenish color scheme
- Replaced SwipeToRefresh functionality with refresh button
@@ -25,7 +171,7 @@
- Allow slider customization
- Show aspect name after selection
-# v0.1.4 (2016-07-31)
+### v0.1.4 (2016-07-31)
- by @vanitasvitae, @gsantner, @di72nn
- Allow turning off toolbar intellihide
- Handle links from browseable intent filter #38
@@ -40,7 +186,7 @@
- Share screenshot fix; Minor Aspects rework
- Update to SDK 24 (Android N)
-# v0.1.3 (2016-07-04)
+### v0.1.3 (2016-07-04)
- Added titles on top toolbar (by @scoute-dich)
- Made bottom toolbar automatically disappear
- Added option to share images to external app
@@ -51,7 +197,7 @@
- Removed swipe-to-refresh functionality in some places
- Big thanks and good luck to @scoute-dich and @martinchodev for accompanying this project :)
-# v0.1.2 (2016-06-05)
+### v0.1.2 (2016-06-05)
- Extract and show aspects (by @gsantner)
- Cache last podlist
- Better sharing from app
@@ -64,7 +210,7 @@
- Lots of refactoring; Reworked Splash,PodSelectionActivity; Switch Pod; Clear settings;
- Activity transitions, usability MainActivity, green accent color
-# v0.1.1
+### v0.1.1
- Sharing updated (by @scoute-dich)
- Screenshotting updated
- Gitter integration (by @gsantner)
@@ -74,8 +220,8 @@
- Travis CI integration
- Bump Gradle, Build-Tools, Libs to Android Studio 2.1 defaults
-# v0.1.0 (Diaspora for Android)
-First version of the organization *Diaspora for Android*
+### v0.1.0 (Diaspora for Android)
+First version of the organization *Diaspora for Android*
Consists mostly of code from:
- Diaspora-Native-Webapp (by @martinchodev )
- scoutedich additions (by @scoute-dich)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..47984ecf
--- /dev/null
+++ 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 ~° Development of dandelion +* **[Paul Schaub](https://github.com/vanitasvitae)**
~° Development of dandelion +* **[Martín Vukovic](martinvukovic AT protonmail DOT com)**
~° Diaspora Native WebApp +* **[Gaukler Faun](https://github.com/scoute-dich)**
~° Diaspora Native WebApp additions +* **[Airon90](https://diasp.eu/u/airon90)**
~° Italian translation +* **[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 +* **[Zsolt Szakács](maxigaz AT diaspora DOT zone)**
~° Hungarian translation +* **[Luís F.S. Rosa](https://github.com/luisfsr)**
~° Brazilian Portuguese translation +* **[Danilo Raffaelli](https://crowdin.com/profile/Daraf)**
~° Italian translation +* **[Âng Iōngchun](https://pubpod.alqualonde.org/u/iongchun)**
~° Chinese traditional translation +* **[Mikkel Kirkgaard Nielsen](http://www.mikini.dk)**
~° Danish translation +* **[Jean Lucas](jean AT 4ray DOT co)**
~° Spanish translation +* **[asereze](https://github.com/asereze)**
~° Sardinian translation +* **[Xosé M. Lamas](http://xmgz.eu)**
~° Galician translation +* **[massimiliano](https://framagit.org/massimiliano)**
~° Contributor diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt deleted file mode 100644 index e842d61a..00000000 --- a/CONTRIBUTORS.txt +++ /dev/null @@ -1,13 +0,0 @@ -00l>> This file contains references to people who contributed to the app. -01l>> Send a message to [gdev AT live to de](https://gsantner.github.io/about/email/) to get included -02l>> If you helped by translating the app, please send a message on crowdin -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 -SansPseudoFix (https://github.com/SansPseudoFix): French translation diff --git a/LICENSE.md b/LICENSE.md index d1628af1..4292c03f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,19 +1,25 @@ -# App - -This program is free software: you can redistribute it and/or modify +# dandelion\* +`---------------` +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +(at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see https://www.gnu.org/licenses/. +along with this program. If not, see https://www.gnu.org/licenses/. +`---------------` +If you want to publish dandelion\* in an app store, you have to change the app name (dandelion\*), package name & launcher icon (blue). See "7. Additional Terms" of GPL. +You also have to provide the modifications in source code somewhere online for free. This is explicitly not about building the app and sharing with some friends, it's about app stores. +The reason is, that most app stores allow an app id just once, which would block our uploads if somebody else uploaded. Also, we want to keep control on where the app is published, and want to make sure there is no malware in it. +The F-Droid project team is explicitly allowed to publish dandelion\* without listed required modifications above at official F-Droid repository. -# Splashscreen-Images +## Miscellaneous -The splashscreen images can be found on [flickr](https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123/). +We took some inspiration and code from LeafPic. Go check it out, its free software as well! +
+This is an unofficial webview based client for the community-run, distributed social network diaspora*.
+
+
+
+
+
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ |
-  |
-  |
-  |
-
 |
-  |
-  |
-  |
-
"); - return text; + 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( + ContextUtils.get().loadMarkdownForTextViewFromRaw(R.raw.licenses_3rd_party, "")); } - public String getMaintainersHtml(Context context) { - String text = Helpers.readTextfileFromRawRessource(context, R.raw.maintainers, "", "
"); - text = text - .replace("NEWENTRY", "* ") - .replace("SUBTABBY", " "); - return text; + @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: + ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_licesen__misc_leafpic_link)); + break; + case R.id.fragment_license__license_button: + ContextUtils.get().openWebpageInExternalBrowser(getString(R.string.fragment_license__license_gpl_link)); + break; + } } - public String getLicenseHtml(Context context) { - String text = Helpers.readTextfileFromRawRessource(context, R.raw.license, - "", "").replace("\n\n", "
"); - return text; + @Override + protected void applyColorToViews() { + ThemeHelper.getInstance(getAppSettings()); + ThemeHelper.updateButtonTextColor(leafpicBtn); + ThemeHelper.updateButtonTextColor(licenseBtn); + ThemeHelper.updateTextViewLinkColor(maintainers); + ThemeHelper.updateTextViewLinkColor(thirdPartyLibs); } - public String getLicense3dPartyHtml(Context context) { - String text = Helpers.readTextfileFromRawRessource(context, R.raw.license_third_party, "", "
"); - text = text.replace("NEWENTRY", "* "); - return text; + @Override + public String getFragmentTag() { + return TAG; + } + + @Override + public boolean onBackPressed() { + return false; } } @@ -193,7 +302,28 @@ public class AboutActivity extends AppCompatActivity { * Fragment that shows debug information like app version, pod version... */ public static class DebugFragment extends Fragment implements Observer { - private TextView logBox; + public static final String TAG = "com.github.dfa.diaspora_android.AboutActivity.DebugFragment"; + + @BindView(R.id.fragment_debug__package_name) + TextView packageName; + + @BindView(R.id.fragment_debug__app_version) + TextView appVersion; + + @BindView(R.id.fragment_debug__android_version) + TextView osVersion; + + @BindView(R.id.fragment_debug__device_name) + TextView deviceName; + + @BindView(R.id.fragment_debug__account_profile_name) + TextView podName; + + @BindView(R.id.fragment_debug__account_profile_domain) + TextView podDomain; + + @BindView(R.id.fragment_debug__log_box) + TextView logBox; public DebugFragment() { } @@ -201,42 +331,39 @@ public class AboutActivity extends AppCompatActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_debug, container, false); - TextView packageName = (TextView) rootView.findViewById(R.id.fragment_debug__package_name); - TextView appVersion = (TextView) rootView.findViewById(R.id.fragment_debug__app_version); - TextView osVersion = (TextView) rootView.findViewById(R.id.fragment_debug__android_version); - TextView deviceName = (TextView) rootView.findViewById(R.id.fragment_debug__device_name); - TextView podDomain = (TextView) rootView.findViewById(R.id.fragment_debug__pod_domain); - logBox = (TextView) rootView.findViewById(R.id.fragment_debug__log_box); + View rootView = inflater.inflate(R.layout.about__fragment_debug, container, false); + ButterKnife.bind(this, rootView); + App app = (App) getActivity().getApplication(); logBox.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View view) { - AppLog.d(this, "Long click registered"); if (isAdded()) { ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE); - ClipData clip = ClipData.newPlainText("DEBUG_LOG", Log.getLogBuffer()); + 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!"); } return true; } }); - Log.addLogObserver(this); - update(Log.getInstance(), null); + AppLog.Log.addLogObserver(this); + update(AppLog.Log.getInstance(), null); if (isAdded()) { try { PackageInfo pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0); - AppSettings settings = ((App) getActivity().getApplication()).getSettings(); - + 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)); - podDomain.setText(getString(R.string.fragment_debug__pod_domain, settings.getPodDomain())); + 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.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) { e.printStackTrace(); @@ -248,14 +375,14 @@ public class AboutActivity extends AppCompatActivity { @Override public void onDestroyView() { - Log.removeLogObserver(this); + AppLog.Log.removeLogObserver(this); super.onDestroyView(); } @Override public void update(Observable observable, Object o) { if (logBox != null) { - logBox.setText(Log.getLogBuffer()); + logBox.setText(AppLog.Log.getLogBuffer()); } } } @@ -277,7 +404,7 @@ public class AboutActivity extends AppCompatActivity { return new AboutFragment(); case 1: //License return new LicenseFragment(); - case 3: //Debug + case 2: //Debug default: return new DebugFragment(); } @@ -293,11 +420,11 @@ public class AboutActivity extends AppCompatActivity { 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; } diff --git 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 new file mode 100644 index 00000000..03517332 --- /dev/null +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java @@ -0,0 +1,416 @@ +/* + 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
" + getString(R.string.changelog) + "
" + smp.parse(getResources().openRawResource(R.raw.changelog), "", SimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW, SimpleMarkdownParser.FILTER_CHANGELOG).getHtml(); + html += "
" + getString(R.string.licenses) + "
" + 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(); + } } - private void setupUI(Bundle savedInstanceState) { + /** + * Setup the user interface. Set up both toolbars and initialize the snackbars. + * Initialize the navigation drawer and apply intellihide settings. + */ + private void setupUI() { AppLog.i(this, "setupUI()"); - ButterKnife.bind(this); - if (webviewPlaceholder.getChildCount() != 0) { - AppLog.v(this, "remove child views from webViewPlaceholder"); - webviewPlaceholder.removeAllViews(); - } else { - AppLog.v(this, "webViewPlaceholder had no child views"); - } - boolean newWebView = (webView == null); - if (newWebView) { - AppLog.v(this, "WebView was null. Create new one."); - View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout, false); - this.webView = (ContextMenuWebView) webviewHolder.findViewById(R.id.webView); - ((LinearLayout) webView.getParent()).removeView(webView); - setupWebView(savedInstanceState); - } else { - AppLog.v(this, "Reuse old WebView to avoid reloading page"); - } - - AppLog.v(this, "Add WebView to placeholder"); - webviewPlaceholder.addView(webView); - // Setup toolbar + // Setup _toolbar setSupportActionBar(toolbarTop); - getMenuInflater().inflate(R.menu.main__menu_bottom, toolbarBottom.getMenu()); - toolbarBottom.setOnMenuItemClickListener(new ActionMenuView.OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - return MainActivity.this.onOptionsItemSelected(item); - } - }); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } setTitle(R.string.app_name); //Setup snackbar snackbarExitApp = Snackbar - .make(contentLayout, 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() { - @Override public void onClick(View view) { finish(); moveTaskToBack(true); } }); - snackbarNewNotification = Snackbar - .make(contentLayout, R.string.new_notifications, Snackbar.LENGTH_LONG) - .setAction(android.R.string.yes, new View.OnClickListener() { - @Override - public void onClick(View view) { - if (WebHelper.isOnline(MainActivity.this)) { - webView.loadUrlNew(urls.getNotificationsUrl()); - } else { - Snackbar.make(contentLayout, R.string.no_internet, Snackbar.LENGTH_LONG).show(); - } - } - }); - snackbarNoInternet = Snackbar.make(contentLayout, R.string.no_internet, Snackbar.LENGTH_LONG); + snackbarLastVisitedTimestampInStream = + Snackbar.make(fragmentContainer, + 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.sorry_need_to_be_connected_to_internet, Snackbar.LENGTH_LONG); // Load app settings setupNavigationSlider(); - - progressBar = (ProgressBar) findViewById(R.id.progressBar); - - String url = urls.getPodUrl(); - if (newWebView) { - if (WebHelper.isOnline(MainActivity.this)) { - AppLog.v(this, "setupUI: reload url"); - webView.loadData("", "text/html", null); - webView.loadUrlNew(url); - } else { - snackbarNoInternet.show(); - } - } - - if (!appSettings.isIntellihideToolbars()) { - AppLog.v(this, "Disable intelligent hiding of toolbars"); - AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams(); - params.setScrollFlags(0); // clear all scroll flags - } - AppLog.v(this, "UI successfully set up"); - handleIntent(getIntent()); } - @Override - public void onConfigurationChanged(Configuration newConfig) { - AppLog.i(this, "onConfigurationChanged()"); - if (webView != null) { - // Remove the WebView from the old placeholder - AppLog.v(this, "removeView from placeholder in order to prevent recreation"); - webviewPlaceholder.removeView(webView); + /** + * 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 ThemedFragment getFragment(String fragmentTag) { + ThemedFragment fragment = (ThemedFragment) fm.findFragmentByTag(fragmentTag); + if (fragment != null) { + return fragment; + } else { + switch (fragmentTag) { + case DiasporaStreamFragment.TAG: + DiasporaStreamFragment dsf = new DiasporaStreamFragment(); + fm.beginTransaction().add(dsf, fragmentTag).commit(); + return dsf; + case BrowserFragment.TAG: + BrowserFragment bf = new BrowserFragment(); + fm.beginTransaction().add(bf, fragmentTag).commit(); + return bf; + case PodSelectionFragment.TAG: + PodSelectionFragment psf = new PodSelectionFragment(); + fm.beginTransaction().add(psf, fragmentTag).commit(); + return psf; + default: + AppLog.e(this, "Invalid Fragment Tag: " + fragmentTag + + "\nAdd Fragments Tag to getFragment()'s switch case."); + return getTopFragment(); + } } - - super.onConfigurationChanged(newConfig); - - // Load the layout resource for the new configuration - setContentView(R.layout.main__activity); - - // Reinitialize the UI - AppLog.v(this, "Rebuild the UI"); - setupUI(null); } - private void setupWebView(Bundle savedInstanceState) { - - webSettings = webView.getSettings(); - webSettings.setJavaScriptEnabled(true); - webSettings.setAllowFileAccess(false); - webSettings.setUseWideViewPort(true); - webSettings.setLoadWithOverviewMode(true); - webSettings.setDomStorageEnabled(true); - webSettings.setMinimumFontSize(appSettings.getMinimumFontSize()); - webSettings.setLoadsImagesAutomatically(appSettings.isLoadImages()); - webSettings.setAppCacheEnabled(true); - - if (savedInstanceState != null) { - AppLog.v(this, "restore WebView state"); - webView.restoreState(savedInstanceState); + /** + * Show DiasporaStreamFragment if necessary and load URL url + * + * @param url URL to load in the DiasporaStreamFragment + */ + public void openDiasporaUrl(final String url) { + AppLog.v(this, "openDiasporaUrl()"); + 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 (android.os.Build.VERSION.SDK_INT >= 21) { - WebView.enableSlowWholeDocumentDraw(); - webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + 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); } - - this.registerForContextMenu(webView); - webView.setParentActivity(this); - webView.setOverScrollMode(WebView.OVER_SCROLL_ALWAYS); - - // Setup WebView - webView.addJavascriptInterface(new JavaScriptInterface(), "AndroidBridge"); - - //Set proxy - if (appSettings.isProxyEnabled()) { - if (!setProxy()) - Toast.makeText(this, R.string.toast_set_proxy_failed, Toast.LENGTH_LONG).show(); - } - - /* - * WebViewClient - */ - webViewClient = new CustomWebViewClient(app, webView); - webView.setWebViewClient(webViewClient); - - /* - * WebChromeClient - */ - webView.setWebChromeClient(new WebChromeClient() { - - public void onProgressChanged(WebView wv, int progress) { - progressBar.setProgress(progress); - - if (progress > 0 && progress <= 60) { - WebHelper.getUserProfile(wv); - WebHelper.optimizeMobileSiteLayout(wv); - } - - if (progress > 60) { - WebHelper.optimizeMobileSiteLayout(wv); - - if (textToBeShared != null) { - WebHelper.shareTextIntoWebView(wv, textToBeShared); - } - } - - progressBar.setVisibility(progress == 100 ? View.GONE : View.VISIBLE); - } - - //For Android 4.1/4.2 only. DO NOT REMOVE! - @SuppressWarnings("unused") - protected void openFileChooser(ValueCallback
"); + public static synchronized void sendUpdateTitleByUrlIntent(String url, Context context) { + // Ignore javascript stuff + if (url != null && url.startsWith("javascript:")) { + return; } - // End - sb.append(""); - wv.loadDataWithBaseURL(null, sb.toString(), "text/html", "UTF-16", null); - } - - public static void showFollowedTagsList(final WebView wv, final App app) { - wv.stopLoading(); - PodUserProfile profile = app.getPodUserProfile(); - StringBuilder sb = new StringBuilder(); - - sb.append(""); - - // Content - AppSettings appSettings = app.getSettings(); - sb.append("» "); - sb.append(String.format(Locale.getDefault(), - "%s", - appSettings.getPodDomain(), app.getString(R.string.all_tags))); - sb.append("
"); - for (String tag: profile.getFollowedTags()) { - sb.append("» "); - sb.append(String.format(Locale.getDefault(), - "#%s", - appSettings.getPodDomain(), tag, tag)); - sb.append("
"); + // Don't spam intents + if (lastUpdateTitleByUrl != null && !lastUpdateTitleByUrl.equals(url) && url != null) { + Intent updateActivityTitleIntent = new Intent(MainActivity.ACTION_UPDATE_TITLE_FROM_URL); + updateActivityTitleIntent.putExtra(MainActivity.EXTRA_URL, url); + LocalBroadcastManager.getInstance(context).sendBroadcast(updateActivityTitleIntent); } - - // End - sb.append(""); - wv.loadDataWithBaseURL(null, sb.toString(), "text/html", "UTF-16", null); + lastUpdateTitleByUrl = url; } - } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/BrowserFallback.java b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/BrowserFallback.java new file mode 100644 index 00000000..af10c11a --- /dev/null +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/BrowserFallback.java @@ -0,0 +1,36 @@ +/* + 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
* This is not threadsafe.
*
* @param context {@link Context} to use for accessing {@link PackageManager}.
@@ -83,12 +104,19 @@ 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;
}
/**
* Used to check whether there is a specialized handler for a given intent.
+ *
* @param intent The intent to check with.
* @return Whether there is a specialized handler for the given intent.
*/
@@ -109,7 +137,7 @@ public class CustomTabsHelper {
return true;
}
} catch (RuntimeException e) {
- AppLog.e(TAG, "Runtime exception while getting specialized handlers");
+ AppLog.e(TAG, "Runtime exception while getting specialized handlers");
}
return false;
}
@@ -118,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};
}
}
diff --git a/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java b/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
new file mode 100644
index 00000000..479551d9
--- /dev/null
+++ b/app/src/main/java/net/gsantner/opoc/activity/GsFragmentBase.java
@@ -0,0 +1,160 @@
+/*#######################################################
+ *
+ * Maintained 2017-2023 by Gregor Santner
+ * Example: new Handler().postDelayed(new DoTouchView(editView), 200);
+ */
+ public static class DoTouchView implements Runnable {
+ View _view;
+
+ public DoTouchView(View view) {
+ _view = view;
+ }
+
+ @Override
+ public void run() {
+ _view.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, 0, 0, 0));
+ _view.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 0, 0, 0));
+ }
+ }
+
+
+ public String getMimeType(final File file) {
+ return getMimeType(Uri.fromFile(file));
+ }
+
+ /**
+ * Detect MimeType of given file
+ * Android/Java's own MimeType map is very very small and detection barely works at all
+ * Hence use custom map for some file extensions
+ */
+ public String getMimeType(final Uri uri) {
+ String mimeType = null;
+ if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+ ContentResolver cr = _context.getContentResolver();
+ mimeType = cr.getType(uri);
+ } else {
+ String filename = uri.toString();
+ if (filename.endsWith(".jenc")) {
+ filename = filename.replace(".jenc", "");
+ }
+ String ext = MimeTypeMap.getFileExtensionFromUrl(filename);
+ mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.toLowerCase());
+
+ // Try to guess if the recommended methods fail
+ if (TextUtils.isEmpty(mimeType)) {
+ switch (ext) {
+ case "md":
+ case "markdown":
+ case "mkd":
+ case "mdown":
+ case "mkdn":
+ case "mdwn":
+ case "rmd":
+ mimeType = "text/markdown";
+ break;
+ case "yaml":
+ case "yml":
+ mimeType = "text/yaml";
+ break;
+ case "json":
+ mimeType = "text/json";
+ break;
+ case "txt":
+ mimeType = "text/plain";
+ break;
+ }
+ }
+ }
+
+ if (TextUtils.isEmpty(mimeType)) {
+ mimeType = "*/*";
+ }
+ return mimeType;
+ }
+
+ public Integer parseColor(final String colorstr) {
+ if (colorstr == null || colorstr.trim().isEmpty()) {
+ return null;
+ }
+ try {
+ return Color.parseColor(colorstr);
+ } catch (IllegalArgumentException ignored) {
+ return null;
+ }
+ }
+
+ public boolean isDeviceGoodHardware() {
+ try {
+ ActivityManager activityManager = (ActivityManager) _context.getSystemService(Context.ACTIVITY_SERVICE);
+ return !ActivityManagerCompat.isLowRamDevice(activityManager) &&
+ Runtime.getRuntime().availableProcessors() >= 4 &&
+ activityManager.getMemoryClass() >= 128;
+ } catch (Exception ignored) {
+ return true;
+ }
+ }
+
+ // Vibrate device one time by given amount of time, defaulting to 50ms
+ // Requires
\n") // Start new line if 2 empty lines
+ .replace("~°", " ") // double space/half tab
+ .replaceAll("(?m)^### (.*)$", "
$1
") // h3
+ .replaceAll("(?m)^## (.*)$", "
$1
") // h2 (DEP: h3)
+ .replaceAll("(?m)^# (.*)$", "
$1
") // h1 (DEP: h2,h3)
+ .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "$1") // img
+ .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "$1") // a href (DEP: img)
+ .replaceAll("<(http|https):\\/\\/(.*)>", "$1://$2") // a href (DEP: img)
+ .replaceAll("(?m)^([-*] )(.*)$", "• $2
") // unordered list + end line
+ .replaceAll("(?m)^ (-|\\*) ([^<]*)$", " • $2
") // unordered list2 + end line
+ .replaceAll("`([^<]*)`", "$1") // code
+ .replace("\\*", "●") // temporary replace escaped star symbol
+ .replaceAll("(?m)\\*\\*(.*)\\*\\*", "$1") // bold (DEP: temp star)
+ .replaceAll("(?m)\\*(.*)\\*", "$1") // italic (DEP: temp star code)
+ .replace("●", "*") // restore escaped star symbol (DEP: b,i)
+ .replaceAll("(?m) $", "
") // 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
\n") // Start new line if 2 empty lines
+ .replaceAll("~°", " ") // double space/half tab
+ .replaceAll("(?m)^### (.*)$", "$1
") // h3
+ .replaceAll("(?m)^## (.*)$", "$1
") /// h2 (DEP: h3)
+ .replaceAll("(?m)^# (.*)$", "$1
") // h1 (DEP: h2,h3)
+ .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "") // img
+ .replaceAll("<(http|https):\\/\\/(.*)>", "$1://$2") // a href (DEP: img)
+ .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "$1") // a href (DEP: img)
+ .replaceAll("(?m)^[-*] (.*)$", "• $1 ") // unordered list + end line
+ .replaceAll("(?m)^ [-*] (.*)$", " • $1 ") // unordered list2 + end line
+ .replaceAll("`([^<]*)`", "
$1") // code
+ .replace("\\*", "●") // temporary replace escaped star symbol
+ .replaceAll("(?m)\\*\\*(.*)\\*\\*", "$1") // bold (DEP: temp star)
+ .replaceAll("(?m)\\*(.*)\\*", "$1") // italic (DEP: temp star code)
+ .replace("●", "*") // restore escaped star symbol (DEP: b,i)
+ .replaceAll("(?m) $", "
") // new line (DEP: ul)
+ ;
+ return text;
+ }
+ };
+
+ public final static SmpFilter FILTER_CHANGELOG = new SmpFilter() {
+ @Override
+ public String filter(String text) {
+ text = text
+ .replace("New:", "New:")
+ .replace("New features:", "New:")
+ .replace("Added:", "Added:")
+ .replace("Add:", "Add:")
+ .replace("Fixed:", "Fixed:")
+ .replace("Fix:", "Fix:")
+ .replace("Removed:", "Removed:")
+ .replace("Updated:", "Updated:")
+ .replace("Improved:", "Improved:")
+ .replace("Modified:", "Modified:")
+ .replace("Mod:", "Mod:")
+ ;
+ return text;
+ }
+ };
+ public final static SmpFilter FILTER_H_TO_SUP = new SmpFilter() {
+ @Override
+ public String filter(String text) {
+ text = text
+ .replace("", "")
+ .replace("
", "")
+ .replace("", "")
+ .replace("
", "")
+ .replace("", "")
+ .replace("
", "")
+ ;
+ 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("(
){3,}", "
");
+ return this;
+ }
+
+ public SimpleMarkdownParser replaceBulletCharacter(String replacment) {
+ _html = _html.replace("•", 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 : "";
+ }
+}
diff --git a/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java b/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
new file mode 100644
index 00000000..f96af499
--- /dev/null
+++ b/app/src/main/java/net/gsantner/opoc/preference/PropertyBackend.java
@@ -0,0 +1,47 @@
+/*#######################################################
+ *
+ * Maintained 2018-2023 by Gregor Santner