Skip to content

Commit

Permalink
include new class 5g
Browse files Browse the repository at this point in the history
  • Loading branch information
@nstrelow
nstrelow committed Sep 25, 2014
1 parent 649c8bf commit bca2428
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 42 deletions.
42 changes: 31 additions & 11 deletions ShowcaseView/ShowcaseView.iml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="VPlan" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":ShowcaseView" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file:https://$MODULE_DIR$/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":ShowcaseView" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file:https://$MODULE_DIR$/build/intermediates/classes/debug" />
Expand All @@ -36,32 +37,51 @@
<sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
</component>
</module>
Expand Down
42 changes: 31 additions & 11 deletions ViewPagerIndicator/ViewPagerIndicator.iml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="VPlan" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":ViewPagerIndicator" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file:https://$MODULE_DIR$/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":ViewPagerIndicator" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file:https://$MODULE_DIR$/build/intermediates/classes/debug" />
Expand All @@ -36,32 +37,51 @@
<sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file:https://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file:https://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
</component>
</module>

4 changes: 2 additions & 2 deletions vplan/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 20
versionCode 305
versionName "3.0.5"
versionCode 310
versionName "3.1"
}

if (project.hasProperty("VPlan.signing")
Expand Down
10 changes: 5 additions & 5 deletions vplan/src/main/java/de/nilsstrelow/vplan/adapters/HourAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,19 @@ public View getView(final int position, View convertView, ViewGroup parent) {
if (entry.bemerkung.contains("Entfall") || entry.bemerkung.contains("eigenv.Arb.") || entry.bemerkung.contains("entfällt")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_entfall));
}
if (entry.bemerkung.contains("andr. Raum") || entry.bemerkung.contains("Raumaenderung")) {
else if (entry.bemerkung.contains("andr. Raum") || entry.bemerkung.contains("Raumaenderung")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_andraum));
}
if (entry.bemerkung.contains("Vertretung")) {
else if (entry.bemerkung.contains("Vertretung")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_vertretung));
}
if (entry.bemerkung.contains("Betreuung")) {
else if (entry.bemerkung.contains("Betreuung")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_betreuung));
}
if (entry.bemerkung.contains("Verlegung")) {
else if (entry.bemerkung.contains("Verlegung")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_verlegung));
}
if (entry.bemerkung.contains("Klausur")) {
else if (entry.bemerkung.contains("Klausur")) {
rowView.setBackgroundDrawable(parent.getResources().getDrawable(R.drawable.rectangle_klausur));
}

Expand Down
5 changes: 5 additions & 0 deletions vplan/src/main/res/values/arrays.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,39 @@
<item>5d</item>
<item>5e</item>
<item>5f</item>
<item>5g</item>
<item>6</item>
<item>6a</item>
<item>6b</item>
<item>6c</item>
<item>6d</item>
<item>6e</item>
<item>6f</item>
<item>6g</item>
<item>7</item>
<item>7a</item>
<item>7b</item>
<item>7c</item>
<item>7d</item>
<item>7e</item>
<item>7f</item>
<item>7g</item>
<item>8</item>
<item>8a</item>
<item>8b</item>
<item>8c</item>
<item>8d</item>
<item>8e</item>
<item>8f</item>
<item>8g</item>
<item>9</item>
<item>9a</item>
<item>9b</item>
<item>9c</item>
<item>9d</item>
<item>9e</item>
<item>9f</item>
<item>9g</item>
<item>10</item>
<item>11</item>
<item>12</item>
Expand Down
Loading

0 comments on commit bca2428

Please sign in to comment.