Skip to content
This repository has been archived by the owner on Feb 16, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
bishiboosh committed Nov 11, 2015
2 parents 0795009 + 4235399 commit 07544e3
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "org.toulibre.cdl"
minSdkVersion 7
targetSdkVersion 21
versionCode 2
versionName "1.3.2"
versionCode 3
versionName "1.3.3"
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/activated_background.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<item android:state_activated="true">
<shape>
<solid android:color="@color/fosdem_blue_translucent"/>
<solid android:color="@color/black_translucent"/>
</shape>
</item>
<item android:drawable="@android:color/transparent"/>
Expand Down
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<color name="color_primary">#a91991</color>
<color name="color_primary_dark">#76005e</color>
<color name="color_accent">#3479c4</color>
<color name="fosdem_blue_translucent">#663479c4</color>
<color name="secondary_text">#323232</color>
<color name="color_primary">#ff5722</color>
<color name="color_primary_dark">#E64a19</color>
<color name="color_accent">#000000</color>
<color name="black_translucent">#66000000</color>
<color name="secondary_text">#727272</color>
<color name="main_menu_background">#fffafafa</color>
<color name="translucent_grey">#0c000000</color>
<color name="schedule_time_background">#29000000</color>
Expand Down

0 comments on commit 07544e3

Please sign in to comment.