diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index c9066316..4028d569 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,17 +1,11 @@ - - -Fixes issue # - -Proposed changes in this pull request: - -- -- - diff --git a/.gitignore b/.gitignore index fca993ba..c5750b11 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,7 @@ 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/CHANGELOG.md b/CHANGELOG.md index 18346995..e49e3c8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### 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 diff --git a/app/build.gradle b/app/build.gradle index c40e8a58..82a4c23a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { buildConfigField "String", "GITHASH", "\"${getGitHash()}\"" applicationId "com.github.dfa.diaspora_android" - versionName "1.0.8" - versionCode 28 + versionName "1.1.0" + versionCode 29 vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 453cec1c..916459b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,7 +57,14 @@ android:theme="@style/DiasporaLight.NoActionBar" android:windowSoftInputMode="adjustResize"> + + + + + + 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 index 8bee4277..08882d5d 100644 --- 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 @@ -325,8 +325,16 @@ public class DiasporaStreamFragment extends BrowserFragment { @SuppressWarnings("unused") @JavascriptInterface public void setUserProfile(final String webMessage) throws JSONException { - final DiasporaUserProfile pup = ((App) getActivity().getApplication()).getDiasporaUserProfile(); + App app = ((App) getActivity().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) { + } AppLog.v(this, "DiasporaUserProfile needs refresh; Try to parse JSON"); pup.parseJson(webMessage); getActivity().runOnUiThread(new Runnable() { diff --git 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 index c4750ce1..a75014cb 100644 --- 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 @@ -549,6 +549,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_nav_followed_tags".equals(action)) { + showFragment(getFragment(TagListFragment.TAG)); + return; + } else if ("sc_aspects".equals(action)) { + showFragment(getFragment(AspectListFragment.TAG)); + return; + } else if ("sc_activities".equals(action)) { + openDiasporaUrl(urls.getActivityUrl()); + return; } //Catch split screen recreation if (action != null && action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) { diff --git a/app/src/main/res/drawable/ic_mode_edit_black_48px.xml b/app/src/main/res/drawable/ic_mode_edit_black_48px.xml new file mode 100644 index 00000000..7575f1a5 --- /dev/null +++ b/app/src/main/res/drawable/ic_mode_edit_black_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/sc_aspect.xml b/app/src/main/res/drawable/sc_aspect.xml new file mode 100644 index 00000000..3ca0e79f --- /dev/null +++ b/app/src/main/res/drawable/sc_aspect.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/app/src/main/res/drawable/sc_edit.xml b/app/src/main/res/drawable/sc_edit.xml new file mode 100644 index 00000000..fb9e361a --- /dev/null +++ b/app/src/main/res/drawable/sc_edit.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/sc_history.xml b/app/src/main/res/drawable/sc_history.xml new file mode 100644 index 00000000..a100d665 --- /dev/null +++ b/app/src/main/res/drawable/sc_history.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/sc_tags.xml b/app/src/main/res/drawable/sc_tags.xml new file mode 100644 index 00000000..ed8ad05f --- /dev/null +++ b/app/src/main/res/drawable/sc_tags.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/src/main/res/raw/podlist.json b/app/src/main/res/raw/podlist.json index 32f4480a..817418e5 100644 --- a/app/src/main/res/raw/podlist.json +++ b/app/src/main/res/raw/podlist.json @@ -246,7 +246,7 @@ "id": 13165 }, { - "podUrls": [{"host": "diaspora.dorf-post.de"}], + "podUrls": [{"host": "dorf-post.de"}], "name": "dorf-post.de", "mainLangs": ["de"], "id": 43137 diff --git a/app/src/main/res/values-gl/strings-about.xml b/app/src/main/res/values-gl/strings-about.xml index da9a46ca..343a4fe0 100644 --- a/app/src/main/res/values-gl/strings-about.xml +++ b/app/src/main/res/values-gl/strings-about.xml @@ -1,5 +1,5 @@ - + Sobre Licenza diff --git a/app/src/main/res/values-gl/strings-preferences.xml b/app/src/main/res/values-gl/strings-preferences.xml index f3d5617e..f4bf45a7 100644 --- a/app/src/main/res/values-gl/strings-preferences.xml +++ b/app/src/main/res/values-gl/strings-preferences.xml @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ Idioma Idioma do sistema - Estableza o tamaño do texto na VistaWeb + Estableza o tamaño do texto na Vista Web Tamaño do texto Normal Grande diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index cd007cf3..8c17aa42 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -1,5 +1,4 @@ - Actualizar @@ -50,8 +49,13 @@ Saír do app Vista móbil/escritorio Compartir… +<<<<<<< HEAD Etiquetas Persoas +======= + etiquetas + persoas +>>>>>>> gl-translation Por favor engada un nome Compartir ligazón Gardar imaxe diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml new file mode 100755 index 00000000..cb3852d1 --- /dev/null +++ b/app/src/main/res/xml-v25/shortcuts.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index d549a863..39719601 100644 --- a/build.gradle +++ b/build.gradle @@ -4,18 +4,20 @@ buildscript { ext.version_setup_compileSdk = 27 ext.version_setup_minSdk = 17 ext.version_setup_targetSdk = ext.version_setup_compileSdk - ext.version_setup_buildTools = "27.0.1" // Specifying optional + ext.version_setup_buildTools = "27.0.3" // Specifying optional + // https://developer.android.com/studio/releases/gradle-plugin.html + ext.version_gradle_tools = "3.0.1" // https://developer.android.com/topic/libraries/support-library/revisions.html - ext.version_library_appcompat = "27.0.1" + ext.version_library_appcompat = "27.0.2" // https://github.com/JakeWharton/butterknife/releases ext.version_library_butterknife = "8.8.1" // https://github.com/atlassian/commonmark-java/releases ext.version_library_commonmark = "0.10.0" // https://github.com/guardianproject/NetCipher/releases ext.version_library_netcipher = "2.0.0-alpha1" - // https://github.com/JetBrains/kotlin/blob/master/ReadMe.md - ext.version_plugin_kotlin = "1.1.60" + // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin#LookAtCentral + ext.version_plugin_kotlin = "1.2.10" ext.enable_plugin_kotlin = false repositories { @@ -23,7 +25,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath "com.android.tools.build:gradle:$version_gradle_tools" classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' if (project.enable_plugin_kotlin) { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_plugin_kotlin" @@ -41,18 +43,22 @@ allprojects { mavenCentral() maven { url "https://jitpack.io" } } + + tasks.matching { task -> task.name.matches('.*generate.*Resources') }.all { + task -> task.dependsOn copyRepoFiles + } } task clean(type: Delete) { delete rootProject.buildDir } -final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "CHANGELOG.md", "CONTRIBUTORS.md","LICENSE.txt","LICENSE.md","LICENSE"] +final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "CHANGELOG.md", "CONTRIBUTORS.md", "LICENSE.txt", "LICENSE.md", "LICENSE"] task copyRepoFiles(type: Copy) { from rootProject.files(ROOT_TO_RAW_COPYFILES) into "app/src/main/res/raw" rename { String fileName -> fileName.replace(fileName, fileName.toLowerCase()) } -}; tasks.copyRepoFiles.execute() +} @SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection", "GroovyUnusedDeclaration"]) @@ -73,10 +79,13 @@ static String getUsedAndroidLanguages() { } ext.getGitHash = { -> - def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', 'HEAD' - standardOutput = stdout + try { + def stdout = new ByteArrayOutputStream() exec { + commandLine 'git', 'rev-parse', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() + } catch (Exception e) { + return '???' } - return stdout.toString().trim() } diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index 9fefe93c..2332973c 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -1,17 +1,18 @@ dandelion* is a client for the community-run, distributed social network diaspora*. -
It adds useful features to your networking experience: -
-
⚡ Quick access to most diaspora* features -
👉 Share content to and from the app -
🌎 Proxy support -
📰 In-app-browser to view articles -
🎨 Customizeable colors -
🌆 Night/AMOLED mode -
🈴 Localized in many languages -
✔️ Allows system independent language -
-
+It adds useful features to your networking experience: + +⚡ Quick access to most diaspora* features +👉 Share content to and from the app +🌎 Proxy support +📰 In-app-browser to view articles +🎨 Customizeable colors +🌆 Night/AMOLED mode +🈴 Localized in many languages +✔️ Allows system independent language + + Support the project: -
✋ Translate -
✋ Join discussion on Matrix -
✋ More information about contributions + ✋ Translate using Stringlate + ✋ Join discussion on Matrix + ✋ More information about contributions + ✋ Support main developer diff --git a/sc_edit.svg b/sc_edit.svg new file mode 100644 index 00000000..b5074d99 --- /dev/null +++ b/sc_edit.svg @@ -0,0 +1,386 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + +