From 5332ef4e3465df493fbd14eb7964188a901aaf28 Mon Sep 17 00:00:00 2001 From: fstaubach Date: Fri, 30 Dec 2016 14:56:31 +0100 Subject: [PATCH 1/5] Create README.md added global readme --- README.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..87ab36a --- /dev/null +++ b/README.md @@ -0,0 +1,55 @@ +## Overview + +### Privacy Friendly Werewolf + +Privacy Friendly Werewolf is an open source Android implementation of the famous Werewolf card game. You can play it with your friends inside a distributed network so that everyone can use its own phone without the need of a game master. The is build to respect your privacy by only demanding as less permissions as possible and not including any tracking algorithms. + + +## Motivation + +Nowadays there are many apps that require many or all permissions available in Android in order to be installed. However these apps do not always need all of the permissions they ask for. With this project we want to offer an app where the user can be sure that private information such as contacts, location, identity etc., are not being used by the application. This app is part of the Privacy Friendly Apps group develop by Technische Universität Darmstadt, Germany. More information can be found under https://secuso.org/pfa + +## Download and more Information + +The application is currently under development. It will be released starting April 2017. + +###Building + +The app can be installed by using IntelliJ or Android Studio (we recommend to use version 2.2.2 or higher). + +1. Download the source code: $ git clone https://github.com/SecUSo/privacy-friendly-werewolf.git +2. Add the local.properties and the build.properties file to the root by removing the extension ".copy" from "local.properties.copy" and "build.gradle.copy" +3. Open the IDE of your choice +4. Connect the mobile device to the computer +5. Setup a Run Configuration "Android Application" and select "app" under Module +6. Click run and select "Choose a running device" from the "Device Chooser" Dialog + +### API Reference + +Mininum SDK: 17 +Target SDK: 24 + +## License + +Copyright 2016 by Daniel Gölz, Tobias Kowalski and Florian Staubach + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The icons used in the nagivation drawer are licensed under the [CC BY 2.5] (http://creativecommons.org/licenses/by/2.5/). In addition to them the app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the header in the navigation drawer and the splash screen icon) copyright [Technische Universtität Darmstadt] (www.tu-darmstadt.de) (2016). The logo used for the notifications is part of the main logo of Privacy Friendly Shopping List. + +## Contributors + +App-Icon:
+Florian Staubach
+ +Github-Users:
+Daniel Gölz
+Tobias Kowalski
+Florian Staubach
+Christopher Beckmann
+Karola Marky
+Peter Mayer From 48174f774014c3e2ab688841afe50691956899a9 Mon Sep 17 00:00:00 2001 From: fstaubach Date: Sat, 31 Dec 2016 09:44:35 +0100 Subject: [PATCH 2/5] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..27a95c4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright 2017 by Daniel Gölz, Tobias Kowalski and Florian Staubach + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From a592f6d2355e0d42c9564b6ffa7d25fb54e97bd9 Mon Sep 17 00:00:00 2001 From: fstaubach Date: Sat, 21 Jan 2017 12:59:12 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87ab36a..7c9955d 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Target SDK: 24 ## License -Copyright 2016 by Daniel Gölz, Tobias Kowalski and Florian Staubach +Copyright 2017 by Daniel Gölz, Tobias Kowalski and Florian Staubach Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -39,7 +39,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -The icons used in the nagivation drawer are licensed under the [CC BY 2.5] (http://creativecommons.org/licenses/by/2.5/). In addition to them the app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the header in the navigation drawer and the splash screen icon) copyright [Technische Universtität Darmstadt] (www.tu-darmstadt.de) (2016). The logo used for the notifications is part of the main logo of Privacy Friendly Shopping List. +The icons used in the nagivation drawer are licensed under the [CC BY 2.5] (http://creativecommons.org/licenses/by/2.5/). In addition to them the app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the header in the navigation drawer and the splash screen icon) copyright [Technische Universtität Darmstadt] (www.tu-darmstadt.de) (2016). The logo used for the notifications is part of the main logo of Privacy Friendly Werewolf. ## Contributors From 9a14102cd2f5d835a5c384dedea24ac4a6675de9 Mon Sep 17 00:00:00 2001 From: fstaubach Date: Sun, 19 Feb 2017 21:37:24 +0100 Subject: [PATCH 4/5] changed app name, fixes #68, removed camera persmission, fixed #40 --- .idea/misc.xml | 2 +- app/build.gradle | 4 ++-- .../helpers/QrCodeFactory.java | 16 ---------------- app/src/main/res/values-de/strings.xml | 12 +++++++++++- app/src/main/res/values/strings.xml | 4 ++-- 5 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 app/src/main/java/org/secuso/privacyfriendlywerwolf/helpers/QrCodeFactory.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..cca2cda 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 124a21f..22fabfe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,8 +45,8 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:design:24.0.0' compile 'com.android.support:support-v4:24.0.0' - compile 'com.journeyapps:zxing-android-embedded:3.4.0' - compile 'com.github.kenglxn.QRGen:android:2.2.0' + // compile 'com.journeyapps:zxing-android-embedded:3.4.0' + // compile 'com.github.kenglxn.QRGen:android:2.2.0' compile 'com.koushikdutta.async:androidasync:2.+' compile 'com.google.code.gson:gson:2.8.0' compile 'com.google.android.gms:play-services-appindexing:8.4.0' diff --git a/app/src/main/java/org/secuso/privacyfriendlywerwolf/helpers/QrCodeFactory.java b/app/src/main/java/org/secuso/privacyfriendlywerwolf/helpers/QrCodeFactory.java deleted file mode 100644 index acfd04b..0000000 --- a/app/src/main/java/org/secuso/privacyfriendlywerwolf/helpers/QrCodeFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.secuso.privacyfriendlywerwolf.helpers; - -import android.graphics.Bitmap; - -import com.google.zxing.BarcodeFormat; - -/** - * Description of the file - * - * @author Florian Staubach - */ - -public class QrCodeFactory { - - -} diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9057bbc..0110a6c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ - Privacy Friendly Werwolf + Werwolf Über In Kooperation mit Autoren: @@ -98,4 +98,14 @@ Abbrechen Du bist nun mit dem Server verbunden. Warte bis das Spiel beginnt. Timer + Spiel abbrechen? + Wenn das Spiel beendet wird, werden alle aktuellen Informationen zum Spielstatus verloren gehen. Soll das Spiel wirklich beendet werden? + Spiel beenden? + Du hast den Zurückbutton gedrückt. Damit wird das Spiel beendet, sodass du dem aktuellen Spiel nicht mehr beitreten kannst. Bist du sicher? + Heiltrank einsetzen? + "In dieser Runde wurde der folgende Spieler von den Werwölfen getötet: " + Möchtest du diesen Spieler mit deinem Heiltrank retten? + Giftrank einsetzen? + Möchtest du deinen Gifttrank einsetzen um einen Spieler zu töten? Wähle den Spieler. + Gib deine Nachricht ein: \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bfc532d..96e3d35 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Privacy Friendly Werewolf + Werewolf Privacy Friendly Werewolf Privacy Friendly @@ -135,7 +135,7 @@ Ne albucius perfecto adolescens eum, id choro assueverit mea, sed viris constitu Starting the Game. Prepare yourself! The game has started! Look at your role and prepare yourself! - Type Your Message : + "Type Your Message: " Name your Player Please specifiy your player name. You will be the game host and the game master with special priviledges. The night demanded a tribute From 8e0b17c66d084231d5960511cb7620dd1f6aaa6e Mon Sep 17 00:00:00 2001 From: TKowalski Date: Sat, 4 Mar 2017 10:51:37 +0100 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c9955d..018bcce 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The app can be installed by using IntelliJ or Android Studio (we recommend to us ### API Reference Mininum SDK: 17 -Target SDK: 24 +Target SDK: 25 ## License