diff --git a/README.md b/README.md index 6558059..ea80be4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Privacy Friendly App Example -This application contains the basic design of a Privacy Friendly App without any other functionality. It includes a Navigation Drawer, examples for buttons, a help page and the about page. It further shows an example of the main menu for a Privacy Friendly Game App. +This application contains the basic design of a Privacy Friendly App without any other functionality. It includes a Navigation Drawer, examples for buttons, a help page and the about page. It further shows an example of the main menu for a Privacy Friendly Game App. This app belongs to the group of Privacy Friendly Apps developed by the Technische Universität Darmstadt. ## Motivation @@ -17,7 +17,7 @@ Target SDK: 23 ## License -Privacy Friendly App example is licensed under the GPLv3. The icons used in the nagivation drawer are licensed under the CC BY 2.5 (http://creativecommons.org/licenses/by/2.5/). +Privacy Friendly App Example is licensed under the GPLv3. The icons used in the nagivation drawer are licensed under the CC BY 2.5 (http://creativecommons.org/licenses/by/2.5/). All other images (the logo of Privacy Friendly Apps, the SECUSO logo and the header in the navigation drawer) copyright Technische Universtität Darmstadt (2016). ## Contributors diff --git a/app/build.gradle b/app/build.gradle index efb459a..f4960cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.secuso.example" minSdkVersion 17 targetSdkVersion 23 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.6" } buildTypes { release { diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 076ae47..1f3425b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,120 +1,128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1fee009..92b4179 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,9 +4,13 @@ #024265 #0274B2 #00000000 - #A8A8A8 #ffffff - #f6d126 #000000 + #0274B2 #8aa5ce + #024265 + #A8A8A8 + #f6d126 + #B71C1C + #388E3C diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b3c2f79..7eb6e65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,16 +46,17 @@ About - Version 1.5 + Version 1.6 Authors: Karola Marky and contributors. In affiliation with - This application belongs to the group of Privacy Friendly Apps developed by Technische Universität Darmstadt. + This application belongs to the group of Privacy Friendly Apps developed by Technische Universität Darmstadt. Sourcecode licensed under GPLv3. Images copyright TU Darmstadt and Google Inc. More information can be found on: - https://www.secuso.org/pfa + Github-Repo + SECUSO-Website - + Settings General Example Switch diff --git a/build.gradle b/build.gradle index aff4f41..77ce66e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dc..3cbac4c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu Aug 18 14:46:12 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip