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

Commit

Permalink
Merge pull request #71 from mananwason/redata
Browse files Browse the repository at this point in the history 
made app re:Data compatible
  • Loading branch information
@mananwason
mananwason committed Aug 14, 2015
2 parents 2ecbb01 + aa8a135 commit 46dc6ae
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 67 deletions.
5 changes: 1 addition & 4 deletions app/src/main/java/org/fossasia/openevent/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.fossasia.openevent.activities;

import android.content.DialogInterface;
import android.graphics.Color;
import android.os.Bundle;
import android.support.design.widget.NavigationView;
Expand All @@ -11,11 +10,9 @@
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
Expand Down Expand Up @@ -51,7 +48,7 @@

public class MainActivity extends AppCompatActivity {

private static final String COUNTER_TAG = "counter";
private static final String COUNTER_TAG = "Donecounter";
private DrawerLayout mDrawerLayout;
private Toolbar mToolbar;
private NavigationView navigationView;
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/fossasia/openevent/activities/SpeakersActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
*/
public class SpeakersActivity extends AppCompatActivity {
SessionsListAdapter sessionsListAdapter;
private String speaker;
private Speaker selectedSpeaker;


Expand All @@ -36,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_speakers);
DbSingleton dbSingleton = DbSingleton.getInstance();
speaker = getIntent().getStringExtra(Speaker.SPEAKER);
String speaker = getIntent().getStringExtra(Speaker.SPEAKER);
final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_speakers);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/api/Urls.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ public abstract class Urls {
/**
* Change Event Id Here *
*/
public static final int EVENT_ID = 3;
public static final int EVENT_ID = 1;

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

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

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/fossasia/openevent/api/processor/TrackListResponseProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public void success(final TrackResponseList tracksResponseList, Response respons
public void run() {
ArrayList<String> queries = new ArrayList<>();

Log.d(TAG, "run" + tracksResponseList.tracks.size());
for (Track track : tracksResponseList.tracks) {
String query = track.generateSql();
queries.add(query);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/data/Event.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ public class Event {

String logo;

@SerializedName("start_time")
@SerializedName("begin")
String start;

@SerializedName("end_time")
@SerializedName("end")
String end;

float latitude;
Expand Down
52 changes: 21 additions & 31 deletions app/src/main/java/org/fossasia/openevent/data/Session.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,37 @@
*/
public class Session {

int id;

String title;

String subtitle;

@SerializedName("abstract")
String summary;

String description;

@SerializedName("start_time")
@SerializedName("begin")
String startTime;

@SerializedName("end_time")
@SerializedName("end")
String endTime;

String type;

int track;
int id;

String level;

int[] speakers;

@SerializedName("microlocation")
int microlocations;

String title;

String subtitle;

@SerializedName("format")
String type;

int track;

public Session(int id, String title, String subtitle,
String summary, String description,
String startTime, String endTime, String type,
int track, String level, int[] speakers, int microlocations
int track, String level, int microlocations
) throws ParseException {
this.id = id;
this.title = title;
Expand All @@ -59,7 +58,6 @@ public Session(int id, String title, String subtitle,
this.type = type;
this.track = track;
this.level = level;
this.speakers = speakers;
this.microlocations = microlocations;
}

Expand Down Expand Up @@ -143,14 +141,6 @@ public void setLevel(String level) {
this.level = level;
}

public int[] getSpeakers() {
return speakers;
}

public void setSpeakers(int[] speakers) {
this.speakers = speakers;
}

public int getMicrolocations() {
return microlocations;
}
Expand All @@ -165,15 +155,15 @@ public String generateSql() {
query_normal,
DbContract.Sessions.TABLE_NAME,
id,
DatabaseUtils.sqlEscapeString(title),
DatabaseUtils.sqlEscapeString(subtitle),
DatabaseUtils.sqlEscapeString(summary),
DatabaseUtils.sqlEscapeString(description),
DatabaseUtils.sqlEscapeString(startTime),
DatabaseUtils.sqlEscapeString(endTime),
DatabaseUtils.sqlEscapeString(type),
DatabaseUtils.sqlEscapeString(title + ""),
DatabaseUtils.sqlEscapeString(subtitle + ""),
DatabaseUtils.sqlEscapeString(summary + ""),
DatabaseUtils.sqlEscapeString(description + ""),
DatabaseUtils.sqlEscapeString(startTime + ""),
DatabaseUtils.sqlEscapeString(endTime + ""),
DatabaseUtils.sqlEscapeString(type + ""),
track,
DatabaseUtils.sqlEscapeString(level),
DatabaseUtils.sqlEscapeString(level + ""),
microlocations);
return query;
}
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/java/org/fossasia/openevent/data/Speaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,18 @@ public String generateSql() {
query_normal,
DbContract.Speakers.TABLE_NAME,
id,
DatabaseUtils.sqlEscapeString(name),
DatabaseUtils.sqlEscapeString(name+""),
DatabaseUtils.sqlEscapeString(photo),
DatabaseUtils.sqlEscapeString(bio),
DatabaseUtils.sqlEscapeString(email),
DatabaseUtils.sqlEscapeString(web),
DatabaseUtils.sqlEscapeString(facebook),
DatabaseUtils.sqlEscapeString(twitter),
DatabaseUtils.sqlEscapeString(github),
DatabaseUtils.sqlEscapeString(linkedin),
DatabaseUtils.sqlEscapeString(organisation),
DatabaseUtils.sqlEscapeString(position),
DatabaseUtils.sqlEscapeString(country));
DatabaseUtils.sqlEscapeString(bio+""),
DatabaseUtils.sqlEscapeString(email+""),
DatabaseUtils.sqlEscapeString(web+""),
DatabaseUtils.sqlEscapeString(facebook+""),
DatabaseUtils.sqlEscapeString(twitter+""),
DatabaseUtils.sqlEscapeString(github+""),
DatabaseUtils.sqlEscapeString(linkedin+""),
DatabaseUtils.sqlEscapeString(organisation+""),
DatabaseUtils.sqlEscapeString(position+""),
DatabaseUtils.sqlEscapeString(country+""));
return query;
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/data/Sponsor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public String generateSql() {
query_normal,
DbContract.Sponsors.TABLE_NAME,
id,
DatabaseUtils.sqlEscapeString(name),
DatabaseUtils.sqlEscapeString(url),
DatabaseUtils.sqlEscapeString(logo));
DatabaseUtils.sqlEscapeString(name+""),
DatabaseUtils.sqlEscapeString(url+""),
DatabaseUtils.sqlEscapeString(logo+""));
return query;
}
}
9 changes: 6 additions & 3 deletions app/src/main/java/org/fossasia/openevent/data/Track.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.fossasia.openevent.data;

import android.database.DatabaseUtils;
import android.util.Log;

import com.google.gson.annotations.SerializedName;

Expand Down Expand Up @@ -49,6 +50,7 @@ public void setName(String name) {
}

public String getDescription() {

return description;
}

Expand All @@ -62,9 +64,10 @@ public String generateSql() {
query_normal,
DbContract.Tracks.TABLE_NAME,
id,
DatabaseUtils.sqlEscapeString(name),
DatabaseUtils.sqlEscapeString(description),
DatabaseUtils.sqlEscapeString(image));
DatabaseUtils.sqlEscapeString(name+""),
DatabaseUtils.sqlEscapeString(description+""),
DatabaseUtils.sqlEscapeString(image+""));
Log.d("tracks", query);
return query;

}
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/org/fossasia/openevent/dbutils/DatabaseOperations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public ArrayList<Session> getSessionList(SQLiteDatabase mDb) throws ParseExcepti
cur.getString(cur.getColumnIndex(DbContract.Sessions.TYPE)),
cur.getInt(cur.getColumnIndex(DbContract.Sessions.TRACK)),
cur.getString(cur.getColumnIndex(DbContract.Sessions.LEVEL)),
null,
cur.getInt(cur.getColumnIndex(DbContract.Sessions.MICROLOCATION))
);
sessions.add(s);
Expand Down Expand Up @@ -95,7 +94,6 @@ public Session getSessionById(int id, SQLiteDatabase mDb) throws ParseException
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.TYPE)),
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.TRACK)),
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.LEVEL)),
null,
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
);
cursor.close();
Expand Down Expand Up @@ -354,7 +352,6 @@ public ArrayList<Session> getSessionbyTracksname(String trackName, SQLiteDatabas
sessionCursor.getString(sessionCursor.getColumnIndex(DbContract.Sessions.TYPE)),
sessionCursor.getInt(sessionCursor.getColumnIndex(DbContract.Sessions.TRACK)),
sessionCursor.getString(sessionCursor.getColumnIndex(DbContract.Sessions.LEVEL)),
null,
sessionCursor.getInt(sessionCursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
);
sessions.add(session);
Expand Down Expand Up @@ -490,7 +487,6 @@ public ArrayList<Session> getSessionbySpeakersname(String speakerName, SQLiteDat
sessionTableCursor.getString(sessionTableCursor.getColumnIndex(DbContract.Sessions.TYPE)),
sessionTableCursor.getInt(sessionTableCursor.getColumnIndex(DbContract.Sessions.TRACK)),
sessionTableCursor.getString(sessionTableCursor.getColumnIndex(DbContract.Sessions.LEVEL)),
null,
sessionTableCursor.getInt(sessionTableCursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))
);
sessions.add(session);
Expand Down Expand Up @@ -694,7 +690,6 @@ public Session getSessionbySessionname(String sessionName, SQLiteDatabase mDb) t
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.TYPE)),
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.TRACK)),
cursor.getString(cursor.getColumnIndex(DbContract.Sessions.LEVEL)),
null,
cursor.getInt(cursor.getColumnIndex(DbContract.Sessions.MICROLOCATION))

);
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/org/fossasia/openevent/utils/SpeakerIntent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Intent;
import android.net.Uri;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;
Expand Down Expand Up @@ -40,9 +41,10 @@ public void onClick(View view) {
Toast.makeText(view.getContext(), "What did you click?? :P", Toast.LENGTH_SHORT).show();
}

if (url.isEmpty()) {
Toast.makeText(view.getContext(), "Sorry this speaker doesn't have a profile", Toast.LENGTH_SHORT).show();
return;
if (url.equals(null)) {
Log.d("url null", "ABC");
view.setVisibility(View.GONE);
return ;
}

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

}
});
return;
}
}

0 comments on commit 46dc6ae

Please sign in to comment.