aboutsummaryrefslogtreecommitdiffstats
path: root/main/project
diff options
context:
space:
mode:
Diffstat (limited to 'main/project')
-rw-r--r--main/project/annotations/java/lang/annotations.xml7
-rw-r--r--main/project/annotations/java/util/annotations.xml7
-rw-r--r--main/project/annotations/org/apache/commons/lang3/annotations.xml34
-rw-r--r--main/project/eclipse installation/cgeo eclipse components.p2f77
-rw-r--r--main/project/libraries/.gitignore1
-rw-r--r--main/project/libraries/pom.xml203
-rwxr-xr-xmain/project/libraries/update-libs.sh31
-rw-r--r--main/project/rawimages/new-idea-modified.svg76
-rw-r--r--main/project/rawimages/noun_104277_cc.svg26
9 files changed, 446 insertions, 16 deletions
diff --git a/main/project/annotations/java/lang/annotations.xml b/main/project/annotations/java/lang/annotations.xml
new file mode 100644
index 0000000..0926f42
--- /dev/null
+++ b/main/project/annotations/java/lang/annotations.xml
@@ -0,0 +1,7 @@
+<root>
+ <item name='java.lang.String java.lang.String trim()'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;-&gt;!null&quot;" />
+ </annotation>
+ </item>
+</root> \ No newline at end of file
diff --git a/main/project/annotations/java/util/annotations.xml b/main/project/annotations/java/util/annotations.xml
new file mode 100644
index 0000000..854909b
--- /dev/null
+++ b/main/project/annotations/java/util/annotations.xml
@@ -0,0 +1,7 @@
+<root>
+ <item name='java.util.List java.lang.Object[] toArray()'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;-&gt;!null&quot;" />
+ </annotation>
+ </item>
+</root> \ No newline at end of file
diff --git a/main/project/annotations/org/apache/commons/lang3/annotations.xml b/main/project/annotations/org/apache/commons/lang3/annotations.xml
new file mode 100644
index 0000000..0ed3c67
--- /dev/null
+++ b/main/project/annotations/org/apache/commons/lang3/annotations.xml
@@ -0,0 +1,34 @@
+<root>
+ <item name='org.apache.commons.lang3.StringUtils boolean isNotBlank(java.lang.CharSequence)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null-&gt;false&quot;" />
+ </annotation>
+ </item>
+ <item
+ name='org.apache.commons.lang3.StringUtils boolean startsWith(java.lang.CharSequence, java.lang.CharSequence)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null,null-&gt;true;null,!null-&gt;false;!null,null-&gt;false&quot;" />
+ </annotation>
+ </item>
+ <item
+ name='org.apache.commons.lang3.StringUtils java.lang.String substringBetween(java.lang.String, java.lang.String, java.lang.String)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null,_,_-&gt;null;_,null,_-&gt;null;_,_,null-&gt;null&quot;" />
+ </annotation>
+ </item>
+ <item name='org.apache.commons.lang3.StringUtils java.lang.String trim(java.lang.String)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null-&gt;null;!null-&gt;!null&quot;" />
+ </annotation>
+ </item>
+ <item name='org.apache.commons.lang3.StringUtils java.lang.String upperCase(java.lang.String)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null-&gt;null;!null-&gt;!null&quot;" />
+ </annotation>
+ </item>
+ <item name='org.apache.commons.lang3.StringUtils java.lang.String[] split(java.lang.String)'>
+ <annotation name='org.jetbrains.annotations.Contract'>
+ <val val="&quot;null-&gt;null;!null-&gt;!null&quot;" />
+ </annotation>
+ </item>
+</root> \ No newline at end of file
diff --git a/main/project/eclipse installation/cgeo eclipse components.p2f b/main/project/eclipse installation/cgeo eclipse components.p2f
index f758e68..edac095 100644
--- a/main/project/eclipse installation/cgeo eclipse components.p2f
+++ b/main/project/eclipse installation/cgeo eclipse components.p2f
@@ -1,40 +1,95 @@
<?xml version='1.0' encoding='UTF-8'?>
<?p2f version='1.0.0'?>
<p2f version='1.0.0'>
- <ius size='7'>
- <iu id='com.android.ide.eclipse.ddms.feature.group' name='Android DDMS' version='22.2.1.v201309180102-833290'>
+ <ius size='18'>
+ <iu id='com.android.ide.eclipse.ddms.feature.feature.group' name='Android DDMS' version='23.0.4.1468518'>
<repositories size='1'>
<repository location='https://dl-ssl.google.com/android/eclipse/'/>
</repositories>
</iu>
- <iu id='com.android.ide.eclipse.adt.feature.group' name='Android Development Tools' version='22.2.1.v201309180102-833290'>
+ <iu id='com.android.ide.eclipse.adt.feature.feature.group' name='Android Development Tools' version='23.0.4.1468518'>
<repositories size='1'>
<repository location='https://dl-ssl.google.com/android/eclipse/'/>
</repositories>
</iu>
- <iu id='com.android.ide.eclipse.hierarchyviewer.feature.group' name='Android Hierarchy Viewer' version='22.2.1.v201309180102-833290'>
+ <iu id='com.android.ide.eclipse.hierarchyviewer.feature.feature.group' name='Android Hierarchy Viewer' version='23.0.4.1468518'>
<repositories size='1'>
<repository location='https://dl-ssl.google.com/android/eclipse/'/>
</repositories>
</iu>
- <iu id='com.android.ide.eclipse.traceview.feature.group' name='Android Traceview' version='22.2.1.v201309180102-833290'>
+ <iu id='com.android.ide.eclipse.traceview.feature.feature.group' name='Android Traceview' version='23.0.4.1468518'>
<repositories size='1'>
<repository location='https://dl-ssl.google.com/android/eclipse/'/>
</repositories>
</iu>
- <iu id='org.eclipse.mylyn.github.feature.feature.group' name='Eclipse GitHub integration with task focused interface' version='3.0.0.201306101825-r'>
+ <iu id='org.eclipse.recommenders.mylyn.rcp.feature.feature.group' name='Code Recommenders Mylyn Integration' version='2.1.9.v20140917-1240'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/kepler'/>
+ <repository location='http://download.eclipse.org/releases/luna'/>
</repositories>
</iu>
- <iu id='epp.package.java' name='Eclipse IDE for Java Developers' version='2.0.1.20130919-0803'>
+ <iu id='org.eclipse.recommenders.snipmatch.rcp.feature.feature.group' name='Code Recommenders Snipmatch' version='2.1.9.v20140917-1240'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/releases/kepler'/>
+ <repository location='http://download.eclipse.org/releases/luna'/>
</repositories>
</iu>
- <iu id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' name='FindBugs Feature' version='2.0.2.20121210'>
+ <iu id='org.eclipse.mylyn.github.feature.feature.group' name='Eclipse GitHub integration with task focused interface' version='3.5.0.201409260305-r'>
<repositories size='1'>
- <repository location='http://findbugs.cs.umd.edu/eclipse'/>
+ <repository location='http://download.eclipse.org/egit/github/updates'/>
+ </repositories>
+ </iu>
+ <iu id='epp.package.java' name='Eclipse IDE for Java Developers' version='4.4.1.20140925-1820'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/releases/luna'/>
+ </repositories>
+ </iu>
+ <iu id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' name='FindBugs Feature' version='3.0.0.20140706-2cfb468'>
+ <repositories size='1'>
+ <repository location='http://findbugs.cs.umd.edu/eclipse/'/>
+ </repositories>
+ </iu>
+ <iu id='com.genymobile.genymotion.ide.eclipse.feature.group' name='Genymotion Eclipse Tools' version='1.0.3.201403261147'>
+ <repositories size='1'>
+ <repository location='http://plugins.genymotion.com/eclipse'/>
+ </repositories>
+ </iu>
+ <iu id='org.springsource.ide.eclipse.gradle.feature.feature.group' name='Gradle IDE' version='3.6.1.201408250705-RELEASE'>
+ <repositories size='1'>
+ <repository location='http://dist.springsource.com/release/TOOLS/gradle'/>
+ </repositories>
+ </iu>
+ <iu id='org.eclipse.jgit.http.apache.feature.group' name='Java implementation of Git - optional Http support using Apache httpclient' version='3.5.0.201409260305-r'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/egit/updates'/>
+ </repositories>
+ </iu>
+ <iu id='org.eclipse.jgit.java7.feature.group' name='Java implementation of Git - optional Java 7 libraries' version='3.5.0.201409260305-r'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/egit/updates'/>
+ </repositories>
+ </iu>
+ <iu id='org.eclipse.wst.jsdt.feature.feature.group' name='JavaScript Development Tools' version='1.6.100.v201409111605'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/releases/luna'/>
+ </repositories>
+ </iu>
+ <iu id='markdown.editor.feature.feature.group' name='Markdown Editor' version='0.2.3'>
+ <repositories size='1'>
+ <repository location='http://www.winterwell.com/software/updatesite/'/>
+ </repositories>
+ </iu>
+ <iu id='org.moreunit.feature.group' name='MoreUnit For Java' version='3.0.4'>
+ <repositories size='1'>
+ <repository location='http://moreunit.sourceforge.net/update-site/'/>
+ </repositories>
+ </iu>
+ <iu id='org.projectusus.feature.group' name='Project Usus' version='0.7.4.201401122006'>
+ <repositories size='1'>
+ <repository location='http://projectusus.googlecode.com/svn/updates/'/>
+ </repositories>
+ </iu>
+ <iu id='com.android.ide.eclipse.gldebugger.feature.feature.group' name='Tracer for OpenGL ES' version='23.0.4.1468518'>
+ <repositories size='1'>
+ <repository location='https://dl-ssl.google.com/android/eclipse/'/>
</repositories>
</iu>
</ius>
diff --git a/main/project/libraries/.gitignore b/main/project/libraries/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/main/project/libraries/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/main/project/libraries/pom.xml b/main/project/libraries/pom.xml
new file mode 100644
index 0000000..b59d4af
--- /dev/null
+++ b/main/project/libraries/pom.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.cgeo</groupId>
+ <artifactId>library.check</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>c:geo dependency update check</name>
+
+ <description>This project checks or updates c:geo dependencies.
+ Run 'mvn validate' to see available dependency updates.
+ Run 'mvn install' to actually update to the latest releases. You may need to refresh your IDE afterwards.
+ </description>
+
+ <properties>
+ <AndroidAnnotationsVersion>3.2</AndroidAnnotationsVersion>
+
+ <ButterKnifeVersion>6.1.0</ButterKnifeVersion>
+
+ <CommonsCollections4Version>4.0</CommonsCollections4Version>
+ <CommonsIoVersion>2.4</CommonsIoVersion>
+ <CommonsLang3Version>3.3.2</CommonsLang3Version>
+
+ <FindbugsAnnotationsVersion>3.0.0</FindbugsAnnotationsVersion>
+
+ <JacksonAnnotationsVersion>2.5.1</JacksonAnnotationsVersion>
+ <JacksonCoreVersion>2.5.1</JacksonCoreVersion>
+ <JacksonDatabindVersion>2.5.1</JacksonDatabindVersion>
+
+ <RXAndroidVersion>0.24.0</RXAndroidVersion>
+ <RXJavaVersion>1.0.7</RXJavaVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.androidannotations</groupId>
+ <artifactId>androidannotations</artifactId>
+ <version>${AndroidAnnotationsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.androidannotations</groupId>
+ <artifactId>androidannotations-api</artifactId>
+ <version>${AndroidAnnotationsVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jakewharton</groupId>
+ <artifactId>butterknife</artifactId>
+ <version>${ButterKnifeVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${CommonsCollections4Version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${CommonsLang3Version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${CommonsIoVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${FindbugsAnnotationsVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${JacksonAnnotationsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${JacksonCoreVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${JacksonDatabindVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.reactivex</groupId>
+ <artifactId>rxjava</artifactId>
+ <version>${RXJavaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.reactivex</groupId>
+ <artifactId>rxandroid</artifactId>
+ <version>${RXAndroidVersion}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>display-property-updates</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>display-property-updates</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>update-properties</id>
+ <phase>package</phase>
+ <goals>
+ <goal>update-properties</goal>
+ </goals>
+ <configuration>
+ <allowSnapshots>false</allowSnapshots>
+ <allowMajorUpdates>true</allowMajorUpdates>
+ <allowMinorUpdates>true</allowMinorUpdates>
+ <generateBackupPoms>true</generateBackupPoms>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/../../libs</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>sources</classifier>
+ <outputDirectory>${basedir}/../../libs/src</outputDirectory>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ <overWriteReleases>true</overWriteReleases>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>javadoc-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <classifier>javadoc</classifier>
+ <outputDirectory>${basedir}/../../libs/src</outputDirectory>
+ <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+ <overWriteReleases>true</overWriteReleases>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- unfinished: update properties files of source and javadoc
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>write-properties-files</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ </plugins>
+ </build>
+</project>
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index f2e9ced..4c66254 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -1,7 +1,14 @@
#! /bin/sh
#
-RXJAVA=0.19.6
+RXJAVA=1.0.8
+RXANDROID=0.24.0
+JACKSONCORE=2.5.1
+JACKSONDATABIND=2.5.1
+JACKSONANNOTATIONS=2.5.1
+COMMONSCOLLECTIONS4=4.0
+COMMONSLANG3=3.3.2
+COMMONSIO=2.4
cd $(git rev-parse --show-toplevel)/main/libs
@@ -27,7 +34,21 @@ fixgradle() {
sed -i "/def $var =/s/.*/def $var = '$version'/" ../build.gradle
}
-updatelib com/netflix/rxjava rxjava-core $RXJAVA
-updatelib com/netflix/rxjava rxjava-android $RXJAVA
-updatelib com/netflix/rxjava rxjava-async-util $RXJAVA
-fixgradle RXVersion $RXJAVA
+updatelib io/reactivex rxjava $RXJAVA
+fixgradle RXJavaVersion $RXJAVA
+updatelib io/reactivex rxandroid $RXANDROID
+fixgradle RXAndroidVersion $RXANDROID
+
+updatelib com/fasterxml/jackson/core jackson-core $JACKSONCORE
+fixgradle JacksonCoreVersion $JACKSONCORE
+updatelib com/fasterxml/jackson/core jackson-databind $JACKSONDATABIND
+fixgradle JacksonDatabindVersion $JACKSONDATABIND
+updatelib com/fasterxml/jackson/core jackson-annotations $JACKSONANNOTATIONS
+fixgradle JacksonAnnotationsVersion $JACKSONANNOTATIONS
+
+updatelib org/apache/commons commons-collections4 $COMMONSCOLLECTIONS4
+fixgradle CommonsCollections4Version $COMMONSCOLLECTIONS4
+updatelib org/apache/commons commons-lang3 $COMMONSLANG3
+fixgradle CommonsLang3Version $COMMONSLANG3
+updatelib commons-io commons-io $COMMONSIO
+fixgradle CommonsIoVersion $COMMONSIO
diff --git a/main/project/rawimages/new-idea-modified.svg b/main/project/rawimages/new-idea-modified.svg
new file mode 100644
index 0000000..71e0966
--- /dev/null
+++ b/main/project/rawimages/new-idea-modified.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+ 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"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="4.5 -9.0 90.0 121.5"
+ enable-background="new 0 0 90 90"
+ xml:space="preserve"
+ height="100px"
+ width="100px"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="new-idea-modified.svg"
+ inkscape:export-filename="/home/rainer/Desktop/dev/android/cgeo_os/c-geo-opensource/main/project/rawimages/ic_menu_hint.png"
+ inkscape:export-xdpi="39.369999"
+ inkscape:export-ydpi="39.369999"><metadata
+ id="metadata37"><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><defs
+ id="defs35" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1878"
+ inkscape:window-height="1060"
+ id="namedview33"
+ showgrid="false"
+ inkscape:zoom="2.36"
+ inkscape:cx="-0.42372881"
+ inkscape:cy="50"
+ inkscape:window-x="-2"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><switch
+ id="switch4"
+ transform="translate(6.1779661,6.1779661)"><foreignObject
+ requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+ x="0"
+ y="0"
+ width="1"
+ height="1"
+ id="foreignObject6" /><g
+ i:extraneous="self"
+ id="g8"><g
+ id="Слой_1"><g
+ id="g11"><path
+ d="M 39,68.1 C 23.9,68.1 11.7,55.2 11.7,39.3 11.7,23.4 23.9,10.5 39,10.5 c 15.1,0 27.3,12.9 27.3,28.8 0,15.9 -12.2,28.8 -27.3,28.8 z m 0,-52.6 c -12.3,0 -22.3,10.7 -22.3,23.8 0,13.1 10,23.8 22.3,23.8 12.3,0 22.3,-10.7 22.3,-23.8 0,-13.1 -10,-23.8 -22.3,-23.8 z"
+ id="path13"
+ inkscape:connector-curvature="0" /></g><g
+ id="g15"><path
+ d="M 2.8,89.7 C 2.5,89.7 2.2,89.6 1.9,89.5 0.6,89 0,87.5 0.5,86.3 3.6,78.5 8.9,72 15.8,67.3 l 1.5,-1 1.4,1.1 c 6.3,4.6 13.7,7.1 21.6,7.1 7.3,0 14.4,-2.2 20.4,-6.3 l 1.5,-1 1.4,1.1 c 6.3,4.6 11.1,10.9 14,18.1 0.5,1.3 -0.1,2.7 -1.4,3.2 -1.3,0.5 -2.7,-0.1 -3.2,-1.4 -2.3,-5.8 -6.1,-11 -10.9,-14.9 -6.5,4 -14,6.2 -21.7,6.2 -8.3,0 -16.2,-2.4 -23,-7 C 12,76.5 7.9,82 5.3,88.3 4.7,89.1 3.8,89.7 2.8,89.7 z"
+ id="path17"
+ inkscape:connector-curvature="0" /></g><g
+ id="g19"><path
+ d="M 81.6,37.5 H 74.5 C 73.7,37.5 73,36.8 73,36 c 0,-0.8 0.7,-1.5 1.5,-1.5 h 7.1 c 0.8,0 1.5,0.7 1.5,1.5 0,0.8 -0.7,1.5 -1.5,1.5 z"
+ id="path21"
+ inkscape:connector-curvature="0" /></g><g
+ id="g23"><path
+ d="m 79.3,31.9 h -2 c -2.7,0 -4.8,-2.2 -4.8,-4.8 V 22.4 C 68.9,20.3 67,17.1 67,13 67,6.4 72,1 78.1,1 c 6.1,0 11.1,5.4 11.1,12 0,3.8 -1.7,6.9 -5,9.1 v 5.1 c -0.1,2.5 -2.3,4.7 -4.9,4.7 z M 78,4.9 c -3.9,0 -7.1,3.6 -7.1,8 0,3 1.4,5 4.3,6.4 l 1.1,0.5 V 27 c 0,0.4 0.4,0.8 0.8,0.8 h 2 c 0.4,0 0.8,-0.4 0.8,-0.8 v -7.3 l 1,-0.6 c 2.7,-1.5 3.9,-3.4 3.9,-6.2 0.3,-4.4 -2.9,-8 -6.8,-8 z"
+ id="path25"
+ inkscape:connector-curvature="0" /></g></g><g
+ id="Слой_2" /><g
+ id="Слой_3" /></g></switch></svg> \ No newline at end of file
diff --git a/main/project/rawimages/noun_104277_cc.svg b/main/project/rawimages/noun_104277_cc.svg
new file mode 100644
index 0000000..cf0efbb
--- /dev/null
+++ b/main/project/rawimages/noun_104277_cc.svg
@@ -0,0 +1,26 @@
+<svg xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="4.5 -9.0 90.0 121.5" enable-background="new 0 0 90 90" xml:space="preserve" height="100px" width="100px">
+<switch>
+ <foreignObject requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" x="0" y="0" width="1" height="1">
+ </foreignObject>
+ <g i:extraneous="self">
+ <g id="&#1057;&#1083;&#1086;&#1081;_1">
+ <g>
+ <path d="M39,68.1c-15.1,0-27.3-12.9-27.3-28.8S23.9,10.5,39,10.5c15.1,0,27.3,12.9,27.3,28.8S54.1,68.1,39,68.1z M39,15.5 c-12.3,0-22.3,10.7-22.3,23.8c0,13.1,10,23.8,22.3,23.8c12.3,0,22.3-10.7,22.3-23.8C61.3,26.2,51.3,15.5,39,15.5z"/>
+ </g>
+ <g>
+ <path d="M2.8,89.7c-0.3,0-0.6-0.1-0.9-0.2c-1.3-0.5-1.9-2-1.4-3.2c3.1-7.8,8.4-14.3,15.3-19l1.5-1l1.4,1.1 c6.3,4.6,13.7,7.1,21.6,7.1c7.3,0,14.4-2.2,20.4-6.3l1.5-1l1.4,1.1c6.3,4.6,11.1,10.9,14,18.1c0.5,1.3-0.1,2.7-1.4,3.2 c-1.3,0.5-2.7-0.1-3.2-1.4c-2.3-5.8-6.1-11-10.9-14.9c-6.5,4-14,6.2-21.7,6.2c-8.3,0-16.2-2.4-23-7c-5.4,4-9.5,9.5-12.1,15.8 C4.7,89.1,3.8,89.7,2.8,89.7z"/>
+ </g>
+ <g>
+ <path d="M81.6,37.5h-7.1c-0.8,0-1.5-0.7-1.5-1.5s0.7-1.5,1.5-1.5h7.1c0.8,0,1.5,0.7,1.5,1.5S82.4,37.5,81.6,37.5z"/>
+ </g>
+ <g>
+ <path d="M79.3,31.9h-2c-2.7,0-4.8-2.2-4.8-4.8v-4.7c-3.6-2.1-5.5-5.3-5.5-9.4c0-6.6,5-12,11.1-12s11.1,5.4,11.1,12 c0,3.8-1.7,6.9-5,9.1v5.1C84.1,29.7,81.9,31.9,79.3,31.9z M78,4.9c-3.9,0-7.1,3.6-7.1,8c0,3,1.4,5,4.3,6.4l1.1,0.5v7.2 c0,0.4,0.4,0.8,0.8,0.8h2c0.4,0,0.8-0.4,0.8-0.8v-7.3l1-0.6c2.7-1.5,3.9-3.4,3.9-6.2C85.1,8.5,81.9,4.9,78,4.9z"/>
+ </g>
+ </g>
+ <g id="&#1057;&#1083;&#1086;&#1081;_2">
+ </g>
+ <g id="&#1057;&#1083;&#1086;&#1081;_3">
+ </g>
+ </g>
+</switch>
+<text x="0.0" y="105.75" font-size="4.5" font-weight="bold" font-family="Helvetica Neue, Helvetica, Arial-Unicode, Arial, Sans-serif" fill="#000000">Created by Artem Korotkikh</text><text x="0.0" y="110.25" font-size="4.5" font-weight="bold" font-family="Helvetica Neue, Helvetica, Arial-Unicode, Arial, Sans-serif" fill="#000000">from the Noun Project</text></svg> \ No newline at end of file