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

Commit 51edd4f

Browse files
championswimmerchampionswimmer
committed
Merge pull request #259 from fossasia/stable
merge stable to shipping
2 parents 14baaab + 7725f8a commit 51edd4f

27 files changed

+160
-138
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
global:
66
- GRADLE_OPTS="-Xmx512m -XX:MaxPermSize=512m"
77
- secure: Y0xQEf2626cxKjbqLf114ehRypcDxyEWCRgRLbyJ64OB+hfwCPRjerJw4FA8rBJqc9uJ5s76TqK3M9Txr4alwsP6ZJc6WC3rY5Ml9ZgxDLtjljjmSpqZScCIqCwWCz3kb1QyV2xj/YHF8T+PfCEA8iEuyBNCJNQqAU4ehRhmsOerzZBnvAE4avytHIV0AWam6B04JjPKVRtAJo1jYEfoLB54lWmb/ZwKCB44VhFuOVrK+Z+/dgg8T7+IYZTLMTdD79HfE9F4+Q9jL74dpHQ0Vyo3scd2jI5JnHQDDoXS9zLUAeuM6H/BRREtwl64+fo4bVstEXrJwGDpodcZ7MYhlEROy+mhSlFpBM9PSE6t2eO2r+bkEpo1OIU1Eg/yZpP9spo0kW6hv6WSxYuU9WHz/XiQ2FOqKsW9RDrszIKLEgoGAa9UF8JQHF78b+aEvCGsIC/j1YsfNj4/YArpoA4GZLArZ8G0exeBqDEz4iZUMOeOzNnDPWpSzS31484/JeKvGLIHRzTzZOJ3Z0nARMYdpelzgGunZ/AmGS20LiVhx4YQcJfpQn8fruvGUDM3v6Gvb8i81QUe9Lg/FEAB+2ODiPa1BJpYka57l0Jfa+LsWP2u1hmvlAi38j1FCmy4tMysOKYF5/xbIJg+e1hLi+eJbdG8aRo0RFKwQTWANcbvPjA=
8+
- secure: H3OKJIuZrshnve+QZ9xmjqOcwYhe4a+JoETMGa7xzRsWy9xxjmsVuWfvrnKFmJRBEsqj9zZMCRWTWMjaLlIcvew8Db93cwSzYUp95g3yOhcTE3rsKDNn2oyn7oHVuZ4+sv8k1kxYJexHTzMYLmXN/J7vbCcw221oWfirUUMe6S4YDW/C0KMv4omSttRp5pKe/ShgNVSKEby08jA7CPCqS3OhkW5Zp4vvpGw7zQEjXrWUrWiS0LjHBLvuAB/MPY6ez2KhEaiuNuHpCCR/aDWBMlAjYyGWEIjXGqRBqpQthfmxRQ66KlqUfryGQ8ZOvWnCFrKiG+3t4qRoEkVNiU/NMD/t1AsiVaEFVsVYF7Q+tYa7dlZ6zvtP/NeZPmcbbZLPe6YCM/u668i9d3szCFlFYJNpkvHLi0SK+0ETTl4zu9Ji9BHfEdGCIO/npvGNdj9g6lgTp04gZaDGRPQuFtcwjtFFtZIWHTI2iignSej62fyam+Vv6E8V1s6JzeDBO/J1f0VcCQaA4ID2fjqZ4qqceilkGE9gekw26AZErXQkqU/6AVpQOTQ3JPZ60OAIzGbCxdpOM8JJ/z2uoddNOEgf4WfgbSpY1UCNpQr8+Tsmy5g0sDavz8TWkSLGggDHj+aWCvMj/R2EaFoVZa0IVXA8fHjfVoD0GZDW1i9zFSV6Acs=
89
matrix:
910
- ADB_INSTALL_TIMEOUT=15 ANDROID_BUILD_TOOLS_VERSION=23.0.2 ANDROID_TARGET=android-22
1011
ANDROID_ABI=armeabi-v7a

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ Before you begin, you should already have the Android Studio SDK downloaded and
3030

3131
7. If the app was built succesfully, you can test it by running it on either a real device or an emulated one by going to *Run>Run 'app'* or presing the Run icon in the toolbar.
3232

33+
### Screenshots
34+
![alt-tag](screenshots/ss2.PNG)
35+
![alt-tag](screenshots/ss1.PNG)
36+
![alt-tag](screenshots/ss3.PNG)
37+
![alt-tag](screenshots/ss4.PNG)
38+
3339
### Configuring the app
3440

3541
**Configuring Server and Web-App Urls**

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId "org.fossasia.openevent"
2323
minSdkVersion 15
2424
targetSdkVersion 23
25-
versionCode 1
26-
versionName "0.1"
25+
versionCode 80
26+
versionName "0.8.0"
2727

2828
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2929
buildConfigField "String", "GIT_SHA", "\"${gitSha}\""

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:label="@string/app_name"
1313
android:theme="@style/AppTheme">
1414
<activity
15+
android:launchMode="singleInstance"
1516
android:name=".activities.SplashActivity"
1617
android:label="@string/app_name"
1718
android:theme="@style/AppTheme.NoActionBar">
@@ -39,7 +40,7 @@
3940
android:label="@string/title_section_tracks"
4041
android:theme="@style/AppTheme.NoActionBar"/>
4142
<activity
42-
android:name=".activities.LocationActivtiy"
43+
android:name=".activities.LocationActivity"
4344
android:label="@string/title_section_location"
4445
android:theme="@style/AppTheme.NoActionBar"/>
4546
<activity

‎app/src/main/java/org/fossasia/openevent/Services/BookmarkAlarmService.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.app.NotificationManager;
55
import android.app.PendingIntent;
66
import android.content.Intent;
7+
import android.graphics.Bitmap;
8+
import android.graphics.BitmapFactory;
79
import android.media.RingtoneManager;
810
import android.os.IBinder;
911
import android.support.v4.app.NotificationCompat;
@@ -64,9 +66,10 @@ void handleStart(Intent intent, int startId) {
6466
Intent intent1 = new Intent(this.getApplicationContext(), SessionDetailActivity.class);
6567
intent1.putExtra(IntentStrings.SESSION, session.getTitle());
6668
PendingIntent pendingNotificationIntent = PendingIntent.getActivity(this.getApplicationContext(), 0, intent1, PendingIntent.FLAG_UPDATE_CURRENT);
67-
69+
Bitmap largeIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
6870
NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(this)
69-
.setSmallIcon(R.mipmap.ic_launcher)
71+
.setSmallIcon(R.drawable.ic_bookmark_white_24dp)
72+
.setLargeIcon(largeIcon)
7073
.setContentTitle(session.getTitle())
7174
.setContentText(session_timings)
7275
.setAutoCancel(true)

app/src/main/java/org/fossasia/openevent/activities/LocationActivtiy.java renamed to app/src/main/java/org/fossasia/openevent/activities/LocationActivity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121

2222
import java.util.ArrayList;
2323
import java.util.List;
24+
import java.util.Locale;
2425

2526
/**
2627
* User: MananWason
2728
* Date: 8/18/2015
2829
*/
29-
public class LocationActivtiy extends BaseActivity implements SearchView.OnQueryTextListener {
30+
public class LocationActivity extends BaseActivity implements SearchView.OnQueryTextListener {
3031
final private String SEARCH = "searchText";
3132

3233
SessionsListAdapter sessionsListAdapter;
@@ -133,11 +134,11 @@ public boolean onQueryTextChange(String query) {
133134
}
134135

135136
private List<Session> filter(List<Session> sessions, String query) {
136-
query = query.toLowerCase();
137+
query = query.toLowerCase(Locale.getDefault());
137138

138139
final List<Session> filteredTracksList = new ArrayList<>();
139140
for (Session session : sessions) {
140-
final String text = session.getTitle().toLowerCase();
141+
final String text = session.getTitle().toLowerCase(Locale.getDefault());
141142
if (text.contains(query)) {
142143
filteredTracksList.add(session);
143144
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void createNotification() {
176176
Intent myIntent = new Intent(this, NotificationAlarmReceiver.class);
177177
myIntent.putExtra(IntentStrings.SESSION, session.getId());
178178
myIntent.putExtra(IntentStrings.SESSION_TIMING, timings);
179-
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, myIntent, 0);
179+
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, myIntent, PendingIntent.FLAG_UPDATE_CURRENT);
180180

181181
AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
182182
alarmManager.set(AlarmManager.RTC, calendar.getTimeInMillis(), pendingIntent);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.util.ArrayList;
2727
import java.util.List;
28+
import java.util.Locale;
2829

2930
/**
3031
* Created by MananWason on 30-06-2015.
@@ -187,11 +188,11 @@ public boolean onQueryTextChange(String query) {
187188
}
188189

189190
private List<Session> filter(List<Session> sessions, String query) {
190-
query = query.toLowerCase();
191+
query = query.toLowerCase(Locale.getDefault());
191192

192193
final List<Session> filteredTracksList = new ArrayList<>();
193194
for (Session session : sessions) {
194-
final String text = session.getTitle().toLowerCase();
195+
final String text = session.getTitle().toLowerCase(Locale.getDefault());
195196
if (text.contains(query)) {
196197
filteredTracksList.add(session);
197198
}

‎app/src/main/java/org/fossasia/openevent/adapters/LocationsListAdapter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.text.MessageFormat;
1515
import java.util.ArrayList;
1616
import java.util.List;
17+
import java.util.Locale;
1718

1819
import timber.log.Timber;
1920

@@ -29,9 +30,9 @@ protected FilterResults performFiltering(CharSequence constraint) {
2930
DbSingleton instance = DbSingleton.getInstance();
3031
List<Microlocation> microlocations = instance.getMicrolocationsList();
3132
final ArrayList<Microlocation> filteredLocationList = new ArrayList<>();
32-
String query = constraint.toString().toLowerCase();
33+
String query = constraint.toString().toLowerCase(Locale.getDefault());
3334
for (Microlocation microlocation : microlocations) {
34-
final String text = microlocation.getName().toLowerCase();
35+
final String text = microlocation.getName().toLowerCase(Locale.getDefault());
3536
if (text.contains(query)) {
3637
filteredLocationList.add(microlocation);
3738
}

‎app/src/main/java/org/fossasia/openevent/adapters/SessionsListAdapter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import java.util.ArrayList;
1515
import java.util.List;
16+
import java.util.Locale;
1617

1718
import timber.log.Timber;
1819

@@ -29,9 +30,9 @@ protected FilterResults performFiltering(CharSequence constraint) {
2930
// TODO: Use a query to do this, iterating over an entire set is pretty bad
3031
List<Session> sessionList = instance.getSessionList();
3132
final ArrayList<Session> filteredSessionList = new ArrayList<>();
32-
String query = constraint.toString().toLowerCase();
33+
String query = constraint.toString().toLowerCase(Locale.getDefault());
3334
for (Session session : sessionList) {
34-
final String text = session.getTitle().toLowerCase();
35+
final String text = session.getTitle().toLowerCase(Locale.getDefault());
3536
if (text.contains(query)) {
3637
filteredSessionList.add(session);
3738
}

0 commit comments

Comments
 (0)