editando desde gl-translation

2018-02-21 11:51:25 +01:00 · 2018-02-21 11:51:25 +01:00 · cbb98f7c60
parent 204429b8d5 ed511bec01
commit cbb98f7c60
20 changed files with 609 additions and 45 deletions
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@ -1,17 +1,11 @@
-<!-- Hello, and thanks for contributing! -->
-
-Fixes issue #
-
-Proposed changes in this pull request:
-
-
-





-<!--
+
+<!-- 
+Hello, and thanks for contributing!
 ## Contributors document
 Add yourself! When adding your information to the `CONTRIBUTORS.md` file, please use the following format:

@ -22,5 +16,4 @@ Where:
  * Text: Information about / kind of contribution 
 Example:
 * **[Nice Guy](http://niceguy.web)**<br/>~° German localization 
-
 -->
--- 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
--- 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
--- 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
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -57,7 +57,14 @@
            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>
--- 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() {
--- 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) {
--- a/app/src/main/res/drawable/ic_mode_edit_black_48px.xml
+++ b/app/src/main/res/drawable/ic_mode_edit_black_48px.xml
@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
--- a/app/src/main/res/drawable/sc_aspect.xml
+++ b/app/src/main/res/drawable/sc_aspect.xml
@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#cfcfcf"
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
+
+    <path
+        android:fillColor="#616161"
+        android:pathData="m 12,12 c 1.6575,0 3,-1.3425 3,-3 0,-1.6575 -1.3425,-3 -3,-3 -1.6575,0 -3,1.3425 -3,3 0,1.6575 1.3425,3 3,3 z m 0,1.5 c -2.0025,0 -6,1.005 -6,3 V 18 h 12 v -1.5 c 0,-1.995 -3.9975,-3 -6,-3 z" />
+
+</vector>
--- a/app/src/main/res/drawable/sc_edit.xml
+++ b/app/src/main/res/drawable/sc_edit.xml
@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#cfcfcf"
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
+
+
+    <path android:fillColor="#616161" android:pathData="M 6,15.500347 V 18 H 8.4996528 L 15.871962,10.627691 13.372309,8.128038 Z M 17.805027,8.694626 c 0.259964,-0.259964 0.259964,-0.679906 0,-0.93987 L 16.245244,6.1949729 c -0.259965,-0.2599639 -0.679906,-0.2599639 -0.93987,0 l -1.21983,1.2198301 2.499652,2.499653 z"/>
+
+
+</vector>
--- a/app/src/main/res/drawable/sc_history.xml
+++ b/app/src/main/res/drawable/sc_history.xml
@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#cfcfcf"
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
+
+
+    <path android:fillColor="#616161" android:pathData="M 12.857143,6.857143 C 10.017143,6.857143 7.7142857,9.16 7.7142857,12 H 6 l 2.2228571,2.222857 0.04,0.08 L 10.571429,12 H 8.8571429 c 0,-2.211429 1.7885711,-4 4.0000001,-4 2.211428,0 4,1.788571 4,4 0,2.211428 -1.788572,4 -4,4 -1.102857,0 -2.102857,-0.451429 -2.822857,-1.177143 l -0.8114289,0.811429 c 0.9314289,0.931428 2.2114289,1.508571 3.6342859,1.508571 C 15.697143,17.142857 18,14.84 18,12 18,9.16 15.697143,6.857143 12.857143,6.857143 Z m -0.571429,2.857143 v 2.857142 l 2.445715,1.451429 0.411428,-0.691429 -2,-1.188571 V 9.714286 Z"/>
+
+
+</vector>
--- a/app/src/main/res/drawable/sc_tags.xml
+++ b/app/src/main/res/drawable/sc_tags.xml
@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#cfcfcf"
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
+
+
+    <path android:fillColor="#616161" android:pathData="m 17.646,11.748 -5.4,-5.4 C 12.03,6.132 11.73,6 11.4,6 H 7.2 C 6.54,6 6,6.54 6,7.2 v 4.2 c 0,0.33 0.132,0.63 0.354,0.852 l 5.4,5.4 C 11.97,17.868 12.27,18 12.6,18 c 0.33,0 0.63,-0.132 0.846,-0.354 l 4.2,-4.2 C 17.868,13.23 18,12.93 18,12.6 18,12.27 17.862,11.964 17.646,11.748 Z M 8.1,9 C 7.602,9 7.2,8.598 7.2,8.1 7.2,7.602 7.602,7.2 8.1,7.2 8.598,7.2 9,7.602 9,8.1 9,8.598 8.598,9 8.1,9 Z"/>
+
+
+</vector>
--- 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
--- a/app/src/main/res/values-gl/strings-about.xml
+++ b/app/src/main/res/values-gl/strings-about.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 1º modificación en github-->
+<!-- editado con nano -->
 <resources>
  <string name="about_activity__title_about_app">Sobre</string>
  <string name="about_activity__title_about_license">Licenza</string>
--- a/app/src/main/res/values-gl/strings-preferences.xml
+++ b/app/src/main/res/values-gl/strings-preferences.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- actualizado en github -->
+<!-- Editado con nano -->
 <resources>
  <!-- Key Names (Untranslatable) -->
  <!-- Operability -->
@ -33,7 +33,7 @@
  <string name="pref_title__language">Idioma</string>
  <string name="language_system">Idioma do sistema</string>
  <!-- Font size -->
-  <string name="pref_desc__font_size">Estableza o tamaño do texto na VistaWeb</string>
+  <string name="pref_desc__font_size">Estableza o tamaño do texto na Vista Web</string>
  <string name="pref_title__font_size">Tamaño do texto</string>
  <string name="font_size_normal">Normal</string>
  <string name="font_size_large">Grande</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- actualiza galego (gl) -->
 <resources>
  <!-- Application -->
  <string name="reload">Actualizar</string>
@ -50,8 +49,13 @@
  <string name="action_exit_app">Saír do app</string>
  <string name="action_toggle_desktop_page">Vista móbil/escritorio</string>
  <string name="action_share_dotdotdot">Compartir&#8230;</string>
+<<<<<<< HEAD
  <string name="search_alert_tag">Etiquetas</string>
  <string name="search_alert_people">Persoas</string>
+=======
+  <string name="search_alert_tag">etiquetas</string>
+  <string name="search_alert_people">persoas</string>
+>>>>>>> gl-translation
  <string name="search_alert_bypeople_validate_needsomedata">Por favor engada un nome</string>
  <string name="context_menu_share_link">Compartir ligazón</string>
  <string name="context_menu_save_image">Gardar imaxe</string>
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@ -0,0 +1,73 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="sc_new_post"
+        android:enabled="true"
+        android:icon="@drawable/sc_edit"
+        android:shortcutShortLabel="@string/new_post"
+        android:shortcutLongLabel="@string/new_post"
+        android:shortcutDisabledMessage="@string/new_post">
+        <intent
+            android:action="sc_new_post"
+            android:targetPackage="com.github.dfa.diaspora_android"
+            android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the fragments is what the user sees when they
+             launch this shortcut. -->
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="sc_activities"
+        android:enabled="true"
+        android:icon="@drawable/sc_history"
+        android:shortcutShortLabel="@string/activities"
+        android:shortcutLongLabel="@string/activities"
+        android:shortcutDisabledMessage="@string/activities">
+        <intent
+            android:action="sc_activities"
+            android:targetPackage="com.github.dfa.diaspora_android"
+            android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the fragments is what the user sees when they
+             launch this shortcut. -->
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="sc_aspects"
+        android:enabled="true"
+        android:icon="@drawable/sc_aspect"
+        android:shortcutShortLabel="@string/aspects"
+        android:shortcutLongLabel="@string/aspects"
+        android:shortcutDisabledMessage="@string/aspects">
+        <intent
+            android:action="sc_aspects"
+            android:targetPackage="com.github.dfa.diaspora_android"
+            android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the fragments is what the user sees when they
+             launch this shortcut. -->
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="sc_nav_followed_tags"
+        android:enabled="true"
+        android:icon="@drawable/sc_tags"
+        android:shortcutShortLabel="@string/nav_followed_tags"
+        android:shortcutLongLabel="@string/nav_followed_tags"
+        android:shortcutDisabledMessage="@string/nav_followed_tags">
+        <intent
+            android:action="sc_nav_followed_tags"
+            android:targetPackage="com.github.dfa.diaspora_android"
+            android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
+        <!-- If your shortcut is associated with multiple intents, include them
+             here. The last intent in the fragments is what the user sees when they
+             launch this shortcut. -->
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+
+</shortcuts>
+        
+
--- 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()
 }
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@ -1,17 +1,18 @@
 <b>dandelion*</b> is a client for the community-run, distributed social network diaspora*.
-<br/>It adds useful features to your networking experience:
-<br/>
-<br/>⚡ Quick access to most diaspora* features
-<br/>👉 Share content to and from the app
-<br/>🌎 Proxy support
-<br/>📰 In-app-browser to view articles
-<br/>🎨 Customizeable colors
-<br/>🌆 Night/AMOLED mode
-<br/>🈴 Localized in many languages
-<br/>✔️ Allows system independent language
-<br/>
-<br/>
+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
+
+
 <b>Support the project:</b>
-<br/> ✋ <a href="https://crowdin.com/projects/gsantner">Translate</a>
-<br/> ✋ <a href="https://matrix.to/#/#dandelion:matrix.org">Join discussion on Matrix</a>
-<br/> ✋ <a href="https://github.com/diaspora-for-android/dandelion#contributions">More information about contributions</a>
+ ✋ <a href="https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fdiaspora-for-android%2Fdandelion.git">Translate using Stringlate</a>
+ ✋ <a href="https://matrix.to/#/#dandelion:matrix.org">Join discussion on Matrix</a>
+ ✋ <a href="https://github.com/diaspora-for-android/dandelion#contributions">More information about contributions</a>
+ ✋ <a href="http://gsantner.net/supportme?ref=dandelion&source=fdroid">Support main developer</a>
--- a/sc_edit.svg
+++ b/sc_edit.svg
@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="sc_edit.svg"
+   inkscape:export-filename="/home/juergen/Desktop/sc_edit.png"
+   inkscape:export-xdpi="144"
+   inkscape:export-ydpi="144">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000002"
+     inkscape:cx="-19.294902"
+     inkscape:cy="0.029871"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     fit-margin-top="2"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="2"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="699"
+     inkscape:window-x="0"
+     inkscape:window-y="33"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="false"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4138"
+       originx="79.999996"
+       originy="-27.999998" />
+    <sodipodi:guide
+       position="89.999996,-9.9999981"
+       orientation="0,1"
+       id="guide4140"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-25.999998"
+       orientation="0,1"
+       id="guide4142"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="81.999996,-17.999998"
+       orientation="1,0"
+       id="guide4144"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="79.999996,-27.999998"
+       orientation="0,20"
+       id="guide4146"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="99.999996,-27.999998"
+       orientation="-20,0"
+       id="guide4148"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="99.999996,-7.9999981"
+       orientation="0,-20"
+       id="guide4150"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="79.999996,-7.9999981"
+       orientation="20,0"
+       id="guide4152"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="97.999996,-17.999998"
+       orientation="1,0"
+       id="guide4154"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-17.999998"
+       orientation="-0.70710678,0.70710678"
+       id="guide4156"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="83.999996,-17.999998"
+       orientation="1,0"
+       id="guide4160"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="95.999996,-17.999998"
+       orientation="1,0"
+       id="guide4162"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-11.999998"
+       orientation="0,1"
+       id="guide4164"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-23.999998"
+       orientation="0,1"
+       id="guide4166"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-12.999998"
+       orientation="0,1"
+       id="guide4168"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="89.999996,-22.999998"
+       orientation="0,1"
+       id="guide4170"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="84.999996,-17.999998"
+       orientation="1,0"
+       id="guide4172"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="94.999996,-17.999998"
+       orientation="1,0"
+       id="guide4174"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <clipPath
+       id="clipPath12478"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle12480"
+         style="opacity:1;fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5790">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle5792"
+         style="opacity:1;fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       id="clipPath5055"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle5057"
+         style="opacity:1;fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5119">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle5121"
+         style="opacity:1;fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       id="clipPath5194"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle5196"
+         style="opacity:1;fill:#cddc39;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6175">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle6177"
+         style="opacity:1;fill:#f44336;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       id="clipPath7176"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle7178"
+         style="opacity:1;fill:#9c27b0;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8165">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle8167"
+         style="opacity:1;fill:#ffc107;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       id="clipPath9162"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle9164"
+         style="opacity:1;fill:#ff9800;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath10753">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle10755"
+         style="opacity:1;fill:#607d8b;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       id="clipPath5153"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="10"
+         cy="10.000005"
+         cx="9.9999781"
+         id="circle5155"
+         style="opacity:1;fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         inkscape:export-xdpi="648"
+         inkscape:export-ydpi="648" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6158">
+      <circle
+         inkscape:export-ydpi="648"
+         inkscape:export-xdpi="648"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         style="opacity:1;fill:#ff9800;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle6160"
+         cx="9.9999781"
+         cy="10.000005"
+         r="10" />
+    </clipPath>
+    <clipPath
+       id="clipPath5176"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         inkscape:export-ydpi="648"
+         inkscape:export-xdpi="648"
+         inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+         style="opacity:1;fill:#ff9800;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle5178"
+         cx="9.9999781"
+         cy="10.000005"
+         r="10" />
+    </clipPath>
+    <clipPath
+       id="clipPath4243"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4245"
+         d="m 5.9662132,10.012117 0,3.270369 3.8006988,1.723573 4.110058,-1.944544 -0.220971,-3.0935919 -3.6681162,1.8561549 z"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5197">
+      <circle
+         inkscape:export-ydpi="863.99994"
+         inkscape:export-xdpi="863.99994"
+         inkscape:export-filename="/home/juergen/Desktop/ic_launcher.png"
+         style="opacity:1;fill:#880e4f;fill-opacity:1;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle5199"
+         cx="9.9999781"
+         cy="10.000005"
+         r="10" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Hintergrund"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(1138.1428,-805.93365)">
+    <circle
+       r="10"
+       cy="871.93365"
+       cx="-1048.1428"
+       id="circle6153"
+       style="opacity:1;fill:#a00000;fill-opacity:0;stroke:none;stroke-width:0.05069799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:export-filename="/home/juergen/Schreibtisch/path4136.png"
+       inkscape:export-xdpi="648"
+       inkscape:export-ydpi="648" />
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Icon"
+     transform="translate(79.999996,55.999998)">
+    <path
+       d="m 3.9999777,4.0333382 12.0000003,0 0,11.9333328 -12.0000003,0 z"
+       id="path4"
+       inkscape:connector-curvature="0"
+       style="fill:none" />
+    <path
+       style="fill:none"
+       inkscape:connector-curvature="0"
+       id="path9754"
+       d="m 18.999978,19.033339 12,0 0,11.933333 -12,0 z" />
+    <circle
+       style="opacity:1;fill:#f5f5f5;fill-opacity:1;stroke:none"
+       id="path4186"
+       cx="-55.999996"
+       cy="-31.999998"
+       r="22" />
+    <path
+       id="path1091"
+       d="m -46.324951,-37.508955 c 0.433273,-0.433273 0.433273,-1.155395 0,-1.566449 l -2.599639,-2.599639 c -0.411054,-0.433273 -1.133176,-0.433273 -1.566449,0 l -2.04416,2.033051 4.166088,4.166088 m -17.630885,9.309818 v 4.166088 h 4.166088 l 12.287182,-12.298292 -4.166088,-4.166088 z"
+       inkscape:connector-curvature="0"
+       style="stroke-width:1.11095679;fill:#616161" />
+  </g>
+</svg>