Skip to content

Commit

Permalink
Merge branch 'release/1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dotWee committed Feb 13, 2017
2 parents 29c8d45 + 4f23b6c commit 27fac33
Show file tree
Hide file tree
Showing 43 changed files with 830 additions and 632 deletions.
173 changes: 62 additions & 111 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
### Windows template
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk
# Created by .ignore support plugin (hsz.mobi)
### Gradle template
.gradle
/build/

# Ignore Gradle GUI config
Expand All @@ -31,6 +14,22 @@ gradle-app.setting

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
### Java template
*.class

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Android template
# Built application files
*.apk
Expand All @@ -40,7 +39,6 @@ gradle-app.setting
*.dex

# Java class files
*.class

# Generated files
bin/
Expand All @@ -67,6 +65,7 @@ proguard/
captures/

# Intellij
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/libraries
Expand All @@ -75,6 +74,34 @@ captures/
*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
### macOS template
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
Expand Down Expand Up @@ -115,98 +142,22 @@ com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
### Eclipse template

.metadata
tmp/
*.tmp
*.bak
*.swp
*~.nib
.settings/
.loadpath
.recommenders

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/
### Java template

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### macOS template
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

### Windows template
# Windows image file caches
Thumbs.db
ehthumbs.db

# Thumbnails
._*
# Folder config file
Desktop.ini

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Recycle Bin used on file shares
$RECYCLE.BIN/

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Intellij
*.iml
# Windows shortcuts
*.lnk
1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#### [Version v1.0 / February 13, 2017]
- sha1 checksum: *72a93ef322bdc9d979f9d0d9abefd90a61950c4b*
- changes:
- Initial Release
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Eine kleine native Android Applikation, welche den wöchentlichen Speiseplan von
## Features
+ Dynamisch änderbarer Standort und Wochentag
+ Speicherung des Speiseplans beim ersten Aufruf im internen Cache
+ Buntes Farbschema für den Speiseplan (siehe letzten Screenshots)
+ Buntes Farbschema für den Speiseplan (siehe Screenshots)
+ Wählbare Preisanzeige zwischen Student, Mitarbeiter, Gast und Generell
+ Beführung von Gerichten zeigt enthaltene (Allergene-) Inhaltsstoffe
+ Beschreibung von Gerichten zeigt enthaltene (Allergene-) Inhaltsstoffe

## Screenshots
<img src="art/default.png" height="400px"/>
Expand All @@ -25,7 +25,7 @@ Eine kleine native Android Applikation, welche den wöchentlichen Speiseplan von
## Todo
+ Wecken, wenn ein bestimmtes Gericht auf dem Speiseplan steht
+ Speiseplan von letzter Woche aus dem Cache löschen
+ Letzten Standort als Standard festlegen
+ ~~Letzten Standort als Standard festlegen~~
+ Backport zu Android 4.1 Jelly Bean (sdk16)
+ Implementierung von Instumental-Tests
+ Veröffentlichung im Google Play Store
Expand Down
Loading

0 comments on commit 27fac33

Please sign in to comment.