Skip to content

Commit 405487b

Browse files
author
Abhishek Bisht
committed
Fixes #1999 Replaced Toast Messages with Snackbar messages
1 parent 57e3eae commit 405487b

33 files changed

+227
-146
lines changed

‎app/src/main/java/io/pslab/activity/CreateConfigActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import android.widget.Button;
1515
import android.widget.EditText;
1616
import android.widget.Spinner;
17-
import android.widget.Toast;
1817

1918
import java.io.File;
2019
import java.io.FileWriter;
@@ -99,7 +98,8 @@ public void onNothingSelected(AdapterView<?> parent) {
9998
public void onClick(View v) {
10099
interval = intervalEditText.getText().toString();
101100
if (interval.length() == 0) {
102-
Toast.makeText(CreateConfigActivity.this, getResources().getString(R.string.no_interval_message), Toast.LENGTH_SHORT).show();
101+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
102+
getString(R.string.no_interval_message),null,null, Snackbar.LENGTH_SHORT);
103103
} else {
104104
ArrayList<String> selectedParamsList = new ArrayList<>();
105105
for (int i = 0; i < paramsListContainer.getChildCount(); i++) {

‎app/src/main/java/io/pslab/activity/DataLoggerActivity.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.os.Bundle;
99
import android.os.Environment;
1010
import android.support.annotation.Nullable;
11+
import android.support.design.widget.Snackbar;
1112
import android.support.v7.app.AlertDialog;
1213
import android.support.v7.app.AppCompatActivity;
1314
import android.support.v7.widget.DividerItemDecoration;
@@ -19,7 +20,6 @@
1920
import android.view.View;
2021
import android.widget.ProgressBar;
2122
import android.widget.TextView;
22-
import android.widget.Toast;
2323

2424
import java.io.BufferedReader;
2525
import java.io.File;
@@ -45,6 +45,7 @@
4545
import io.pslab.models.ThermometerData;
4646
import io.pslab.models.WaveGeneratorData;
4747
import io.pslab.others.CSVLogger;
48+
import io.pslab.others.CustomSnackBar;
4849
import io.pslab.others.LocalDataLog;
4950
import io.realm.Realm;
5051
import io.realm.RealmObject;
@@ -209,7 +210,8 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
209210
File file = new File(path);
210211
getFileData(file);
211212
} else
212-
Toast.makeText(this, this.getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
213+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
214+
getString(R.string.no_file_selected),null,null, Snackbar.LENGTH_SHORT);
213215
}
214216
}
215217

@@ -230,11 +232,13 @@ private void getFileData(File file) {
230232
if (object != null) {
231233
realm.copyToRealm(object);
232234
} else {
233-
Toast.makeText(this, getResources().getString(R.string.incorrect_import_format), Toast.LENGTH_SHORT).show();
235+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
236+
getString(R.string.incorrect_import_format),null,null, Snackbar.LENGTH_SHORT);
234237
}
235238
realm.commitTransaction();
236239
} catch (Exception e) {
237-
Toast.makeText(this, getResources().getString(R.string.incorrect_import_format), Toast.LENGTH_SHORT).show();
240+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
241+
getString(R.string.incorrect_import_format),null,null, Snackbar.LENGTH_SHORT);
238242
}
239243
} else if (i == 0) {
240244
block = System.currentTimeMillis();

‎app/src/main/java/io/pslab/activity/MainActivity.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import android.support.annotation.Nullable;
1515
import android.support.customtabs.CustomTabsServiceConnection;
1616
import android.support.design.widget.NavigationView;
17+
import android.support.design.widget.Snackbar;
1718
import android.support.v4.app.Fragment;
1819
import android.support.v4.app.FragmentTransaction;
1920
import android.support.v4.view.GravityCompat;
@@ -28,7 +29,6 @@
2829
import android.view.View;
2930
import android.widget.ImageView;
3031
import android.widget.TextView;
31-
import android.widget.Toast;
3232

3333
import java.io.IOException;
3434

@@ -42,6 +42,7 @@
4242
import io.pslab.fragment.HomeFragment;
4343
import io.pslab.fragment.InstrumentsFragment;
4444
import io.pslab.fragment.PSLabPinLayoutFragment;
45+
import io.pslab.others.CustomSnackBar;
4546
import io.pslab.others.CustomTabService;
4647
import io.pslab.others.InitializationVariable;
4748
import io.pslab.others.ScienceLabCommon;
@@ -348,7 +349,8 @@ public void onBackPressed() {
348349
super.onBackPressed();
349350
return;
350351
} else {
351-
Toast.makeText(getBaseContext(), getString(R.string.Toast_double_tap), Toast.LENGTH_SHORT).show();
352+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
353+
getString(R.string.Toast_double_tap),null,null, Snackbar.LENGTH_SHORT);
352354
}
353355
mBackPressed = System.currentTimeMillis();
354356
}
@@ -365,7 +367,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
365367
public boolean onOptionsItemSelected(MenuItem item) {
366368
switch (item.getItemId()) {
367369
case R.id.menu_pslab_connected:
368-
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
370+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
371+
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
369372
break;
370373
case R.id.menu_pslab_disconnected:
371374
attemptToConnectPSLab();
@@ -389,14 +392,16 @@ private void attemptToConnectPSLab() {
389392
mScienceLabCommon = ScienceLabCommon.getInstance();
390393
if (communicationHandler.isConnected()) {
391394
initialisationDialog.dismiss();
392-
Toast.makeText(this, getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
395+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
396+
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
393397
} else {
394398
communicationHandler = new CommunicationHandler(usbManager);
395399
if (communicationHandler.isDeviceFound()) {
396400
attemptToGetUSBPermission();
397401
} else {
398402
initialisationDialog.dismiss();
399-
Toast.makeText(this, getString(R.string.device_not_found), Toast.LENGTH_SHORT).show();
403+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
404+
getString(R.string.device_not_found),null,null, Snackbar.LENGTH_SHORT);
400405
navItemIndex = 2;
401406
CURRENT_TAG = TAG_DEVICE;
402407
loadHomeFragment();
@@ -478,19 +483,22 @@ public void onReceive(Context context, Intent intent) {
478483
PSLabisConnected = mScienceLabCommon.openDevice(communicationHandler);
479484
initialisationDialog.dismiss();
480485
invalidateOptionsMenu();
481-
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
486+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
487+
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
482488
if (navItemIndex == 0) {
483489
getSupportFragmentManager().beginTransaction().replace(R.id.frame, InstrumentsFragment.newInstance()).commit();
484490
} else if (navItemIndex == 1) {
485491
getSupportFragmentManager().beginTransaction().replace(R.id.frame, HomeFragment.newInstance(true, true)).commitAllowingStateLoss();
486492
} else {
487-
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
493+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
494+
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
488495
}
489496
}
490497
} else {
491498
initialisationDialog.dismiss();
492499
Log.d(TAG, "permission denied for device " + device);
493-
Toast.makeText(getApplicationContext(), getString(R.string.device_not_found), Toast.LENGTH_SHORT).show();
500+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
501+
getString(R.string.device_not_found),null,null, Snackbar.LENGTH_SHORT);
494502
}
495503
}
496504
}
@@ -512,7 +520,8 @@ protected void onNewIntent(Intent intent) {
512520
} else if (navItemIndex == 1) {
513521
getSupportFragmentManager().beginTransaction().replace(R.id.frame, HomeFragment.newInstance(true, true)).commitAllowingStateLoss();
514522
}
515-
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
523+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
524+
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
516525
}
517526
}
518527
}

‎app/src/main/java/io/pslab/activity/RoboticArmActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import android.widget.LinearLayout;
3434
import android.widget.RelativeLayout;
3535
import android.widget.TextView;
36-
import android.widget.Toast;
3736

3837
import com.triggertrap.seekarc.SeekArc;
3938

@@ -115,7 +114,8 @@ public void onClick(View v) {
115114

116115
scienceLab = ScienceLabCommon.scienceLab;
117116
if (!scienceLab.isConnected()) {
118-
Toast.makeText(this, getResources().getString(R.string.device_not_connected), Toast.LENGTH_SHORT).show();
117+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
118+
getString(R.string.device_not_connected),null,null, Snackbar.LENGTH_SHORT);
119119
}
120120
Display display = getWindowManager().getDefaultDisplay();
121121
Point size = new Point();
@@ -565,7 +565,8 @@ public boolean onTouchEvent(MotionEvent event) {
565565
}
566566

567567
private void toastInvalidValueMessage() {
568-
Toast.makeText(RoboticArmActivity.this, getResources().getString(R.string.invalid_servo_value), Toast.LENGTH_SHORT).show();
568+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
569+
getString(R.string.invalid_servo_value),null,null, Snackbar.LENGTH_SHORT);
569570
}
570571

571572
private void setReceivedData() {

‎app/src/main/java/io/pslab/activity/SensorActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.support.annotation.Nullable;
1010
import android.support.design.widget.BottomSheetBehavior;
1111
import android.support.design.widget.CoordinatorLayout;
12+
import android.support.design.widget.Snackbar;
1213
import android.support.v7.app.AppCompatActivity;
1314
import android.view.GestureDetector;
1415
import android.view.MotionEvent;
@@ -20,11 +21,11 @@
2021
import android.widget.LinearLayout;
2122
import android.widget.ListView;
2223
import android.widget.TextView;
23-
import android.widget.Toast;
2424

2525
import io.pslab.R;
2626
import io.pslab.communication.ScienceLab;
2727
import io.pslab.communication.peripherals.I2C;
28+
import io.pslab.others.CustomSnackBar;
2829
import io.pslab.others.MathUtils;
2930
import io.pslab.others.ScienceLabCommon;
3031
import io.pslab.others.SwipeGestureDetector;
@@ -162,7 +163,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
162163
startActivity(intent);
163164
break;
164165
default:
165-
Toast.makeText(getApplication(), "Sensor Not Supported", Toast.LENGTH_SHORT).show();
166+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
167+
"Sensor Not Supported",null,null, Snackbar.LENGTH_SHORT);
166168
}
167169
}
168170
});

‎app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.widget.FrameLayout;
2828
import android.widget.ListView;
2929
import android.widget.TextView;
30-
import android.widget.Toast;
3130

3231
import com.afollestad.materialdialogs.DialogAction;
3332
import com.afollestad.materialdialogs.MaterialDialog;
@@ -38,6 +37,7 @@
3837
import io.pslab.communication.sensors.MPU6050;
3938
import io.pslab.models.DataMPU6050;
4039
import io.pslab.models.SensorLogged;
40+
import io.pslab.others.CustomSnackBar;
4141
import io.pslab.others.ScienceLabCommon;
4242

4343
import java.io.IOException;
@@ -157,7 +157,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
157157

158158
private void handleClick(int position) {
159159
String sensor = sensorList.get(position);
160-
Toast.makeText(context, sensor, Toast.LENGTH_SHORT).show();
160+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
161+
sensor,null,null,Snackbar.LENGTH_SHORT);
161162
switch (sensor) {
162163
case "MPU6050":
163164
MaterialDialog dialog = new MaterialDialog.Builder(context)
@@ -235,7 +236,8 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
235236
realm.copyToRealm(sensorLogged);
236237
}
237238
realm.commitTransaction();
238-
Toast.makeText(SensorDataLoggerActivity.this, "Data Logged Successfully", Toast.LENGTH_SHORT).show();
239+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
240+
"Data Logged Successfully",null,null,Snackbar.LENGTH_SHORT);
239241
dialog.dismiss();
240242
}
241243
})
@@ -300,7 +302,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
300302
hasPermission = true;
301303
} else {
302304
hasPermission = false;
303-
Toast.makeText(this, "Can't log data", Toast.LENGTH_SHORT).show();
305+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
306+
"Can't log data",null,null,Snackbar.LENGTH_SHORT);
304307
}
305308
}
306309
}

‎app/src/main/java/io/pslab/activity/ShowLoggedData.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.os.Environment;
77
import android.preference.PreferenceManager;
88
import android.support.annotation.Nullable;
9+
import android.support.design.widget.Snackbar;
910
import android.support.v7.app.AppCompatActivity;
1011
import android.support.v7.widget.DefaultItemAnimator;
1112
import android.support.v7.widget.LinearLayoutManager;
@@ -19,7 +20,6 @@
1920
import android.widget.LinearLayout;
2021
import android.widget.ListView;
2122
import android.widget.TextView;
22-
import android.widget.Toast;
2323

2424
import com.afollestad.materialdialogs.MaterialDialog;
2525

@@ -37,6 +37,7 @@
3737

3838
import butterknife.BindView;
3939
import butterknife.ButterKnife;
40+
import io.pslab.others.CustomSnackBar;
4041
import io.realm.Realm;
4142
import io.realm.RealmResults;
4243

@@ -174,7 +175,8 @@ private void exportCompleteSensorData(String sensor) {
174175
e.printStackTrace();
175176
}
176177
}
177-
Toast.makeText(context, "MPU6050 data exported successfully", Toast.LENGTH_SHORT).show();
178+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
179+
"MPU6050 data exported successfully",null,null, Snackbar.LENGTH_SHORT);
178180
break;
179181
}
180182
} else {
@@ -209,12 +211,14 @@ private void exportCompleteSensorData(String sensor) {
209211
} catch (FileNotFoundException e) {
210212
e.printStackTrace();
211213
}
212-
Toast.makeText(context, "MPU6050 data exported successfully", Toast.LENGTH_SHORT).show();
214+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
215+
"MPU6050 data exported successfully",null,null,Snackbar.LENGTH_SHORT);
213216
break;
214217
}
215218
}
216219
} else {
217-
Toast.makeText(context, "Can't write to storage", Toast.LENGTH_SHORT).show();
220+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
221+
"Can't write to storage",null,null,Snackbar.LENGTH_SHORT);
218222
}
219223
}
220224

‎app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import android.widget.LinearLayout;
4040
import android.widget.RelativeLayout;
4141
import android.widget.TextView;
42-
import android.widget.Toast;
4342

4443
import com.github.mikephil.charting.charts.LineChart;
4544
import com.github.mikephil.charting.components.Legend;
@@ -554,7 +553,8 @@ public void onClick(View view) {
554553
}, Snackbar.LENGTH_SHORT);
555554

556555
} else {
557-
Toast.makeText(WaveGeneratorActivity.this, R.string.device_not_connected, Toast.LENGTH_SHORT).show();
556+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
557+
getString(R.string.device_not_connected),null,null,Snackbar.LENGTH_SHORT);
558558
}
559559
}
560560

@@ -668,7 +668,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
668668
if (scienceLab.isConnected()) {
669669
viewWaveDialog();
670670
} else {
671-
Toast.makeText(WaveGeneratorActivity.this, R.string.device_not_connected, Toast.LENGTH_SHORT).show();
671+
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
672+
getString(R.string.device_not_connected),null,null,Snackbar.LENGTH_SHORT);
672673
}
673674
break;
674675
case R.id.show_guide:

‎app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.Intent;
66
import android.os.Environment;
77
import android.support.annotation.NonNull;
8+
import android.support.design.widget.Snackbar;
89
import android.support.v7.app.AlertDialog;
910
import android.support.v7.widget.CardView;
1011
import android.support.v7.widget.RecyclerView;
@@ -13,7 +14,6 @@
1314
import android.view.ViewGroup;
1415
import android.widget.ImageView;
1516
import android.widget.TextView;
16-
import android.widget.Toast;
1717

1818
import org.json.JSONArray;
1919
import org.json.JSONException;
@@ -53,6 +53,7 @@
5353
import io.pslab.models.ThermometerData;
5454
import io.pslab.models.WaveGeneratorData;
5555
import io.pslab.others.CSVLogger;
56+
import io.pslab.others.CustomSnackBar;
5657
import io.pslab.others.LocalDataLog;
5758
import io.realm.RealmRecyclerViewAdapter;
5859
import io.realm.RealmResults;
@@ -242,10 +243,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
242243
File.separator + CSVLogger.CSV_DIRECTORY +
243244
File.separator + block.getSensorType() +
244245
File.separator + CSVLogger.FILE_NAME_FORMAT.format(block.getBlock()) + ".csv");
245-
Toast.makeText(context, logDirectory.delete()
246-
? context.getString(R.string.log_deleted)
247-
: context.getString(R.string.nothing_to_delete),
248-
Toast.LENGTH_LONG).show();
246+
CustomSnackBar.showSnackBar(context.findViewById(android.R.id.content),
247+
logDirectory.delete()?context.getString(R.string.log_deleted)
248+
:context.getString(R.string.nothing_to_delete),null,null, Snackbar.LENGTH_LONG);
249249
if (block.getSensorType().equalsIgnoreCase(PSLabSensor.LUXMETER)) {
250250
LocalDataLog.with().clearBlockOfLuxRecords(block.getBlock());
251251
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.BAROMETER)) {
@@ -534,7 +534,8 @@ private void setMapDataToIntent(JSONArray array) {
534534
context.startActivity(map);
535535
} else {
536536
map.putExtra("hasMarkers", false);
537-
Toast.makeText(context, context.getResources().getString(R.string.no_location_data), Toast.LENGTH_LONG).show();
537+
CustomSnackBar.showSnackBar(context.findViewById(android.R.id.content),
538+
context.getString(R.string.no_location_data),null,null,Snackbar.LENGTH_LONG);
538539
}
539540
}
540541

0 commit comments

Comments
 (0)