Skip to content

Commit a2888b6

Browse files
droidLightdroidLight
committed
added crashlytics, in app messaging, fixed time,
1 parent ebc96d7 commit a2888b6

File tree

13 files changed

+92
-118
lines changed

13 files changed

+92
-118
lines changed

‎app/build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ android {
2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
2424
implementation 'com.android.support:appcompat-v7:28.0.0'
25+
implementation 'com.android.support:customtabs:28.0.0'
26+
implementation 'com.android.support:animated-vector-drawable:28.0.0'
27+
implementation 'com.android.support:exifinterface:28.0.0'
2528
implementation 'com.android.support:cardview-v7:28.0.0'
2629
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
2730
implementation 'com.android.support:design:28.0.0'
@@ -30,7 +33,7 @@ dependencies {
3033
//networking library
3134
implementation 'com.android.volley:volley:1.1.1'
3235
//image loading library
33-
implementation 'com.squareup.picasso:picasso:2.71828'
36+
//implementation 'com.squareup.picasso:picasso:2.71828'
3437
implementation 'com.android.support:support-v4:28.0.0'
3538
testImplementation 'junit:junit:4.12'
3639
androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -40,6 +43,13 @@ dependencies {
4043
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
4144
implementation 'com.google.firebase:firebase-core:16.0.8'
4245
implementation 'com.google.firebase:firebase-messaging:17.4.0'
46+
//crashlytics
47+
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
48+
//firebase in app messaging
49+
implementation 'com.google.firebase:firebase-inappmessaging-display:17.1.0'
50+
//to fix error
51+
implementation 'com.squareup.okhttp:okhttp:2.7.5'
52+
4353
}
4454

45-
apply plugin: 'com.google.gms.google-services'
55+
apply plugin: 'com.google.gms.google-services'

‎app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
77

8+
9+
810
<application
911
android:allowBackup="true"
1012
android:icon="@mipmap/ks_icon"
@@ -14,6 +16,10 @@
1416
android:theme="@style/AppTheme"
1517
android:usesCleartextTraffic="true">
1618

19+
<meta-data
20+
android:name="firebase_crashlytics_collection_enabled"
21+
android:value="false" />
22+
1723
<service android:name=".NotificationService">
1824
<intent-filter>
1925
<action android:name="com.google.firebase.MESSAGING_EVENT" />

‎app/src/main/java/dpi/ks19/participantapp/AboutKS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
3737
else if(this.heading.equals("KURUKSASTRA")){
3838
//ks.setImageDrawable(getDrawable(R.drawable.ks_circle));
3939
//added this to decrease load time
40-
Picasso.get().load(R.drawable.ks_circle).into(ks);
40+
Picasso.with(this).load(R.drawable.ks_circle).into(ks);
4141
content.setText(getText(R.string.about_ks));
4242
}
4343
else{

‎app/src/main/java/dpi/ks19/participantapp/Activities/SplashScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
2828
sharedPreferences = getSharedPreferences(getString(R.string.shared_pref), Context.MODE_PRIVATE);
2929

3030
splashLogo = findViewById(R.id.splash_screen_logo);
31-
Picasso.get().load(R.drawable.kslogo).into(splashLogo);
31+
Picasso.with(this).load(R.drawable.kslogo).into(splashLogo);
3232
}
3333

3434
@Override

‎app/src/main/java/dpi/ks19/participantapp/Adapter/ClusterAdapter.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,15 @@ public void hideRecyclerView() { //Hides the recyclerView.
144144
@Override
145145
public void getEventsByCluster(ArrayList<EventClass> data, ClusterHolder holder, boolean success) {
146146
if(success) {
147-
holder.setRecyclerView(data);
147+
if(data.size() == 0){
148+
progressDialog.cancel();
149+
Toast.makeText(mContext, "No Events In This Cluster Today", Toast.LENGTH_SHORT).show();
150+
}else{
151+
holder.setRecyclerView(data);
152+
}
153+
148154
}else{
155+
progressDialog.cancel();
149156
Toast.makeText(mContext, "Try Again", Toast.LENGTH_SHORT).show();
150157
}
151158

‎app/src/main/java/dpi/ks19/participantapp/Adapter/ClusterCardAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
6060
//display cluster logo
6161
//picasso for optimizing
6262
ImageView clusterLogo = v.findViewById(R.id.cluster_logos);
63-
Picasso.get().load(icons.get(position)).into(clusterLogo);
63+
Picasso.with(ctx).load(icons.get(position)).into(clusterLogo);
6464

6565
v.setOnClickListener(new View.OnClickListener() {
6666
@Override

‎app/src/main/java/dpi/ks19/participantapp/CallbackInterface/RegisterInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package dpi.ks19.participantapp.CallbackInterface;
22

33
public interface RegisterInterface {
4-
void registerStatus(boolean successful);
4+
void registerStatus(boolean successful, String msg);
55
}

‎app/src/main/java/dpi/ks19/participantapp/Fragments/RegisterPagerFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void isOTPVerified(boolean isVerified) {
145145
}
146146

147147
@Override
148-
public void registerStatus(boolean successful) {
148+
public void registerStatus(boolean successful, String msg) {
149149
if(successful){
150150
Toast.makeText(getActivity(), "Registered Successfully Please Login to proceed.", Toast.LENGTH_SHORT).show();
151151
et_register_email.setText("");
@@ -154,7 +154,7 @@ public void registerStatus(boolean successful) {
154154
et_register_ambassador_id.setText("");
155155
et_register_name.setText("");
156156
}else{
157-
Toast.makeText(getActivity(), "Phone Number Exists Already", Toast.LENGTH_SHORT).show();
157+
Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
158158
}
159159
}
160160

‎app/src/main/java/dpi/ks19/participantapp/LoginActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
import android.widget.Button;
1515
import android.widget.ImageView;
1616

17+
18+
import com.google.firebase.iid.FirebaseInstanceId;
19+
1720
import butterknife.BindView;
1821
import butterknife.ButterKnife;
1922
import butterknife.OnClick;
@@ -55,6 +58,11 @@ protected void onCreate(Bundle savedInstanceState) {
5558
setContentView(R.layout.activity_login);
5659
ButterKnife.bind(this);
5760

61+
//for in app messaging
62+
//Log.d("Instance ID", FirebaseInstanceId.getInstance().getId());
63+
64+
//get crashlytics
65+
5866
viewPager.setAdapter(new AuthenticationPagerAdapter(getSupportFragmentManager()));
5967
viewPager.setPageTransformer(true,new ZoomOutPageTransformer());
6068
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

‎app/src/main/java/dpi/ks19/participantapp/Model/EventClass.java

Lines changed: 33 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -5,105 +5,40 @@ public class EventClass {
55
public String eventName, startTimeHours, startTimeMin, endTimeHours, endTimeMin, venue;
66

77
public String getEventTime() {
8-
String time = "";
9-
int sH, sM, eH, eM;
10-
sH = Integer.parseInt(startTimeHours);
11-
sM = Integer.parseInt(startTimeMin);
12-
eH = Integer.parseInt(endTimeHours);
13-
eM = Integer.parseInt(endTimeMin);
14-
switch (sH) {
15-
case 0:
16-
if (sM >= 1 && sM <= 9)
17-
time += "12" + "." + 0 + startTimeMin + " AM : ";
18-
else
19-
time += "12" + "." + startTimeMin + " AM : ";
20-
break;
21-
case 1:
22-
case 2:
23-
case 3:
24-
case 4:
25-
case 5:
26-
case 6:
27-
case 7:
28-
case 8:
29-
case 9:
30-
if (sM >= 1 && sM <= 9)
31-
time += "0" + startTimeHours + "." + "0" + startTimeMin + " AM : ";
32-
else
33-
time += "0" + startTimeHours + "." + startTimeMin + " AM : ";
34-
break;
35-
case 10:
36-
case 11:
37-
if (sM >= 1 && sM <= 9)
38-
time += startTimeHours + "." + 0 + startTimeMin + " AM : ";
39-
else
40-
time += startTimeHours + "." + startTimeMin + " AM : ";
41-
break;
42-
case 12:
43-
case 13:
44-
case 14:
45-
case 15:
46-
case 16:
47-
case 17:
48-
case 18:
49-
case 19:
50-
case 20:
51-
case 21:
52-
case 22:
53-
case 23:
54-
if (sM >= 1 && sM <= 9)
55-
time += startTimeHours + "." + 0 + startTimeMin + " PM : ";
56-
else
57-
time += startTimeHours + "." + startTimeMin + " PM : ";
58-
break;
59-
}
60-
switch (eH) {
61-
case 0:
62-
if (eM >= 1 && eM <= 9)
63-
time += "12" + "." + 0 + endTimeMin + " AM";
64-
else
65-
time += "12" + "." + endTimeMin + " AM";
66-
break;
67-
case 1:
68-
case 2:
69-
case 3:
70-
case 4:
71-
case 5:
72-
case 6:
73-
case 7:
74-
case 8:
75-
case 9:
76-
if (sM >= 1 && sM <= 9)
77-
time += "0" + endTimeHours + "." + "0" + endTimeMin + " AM";
78-
else
79-
time += "0" + endTimeHours + "." + endTimeMin + " AM";
80-
break;
81-
case 10:
82-
case 11:
83-
if (eM >= 1 && eM <= 9)
84-
time += endTimeHours + "." + 0 + endTimeMin + " AM";
85-
else
86-
time += endTimeHours + "." + endTimeMin + " AM";
87-
break;
88-
case 12:
89-
case 13:
90-
case 14:
91-
case 15:
92-
case 16:
93-
case 17:
94-
case 18:
95-
case 19:
96-
case 20:
97-
case 21:
98-
case 22:
99-
case 23:
100-
if (eM >= 1 && eM <= 9)
101-
time += endTimeHours + "." + 0 + endTimeMin + " PM";
102-
else
103-
time += endTimeHours + "." + endTimeMin + " PM";
104-
break;
8+
int sHours = Integer.parseInt(startTimeHours);
9+
int sMin = Integer.parseInt(startTimeMin);
10+
11+
int eHours = Integer.parseInt(endTimeHours);
12+
int eMin = Integer.parseInt(endTimeMin);
13+
14+
return convertTime(sHours, sMin) + "\t\t" + convertTime(eHours, eMin);
15+
}
16+
17+
private String convertTime(int hours, int mins) {
18+
19+
if (hours == 0) {
20+
if (mins == 0) {
21+
return "12" + ":" + mins + "0" + " PM";
22+
23+
}
24+
return "12" + ":" + mins + " PM";
25+
26+
} else if (hours < 12) {
27+
if (mins == 0) {
28+
return hours + ":" + mins + "0" + " AM";
29+
}
30+
return hours + ":" + mins + " AM";
31+
32+
} else {
33+
hours = hours - 12;
34+
if (mins == 0) {
35+
return hours + ":" + mins + "0" + " PM";
36+
}
37+
return hours + ":" + mins + " PM";
38+
10539
}
106-
return time;
40+
10741
}
10842

43+
10944
}

‎app/src/main/java/dpi/ks19/participantapp/Networking/ApiHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ public void onResponse(JSONObject response) {
166166
try{
167167
String msg = response.getString("msg");
168168
if(msg.equals("Phone Already Exists")){
169-
callback.registerStatus(false);
169+
callback.registerStatus(false, msg);
170170
}
171171
}catch (JSONException e){
172-
callback.registerStatus(true);
172+
callback.registerStatus(true, null);
173173
}
174174

175175
}
176176
}, new Response.ErrorListener() {
177177
@Override
178178
public void onErrorResponse(VolleyError error) {
179179
Log.d("REGISTER_USER_ERROR", error.toString());
180-
callback.registerStatus(false);
180+
callback.registerStatus(false, "Try Again");
181181
}
182182
});
183183

‎app/src/main/java/dpi/ks19/participantapp/proshows.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ protected void onCreate(Bundle savedInstanceState) {
1414
setContentView(R.layout.activity_proshows);
1515

1616
ImageView musicteam = findViewById(R.id.musicteam);
17-
Picasso.get().load(R.drawable.smt_final).into(musicteam);
17+
Picasso.with(this).load(R.drawable.smt_final).into(musicteam);
1818

1919

2020
ImageView veena = findViewById(R.id.veenasrivani);
21-
Picasso.get().load(R.drawable.veenasrivani).into(veena);
21+
Picasso.with(this).load(R.drawable.veenasrivani).into(veena);
2222

2323

2424
ImageView crazy = findViewById(R.id.crazymohan);
25-
Picasso.get().load(R.drawable.crazymohan_final).into(crazy);
25+
Picasso.with(this).load(R.drawable.crazymohan_final).into(crazy);
2626

2727

2828
ImageView choreo = findViewById(R.id.choreonite);
29-
Picasso.get().load(R.drawable.choreo_final).into(choreo);
29+
Picasso.with(this).load(R.drawable.choreo_final).into(choreo);
3030

3131

3232
ImageView pattimandram = findViewById(R.id.pattimandram);
33-
Picasso.get().load(R.drawable.p_final).into(pattimandram);
33+
Picasso.with(this).load(R.drawable.p_final).into(pattimandram);
3434

3535
ImageView navin = findViewById(R.id.navin);
36-
Picasso.get().load(R.drawable.navin_final).into(navin);
36+
Picasso.with(this).load(R.drawable.navin_final).into(navin);
3737

3838

3939
}

‎build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ buildscript {
44
repositories {
55
google()
66
jcenter()
7-
7+
maven {
8+
url 'https://maven.fabric.io/public'
9+
}
10+
11+
812
}
913
dependencies {
1014
classpath 'com.android.tools.build:gradle:3.3.2'
@@ -19,7 +23,11 @@ allprojects {
1923
repositories {
2024
google()
2125
jcenter()
22-
26+
27+
maven {
28+
url 'https://maven.google.com/'
29+
}
30+
2331
}
2432
}
2533

0 commit comments

Comments
 (0)