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

Commit aa8a135

Browse files
mananwasonmananwason
committed
made app re:Data compatible
1 parent 9ac718e commit aa8a135

File tree

11 files changed

+53
-67
lines changed

11 files changed

+53
-67
lines changed

‎app/src/main/java/org/fossasia/openevent/activities/MainActivity.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.fossasia.openevent.activities;
22

3-
import android.content.DialogInterface;
43
import android.graphics.Color;
54
import android.os.Bundle;
65
import android.support.design.widget.NavigationView;
@@ -11,11 +10,9 @@
1110
import android.support.v4.view.GravityCompat;
1211
import android.support.v4.widget.DrawerLayout;
1312
import android.support.v7.app.ActionBarDrawerToggle;
14-
import android.support.v7.app.AlertDialog;
1513
import android.support.v7.app.AppCompatActivity;
1614
import android.support.v7.widget.Toolbar;
1715
import android.util.Log;
18-
import android.view.Gravity;
1916
import android.view.Menu;
2017
import android.view.MenuInflater;
2118
import android.view.MenuItem;
@@ -51,7 +48,7 @@
5148

5249
public class MainActivity extends AppCompatActivity {
5350

54-
private static final String COUNTER_TAG = "counter";
51+
private static final String COUNTER_TAG = "Donecounter";
5552
private DrawerLayout mDrawerLayout;
5653
private Toolbar mToolbar;
5754
private NavigationView navigationView;

‎app/src/main/java/org/fossasia/openevent/activities/SpeakersActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
*/
2828
public class SpeakersActivity extends AppCompatActivity {
2929
SessionsListAdapter sessionsListAdapter;
30-
private String speaker;
3130
private Speaker selectedSpeaker;
3231

3332

@@ -36,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
3635
super.onCreate(savedInstanceState);
3736
setContentView(R.layout.activity_speakers);
3837
DbSingleton dbSingleton = DbSingleton.getInstance();
39-
speaker = getIntent().getStringExtra(Speaker.SPEAKER);
38+
String speaker = getIntent().getStringExtra(Speaker.SPEAKER);
4039
final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_speakers);
4140
setSupportActionBar(toolbar);
4241
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

‎app/src/main/java/org/fossasia/openevent/api/Urls.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public abstract class Urls {
1010
/**
1111
* Change Event Id Here *
1212
*/
13-
public static final int EVENT_ID = 3;
13+
public static final int EVENT_ID = 1;
1414

15-
public static final String BASE_URL = "http://open-event.herokuapp.com";
15+
public static final String BASE_URL = "http://springboard.championswimmer.in";
1616

1717
public static final String BASE_GET_URL = BASE_URL + "/api/" + API_VERSION;
1818

‎app/src/main/java/org/fossasia/openevent/api/processor/TrackListResponseProcessor.java

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public void success(final TrackResponseList tracksResponseList, Response respons
3131
public void run() {
3232
ArrayList<String> queries = new ArrayList<>();
3333

34+
Log.d(TAG, "run" + tracksResponseList.tracks.size());
3435
for (Track track : tracksResponseList.tracks) {
3536
String query = track.generateSql();
3637
queries.add(query);

‎app/src/main/java/org/fossasia/openevent/data/Event.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public class Event {
1919

2020
String logo;
2121

22-
@SerializedName("start_time")
22+
@SerializedName("begin")
2323
String start;
2424

25-
@SerializedName("end_time")
25+
@SerializedName("end")
2626
String end;
2727

2828
float latitude;

‎app/src/main/java/org/fossasia/openevent/data/Session.java

+21-31
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,37 @@
1616
*/
1717
public class Session {
1818

19-
int id;
20-
21-
String title;
22-
23-
String subtitle;
24-
2519
@SerializedName("abstract")
2620
String summary;
2721

2822
String description;
2923

30-
@SerializedName("start_time")
24+
@SerializedName("begin")
3125
String startTime;
3226

33-
@SerializedName("end_time")
27+
@SerializedName("end")
3428
String endTime;
3529

36-
String type;
37-
38-
int track;
30+
int id;
3931

4032
String level;
4133

42-
int[] speakers;
43-
4434
@SerializedName("microlocation")
4535
int microlocations;
4636

37+
String title;
38+
39+
String subtitle;
40+
41+
@SerializedName("format")
42+
String type;
43+
44+
int track;
45+
4746
public Session(int id, String title, String subtitle,
4847
String summary, String description,
4948
String startTime, String endTime, String type,
50-
int track, String level, int[] speakers, int microlocations
49+
int track, String level, int microlocations
5150
) throws ParseException {
5251
this.id = id;
5352
this.title = title;
@@ -59,7 +58,6 @@ public Session(int id, String title, String subtitle,
5958
this.type = type;
6059
this.track = track;
6160
this.level = level;
62-
this.speakers = speakers;
6361
this.microlocations = microlocations;
6462
}
6563

@@ -143,14 +141,6 @@ public void setLevel(String level) {
143141
this.level = level;
144142
}
145143

146-
public int[] getSpeakers() {
147-
return speakers;
148-
}
149-
150-
public void setSpeakers(int[] speakers) {
151-
this.speakers = speakers;
152-
}
153-
154144
public int getMicrolocations() {
155145
return microlocations;
156146
}
@@ -165,15 +155,15 @@ public String generateSql() {
165155
query_normal,
166156
DbContract.Sessions.TABLE_NAME,
167157
id,
168-
DatabaseUtils.sqlEscapeString(title),
169-
DatabaseUtils.sqlEscapeString(subtitle),
170-
DatabaseUtils.sqlEscapeString(summary),
171-
DatabaseUtils.sqlEscapeString(description),
172-
DatabaseUtils.sqlEscapeString(startTime),
173-
DatabaseUtils.sqlEscapeString(endTime),
174-
DatabaseUtils.sqlEscapeString(type),
158+
DatabaseUtils.sqlEscapeString(title + ""),
159+
DatabaseUtils.sqlEscapeString(subtitle + ""),
160+
DatabaseUtils.sqlEscapeString(summary + ""),
161+
DatabaseUtils.sqlEscapeString(description + ""),
162+
DatabaseUtils.sqlEscapeString(startTime + ""),
163+
DatabaseUtils.sqlEscapeString(endTime + ""),
164+
DatabaseUtils.sqlEscapeString(type + ""),
175165
track,
176-
DatabaseUtils.sqlEscapeString(level),
166+
DatabaseUtils.sqlEscapeString(level + ""),
177167
microlocations);
178168
return query;
179169
}

‎app/src/main/java/org/fossasia/openevent/data/Speaker.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,18 @@ public String generateSql() {
182182
query_normal,
183183
DbContract.Speakers.TABLE_NAME,
184184
id,
185-
DatabaseUtils.sqlEscapeString(name),
185+
DatabaseUtils.sqlEscapeString(name+""),
186186
DatabaseUtils.sqlEscapeString(photo),
187-
DatabaseUtils.sqlEscapeString(bio),
188-
DatabaseUtils.sqlEscapeString(email),
189-
DatabaseUtils.sqlEscapeString(web),
190-
DatabaseUtils.sqlEscapeString(facebook),
191-
DatabaseUtils.sqlEscapeString(twitter),
192-
DatabaseUtils.sqlEscapeString(github),
193-
DatabaseUtils.sqlEscapeString(linkedin),
194-
DatabaseUtils.sqlEscapeString(organisation),
195-
DatabaseUtils.sqlEscapeString(position),
196-
DatabaseUtils.sqlEscapeString(country));
187+
DatabaseUtils.sqlEscapeString(bio+""),
188+
DatabaseUtils.sqlEscapeString(email+""),
189+
DatabaseUtils.sqlEscapeString(web+""),
190+
DatabaseUtils.sqlEscapeString(facebook+""),
191+
DatabaseUtils.sqlEscapeString(twitter+""),
192+
DatabaseUtils.sqlEscapeString(github+""),
193+
DatabaseUtils.sqlEscapeString(linkedin+""),
194+
DatabaseUtils.sqlEscapeString(organisation+""),
195+
DatabaseUtils.sqlEscapeString(position+""),
196+
DatabaseUtils.sqlEscapeString(country+""));
197197
return query;
198198
}
199199
}

‎app/src/main/java/org/fossasia/openevent/data/Sponsor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public String generateSql() {
4747
query_normal,
4848
DbContract.Sponsors.TABLE_NAME,
4949
id,
50-
DatabaseUtils.sqlEscapeString(name),
51-
DatabaseUtils.sqlEscapeString(url),
52-
DatabaseUtils.sqlEscapeString(logo));
50+
DatabaseUtils.sqlEscapeString(name+""),
51+
DatabaseUtils.sqlEscapeString(url+""),
52+
DatabaseUtils.sqlEscapeString(logo+""));
5353
return query;
5454
}
5555
}

‎app/src/main/java/org/fossasia/openevent/data/Track.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.fossasia.openevent.data;
22

33
import android.database.DatabaseUtils;
4+
import android.util.Log;
45

56
import com.google.gson.annotations.SerializedName;
67

@@ -49,6 +50,7 @@ public void setName(String name) {
4950
}
5051

5152
public String getDescription() {
53+
5254
return description;
5355
}
5456

@@ -62,9 +64,10 @@ public String generateSql() {
6264
query_normal,
6365
DbContract.Tracks.TABLE_NAME,
6466
id,
65-
DatabaseUtils.sqlEscapeString(name),
66-
DatabaseUtils.sqlEscapeString(description),
67-
DatabaseUtils.sqlEscapeString(image));
67+
DatabaseUtils.sqlEscapeString(name+""),
68+
DatabaseUtils.sqlEscapeString(description+""),
69+
DatabaseUtils.sqlEscapeString(image+""));
70+
Log.d("tracks", query);
6871
return query;
6972

7073
}

‎app/src/main/java/org/fossasia/openevent/dbutils/DatabaseOperations.java

-5
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public ArrayList<Session> getSessionList(SQLiteDatabase mDb) throws ParseExcepti
6060
cur.getString(cur.getColumnIndex(DbContract.Sessions.TYPE)),
6161
cur.getInt(cur.getColumnIndex(DbContract.Sessions.TRACK)),
6262
cur.getString(cur.getColumnIndex(DbContract.Sessions.LEVEL)),
63-
null,
6463
cur.getInt(cur.getColumnIndex(DbContract.Sessions.MICROLOCATION))
6564
);
6665
sessions.add(s);
@@ -95,7 +94,6 @@ public Session getSessionById(int id, SQLiteDatabase mDb) throws ParseException
9594
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.TYPE)),
9695
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.TRACK)),
9796
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.LEVEL)),
98-
null,
9997
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
10098
);
10199
cursor.close();
@@ -354,7 +352,6 @@ public ArrayList<Session> getSessionbyTracksname(String trackName, SQLiteDatabas
354352
sessionCursor.getString(sessionCursor.getColumnIndex(DbContract.Sessions.TYPE)),
355353
sessionCursor.getInt(sessionCursor.getColumnIndex(DbContract.Sessions.TRACK)),
356354
sessionCursor.getString(sessionCursor.getColumnIndex(DbContract.Sessions.LEVEL)),
357-
null,
358355
sessionCursor.getInt(sessionCursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
359356
);
360357
sessions.add(session);
@@ -490,7 +487,6 @@ public ArrayList<Session> getSessionbySpeakersname(String speakerName, SQLiteDat
490487
sessionTableCursor.getString(sessionTableCursor.getColumnIndex(DbContract.Sessions.TYPE)),
491488
sessionTableCursor.getInt(sessionTableCursor.getColumnIndex(DbContract.Sessions.TRACK)),
492489
sessionTableCursor.getString(sessionTableCursor.getColumnIndex(DbContract.Sessions.LEVEL)),
493-
null,
494490
sessionTableCursor.getInt(sessionTableCursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
495491
);
496492
sessions.add(session);
@@ -674,7 +670,6 @@ public Session getSessionbySessionname(String sessionName, SQLiteDatabase mDb) t
674670
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.TYPE)),
675671
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.TRACK)),
676672
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.LEVEL)),
677-
null,
678673
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
679674

680675
);

‎app/src/main/java/org/fossasia/openevent/utils/SpeakerIntent.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Intent;
44
import android.net.Uri;
5+
import android.util.Log;
56
import android.view.View;
67
import android.widget.ImageView;
78
import android.widget.Toast;
@@ -40,9 +41,10 @@ public void onClick(View view) {
4041
Toast.makeText(view.getContext(), "What did you click?? :P", Toast.LENGTH_SHORT).show();
4142
}
4243

43-
if (url.isEmpty()) {
44-
Toast.makeText(view.getContext(), "Sorry this speaker doesn't have a profile", Toast.LENGTH_SHORT).show();
45-
return;
44+
if (url.equals(null)) {
45+
Log.d("url null", "ABC");
46+
view.setVisibility(View.GONE);
47+
return ;
4648
}
4749

4850
if ((!url.startsWith("https://") && !url.startsWith("http://")) && (!url.isEmpty())) {
@@ -55,6 +57,5 @@ public void onClick(View view) {
5557

5658
}
5759
});
58-
return;
5960
}
6061
}

0 commit comments

Comments
 (0)