Merge pull request #69 from mananwason/new_details

Data download, swipe to refresh, Time displayed acc. to user's timezone, UI changes, bug fixes
fossasia · Aug 11, 2015 · 1c5beb7 · 1c5beb7
2 parents bd1438a + 9ac718e
commit 1c5beb7
Show file tree

Hide file tree

Showing 75 changed files with 1,191 additions and 313 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,15 +47,16 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'com.android.support:support-v4:21.+'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.android.support:cardview-v7:22.2.0'
     compile 'com.android.support:recyclerview-v7:22.2.0'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.squareup.okhttp:okhttp:2.0.0'
     compile 'com.squareup.retrofit:retrofit:1.9.0'
     compile 'com.android.support:design:22.2.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.squareup:otto:1.3.8'
 
     googleplayCompile 'com.google.android.gms:play-services-maps:7.5.0'
 
@@ -65,5 +66,12 @@ dependencies {
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
     androidTestCompile 'com.android.support.test:runner:0.3'
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2'
-}
+    androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+    }
+    androidTestCompile 'com.android.support.test:rules:0.3'
+    androidTestCompile "org.mockito:mockito-core:1.+"
+
+}
diff --git a/app/src/androidTest/java/org/fossasia/openevent/SpeakerInsertTest.java b/app/src/androidTest/java/org/fossasia/openevent/SpeakerInsertTest.java
@@ -60,9 +60,9 @@ protected void setUp() throws Exception {
         twitter = "twitter.com/mananwason9";
         facebook = "facebook.com/manan";
         github = "github.com/mananwason";
-        linkedin = "";
+        linkedin = "linkedin.com/mananwason";
         organisation = "fossasia";
-        position = "student";
+        position = "gsoc student";
         session = null;
         country = "india";
 

diff --git a/app/src/androidTest/java/org/fossasia/openevent/SponsorInsertTest.java b/app/src/androidTest/java/org/fossasia/openevent/SponsorInsertTest.java
@@ -28,8 +28,8 @@ protected void setUp() throws Exception {
 
 
         id = 1;
-        name = "Android";
-        url = "www.android.com";
+        name = "Google";
+        url = "www.google.com";
         logo = "http://www.theverge.com/2014/6/25/5842024/googles-android-logo-gets-a-new-look";
 
         ContentValues contentValues = new ContentValues();

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     package="org.fossasia.openevent"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
@@ -14,17 +13,18 @@
         android:theme="@style/Base.AppTheme">
         <activity
             android:name=".activities.SplashActivity"
-            android:label="Splash"/>
-
-        <activity
-            android:name=".activities.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".activities.MainActivity"
+            android:label="@string/app_name">
+        </activity>
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/action_settings"/>

diff --git a/app/src/main/java/org/fossasia/openevent/OpenEventApp.java b/app/src/main/java/org/fossasia/openevent/OpenEventApp.java
@@ -1,6 +1,10 @@
 package org.fossasia.openevent;
 
 import android.app.Application;
+import android.os.Handler;
+import android.os.Looper;
+
+import com.squareup.otto.Bus;
 
 import org.fossasia.openevent.dbutils.DbSingleton;
 import org.fossasia.openevent.modules.MapModuleFactory;
@@ -11,8 +15,25 @@
  */
 public class OpenEventApp extends Application {
 
+    private static Bus sEventBus;
     MapModuleFactory mapModuleFactory;
 
+    public static Bus getEventBus() {
+        if (sEventBus == null) {
+            sEventBus = new Bus();
+        }
+        return sEventBus;
+    }
+
+    public static void postEventOnUIThread(final Object event) {
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                getEventBus().post(event);
+            }
+        });
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();