Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.

Commit 1c5beb7

Browse files
committed
Merge pull request #69 from mananwason/new_details
Data download, swipe to refresh, Time displayed acc. to user's timezone, UI changes, bug fixes
2 parents bd1438a + 9ac718e commit 1c5beb7

File tree

75 files changed

+1191
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1191
-313
lines changed

app/build.gradle

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ android {
4747

4848
dependencies {
4949
compile fileTree(dir: 'libs', include: ['*.jar'])
50-
compile 'com.android.support:appcompat-v7:21.+'
51-
compile 'com.android.support:support-v4:21.+'
50+
compile 'com.android.support:appcompat-v7:22.2.0'
51+
compile 'com.android.support:support-v4:22.2.0'
5252
compile 'com.android.support:cardview-v7:22.2.0'
5353
compile 'com.android.support:recyclerview-v7:22.2.0'
5454
compile 'com.google.code.gson:gson:2.3.1'
5555
compile 'com.squareup.okhttp:okhttp:2.0.0'
5656
compile 'com.squareup.retrofit:retrofit:1.9.0'
5757
compile 'com.android.support:design:22.2.0'
5858
compile 'com.squareup.picasso:picasso:2.5.2'
59+
compile 'com.squareup:otto:1.3.8'
5960

6061
googleplayCompile 'com.google.android.gms:play-services-maps:7.5.0'
6162

@@ -65,5 +66,12 @@ dependencies {
6566
testCompile 'junit:junit:4.12'
6667
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
6768
androidTestCompile 'com.android.support.test:runner:0.3'
68-
androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2'
69-
}
69+
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
70+
exclude group: 'com.android.support', module: 'appcompat'
71+
exclude group: 'com.android.support', module: 'support-v4'
72+
exclude module: 'recyclerview-v7'
73+
}
74+
androidTestCompile 'com.android.support.test:rules:0.3'
75+
androidTestCompile "org.mockito:mockito-core:1.+"
76+
77+
}

app/src/androidTest/java/org/fossasia/openevent/SpeakerInsertTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ protected void setUp() throws Exception {
6060
twitter = "twitter.com/mananwason9";
6161
facebook = "facebook.com/manan";
6262
github = "github.com/mananwason";
63-
linkedin = "";
63+
linkedin = "linkedin.com/mananwason";
6464
organisation = "fossasia";
65-
position = "student";
65+
position = "gsoc student";
6666
session = null;
6767
country = "india";
6868

app/src/androidTest/java/org/fossasia/openevent/SponsorInsertTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ protected void setUp() throws Exception {
2828

2929

3030
id = 1;
31-
name = "Android";
32-
url = "www.android.com";
31+
name = "Google";
32+
url = "www.google.com";
3333
logo = "http://www.theverge.com/2014/6/25/5842024/googles-android-logo-gets-a-new-look";
3434

3535
ContentValues contentValues = new ContentValues();

app/src/main/AndroidManifest.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package="org.fossasia.openevent"
44
xmlns:android="http://schemas.android.com/apk/res/android">
55

6-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
76
<uses-permission android:name="android.permission.INTERNET"/>
87

98
<application
@@ -14,17 +13,18 @@
1413
android:theme="@style/Base.AppTheme">
1514
<activity
1615
android:name=".activities.SplashActivity"
17-
android:label="Splash"/>
18-
19-
<activity
20-
android:name=".activities.MainActivity"
2116
android:label="@string/app_name">
2217
<intent-filter>
2318
<action android:name="android.intent.action.MAIN"/>
2419

2520
<category android:name="android.intent.category.LAUNCHER"/>
2621
</intent-filter>
2722
</activity>
23+
24+
<activity
25+
android:name=".activities.MainActivity"
26+
android:label="@string/app_name">
27+
</activity>
2828
<activity
2929
android:name=".activities.SettingsActivity"
3030
android:label="@string/action_settings"/>

app/src/main/java/org/fossasia/openevent/OpenEventApp.java

+21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package org.fossasia.openevent;
22

33
import android.app.Application;
4+
import android.os.Handler;
5+
import android.os.Looper;
6+
7+
import com.squareup.otto.Bus;
48

59
import org.fossasia.openevent.dbutils.DbSingleton;
610
import org.fossasia.openevent.modules.MapModuleFactory;
@@ -11,8 +15,25 @@
1115
*/
1216
public class OpenEventApp extends Application {
1317

18+
private static Bus sEventBus;
1419
MapModuleFactory mapModuleFactory;
1520

21+
public static Bus getEventBus() {
22+
if (sEventBus == null) {
23+
sEventBus = new Bus();
24+
}
25+
return sEventBus;
26+
}
27+
28+
public static void postEventOnUIThread(final Object event) {
29+
new Handler(Looper.getMainLooper()).post(new Runnable() {
30+
@Override
31+
public void run() {
32+
getEventBus().post(event);
33+
}
34+
});
35+
}
36+
1637
@Override
1738
public void onCreate() {
1839
super.onCreate();

0 commit comments

Comments
 (0)