Merge branch 'release'

README.md

@@ -1,12 +1,6 @@
-# FOSDEM Companion
+# CDL Companion
 
-Advanced native Android schedule browser application for the [FOSDEM](http://fosdem.org/) conference in Brussels, Belgium.
-
-This is a new implementation of the [legacy FOSDEM app](https://github.com/rkallensee/fosdem-android/). The code has been rewritten from scratch and the features have been extended. It uses loaders and fragments extensively and is backward compatible up to Android 2.1 thanks to the support library.
-
-To get more information and install the app, look at the [Google Play Store](https://play.google.com/store/apps/details?id=be.digitalia.fosdem) page.
-
-The name FOSDEM and the gear logo are registered trademarks of FOSDEM VZW. Used with permission.
+Advanced native Android schedule browser application for the [Capitole du Libre](https://2015.capitoledulibre.org/) conference in Toulouse, France.
 
 ## How to build
 
@@ -31,3 +25,4 @@ The result apk file will be placed in ```app/build/outputs/apk/```.
 ## Contributors
 
 * Christophe Beyls
+* Valentin Rocher

app/build.gradle

@@ -5,9 +5,11 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        applicationId "be.digitalia.fosdem"
+        applicationId "org.toulibre.cdl"
         minSdkVersion 7
         targetSdkVersion 21
+        versionCode 2
+        versionName "1.0"
     }
 
     buildTypes {
@@ -19,8 +21,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:21.0.+'
-    compile 'com.android.support:cardview-v7:21.0.+'
-    // Version 1.2.3 has a bug and crashes when detecting 2-finger gestures. Use 1.2.2 instead.
-    compile 'com.github.chrisbanes.photoview:library:1.2.2'
+    compile 'com.android.support:appcompat-v7:21.+'
+    compile 'com.android.support:cardview-v7:21.+'
+    compile 'com.commit451:PhotoView:1.2.4'
 }

app/src/main/AndroidManifest.xml

@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="be.digitalia.fosdem"
+    package="org.toulibre.cdl"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="auto"
-    android:versionCode="700131"
-    android:versionName="1.3.1">
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="21"/>
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.NFC"/>
@@ -24,7 +18,7 @@
         android:required="false"/>
 
     <application
-        android:name="be.digitalia.fosdem.FosdemApplication"
+        android:name=".CdlApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
@@ -109,7 +103,7 @@
 
         <provider
             android:name=".providers.SearchSuggestionProvider"
-            android:authorities="be.digitalia.fosdem.search"
+            android:authorities="org.toulibre.cdl.search"
             android:exported="true"/>
     </application>