Skip to content

Fixes #1999 Replaced Toast Messages with Snackbar messages #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2019
Merged

Fixes #1999 Replaced Toast Messages with Snackbar messages #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/io/pslab/activity/CreateConfigActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.Toast;

import java.io.File;
import java.io.FileWriter;
Expand Down Expand Up @@ -99,7 +98,8 @@ public void onNothingSelected(AdapterView<?> parent) {
public void onClick(View v) {
interval = intervalEditText.getText().toString();
if (interval.length() == 0) {
Toast.makeText(CreateConfigActivity.this, getResources().getString(R.string.no_interval_message), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.no_interval_message),null,null, Snackbar.LENGTH_SHORT);
} else {
ArrayList<String> selectedParamsList = new ArrayList<>();
for (int i = 0; i < paramsListContainer.getChildCount(); i++) {
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/io/pslab/activity/DataLoggerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DividerItemDecoration;
Expand All @@ -19,7 +20,6 @@
import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;

import java.io.BufferedReader;
import java.io.File;
Expand All @@ -45,6 +45,7 @@
import io.pslab.models.ThermometerData;
import io.pslab.models.WaveGeneratorData;
import io.pslab.others.CSVLogger;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.LocalDataLog;
import io.realm.Realm;
import io.realm.RealmObject;
Expand Down Expand Up @@ -209,7 +210,8 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
File file = new File(path);
getFileData(file);
} else
Toast.makeText(this, this.getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.no_file_selected),null,null, Snackbar.LENGTH_SHORT);
}
}

Expand All @@ -230,11 +232,13 @@ private void getFileData(File file) {
if (object != null) {
realm.copyToRealm(object);
} else {
Toast.makeText(this, getResources().getString(R.string.incorrect_import_format), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.incorrect_import_format),null,null, Snackbar.LENGTH_SHORT);
}
realm.commitTransaction();
} catch (Exception e) {
Toast.makeText(this, getResources().getString(R.string.incorrect_import_format), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.incorrect_import_format),null,null, Snackbar.LENGTH_SHORT);
}
} else if (i == 0) {
block = System.currentTimeMillis();
Expand Down
27 changes: 18 additions & 9 deletions app/src/main/java/io/pslab/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import android.support.annotation.Nullable;
import android.support.customtabs.CustomTabsServiceConnection;
import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
Expand All @@ -28,7 +29,6 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

import java.io.IOException;

Expand All @@ -42,6 +42,7 @@
import io.pslab.fragment.HomeFragment;
import io.pslab.fragment.InstrumentsFragment;
import io.pslab.fragment.PSLabPinLayoutFragment;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.CustomTabService;
import io.pslab.others.InitializationVariable;
import io.pslab.others.ScienceLabCommon;
Expand Down Expand Up @@ -348,7 +349,8 @@ public void onBackPressed() {
super.onBackPressed();
return;
} else {
Toast.makeText(getBaseContext(), getString(R.string.Toast_double_tap), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.Toast_double_tap),null,null, Snackbar.LENGTH_SHORT);
}
mBackPressed = System.currentTimeMillis();
}
Expand All @@ -365,7 +367,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_pslab_connected:
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
break;
case R.id.menu_pslab_disconnected:
attemptToConnectPSLab();
Expand All @@ -389,14 +392,16 @@ private void attemptToConnectPSLab() {
mScienceLabCommon = ScienceLabCommon.getInstance();
if (communicationHandler.isConnected()) {
initialisationDialog.dismiss();
Toast.makeText(this, getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
} else {
communicationHandler = new CommunicationHandler(usbManager);
if (communicationHandler.isDeviceFound()) {
attemptToGetUSBPermission();
} else {
initialisationDialog.dismiss();
Toast.makeText(this, getString(R.string.device_not_found), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_not_found),null,null, Snackbar.LENGTH_SHORT);
navItemIndex = 2;
CURRENT_TAG = TAG_DEVICE;
loadHomeFragment();
Expand Down Expand Up @@ -478,19 +483,22 @@ public void onReceive(Context context, Intent intent) {
PSLabisConnected = mScienceLabCommon.openDevice(communicationHandler);
initialisationDialog.dismiss();
invalidateOptionsMenu();
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
if (navItemIndex == 0) {
getSupportFragmentManager().beginTransaction().replace(R.id.frame, InstrumentsFragment.newInstance()).commit();
} else if (navItemIndex == 1) {
getSupportFragmentManager().beginTransaction().replace(R.id.frame, HomeFragment.newInstance(true, true)).commitAllowingStateLoss();
} else {
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
}
}
} else {
initialisationDialog.dismiss();
Log.d(TAG, "permission denied for device " + device);
Toast.makeText(getApplicationContext(), getString(R.string.device_not_found), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_not_found),null,null, Snackbar.LENGTH_SHORT);
}
}
}
Expand All @@ -512,7 +520,8 @@ protected void onNewIntent(Intent intent) {
} else if (navItemIndex == 1) {
getSupportFragmentManager().beginTransaction().replace(R.id.frame, HomeFragment.newInstance(true, true)).commitAllowingStateLoss();
}
Toast.makeText(getApplicationContext(), getString(R.string.device_connected_successfully), Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_connected_successfully),null,null, Snackbar.LENGTH_SHORT);
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/io/pslab/activity/RoboticArmActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

import com.triggertrap.seekarc.SeekArc;

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

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

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

private void setReceivedData() {
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/io/pslab/activity/SensorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import android.support.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.view.GestureDetector;
import android.view.MotionEvent;
Expand All @@ -20,11 +21,11 @@
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;

import io.pslab.R;
import io.pslab.communication.ScienceLab;
import io.pslab.communication.peripherals.I2C;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.MathUtils;
import io.pslab.others.ScienceLabCommon;
import io.pslab.others.SwipeGestureDetector;
Expand Down Expand Up @@ -162,7 +163,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
startActivity(intent);
break;
default:
Toast.makeText(getApplication(), "Sensor Not Supported", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"Sensor Not Supported",null,null, Snackbar.LENGTH_SHORT);
}
}
});
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/io/pslab/activity/SensorDataLoggerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;

import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
Expand All @@ -38,6 +37,7 @@
import io.pslab.communication.sensors.MPU6050;
import io.pslab.models.DataMPU6050;
import io.pslab.models.SensorLogged;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.ScienceLabCommon;

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

private void handleClick(int position) {
String sensor = sensorList.get(position);
Toast.makeText(context, sensor, Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
sensor,null,null,Snackbar.LENGTH_SHORT);
switch (sensor) {
case "MPU6050":
MaterialDialog dialog = new MaterialDialog.Builder(context)
Expand Down Expand Up @@ -235,7 +236,8 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
realm.copyToRealm(sensorLogged);
}
realm.commitTransaction();
Toast.makeText(SensorDataLoggerActivity.this, "Data Logged Successfully", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"Data Logged Successfully",null,null,Snackbar.LENGTH_SHORT);
dialog.dismiss();
}
})
Expand Down Expand Up @@ -300,7 +302,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
hasPermission = true;
} else {
hasPermission = false;
Toast.makeText(this, "Can't log data", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"Can't log data",null,null,Snackbar.LENGTH_SHORT);
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/io/pslab/activity/ShowLoggedData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -19,7 +20,6 @@
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;

import com.afollestad.materialdialogs.MaterialDialog;

Expand All @@ -37,6 +37,7 @@

import butterknife.BindView;
import butterknife.ButterKnife;
import io.pslab.others.CustomSnackBar;
import io.realm.Realm;
import io.realm.RealmResults;

Expand Down Expand Up @@ -174,7 +175,8 @@ private void exportCompleteSensorData(String sensor) {
e.printStackTrace();
}
}
Toast.makeText(context, "MPU6050 data exported successfully", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"MPU6050 data exported successfully",null,null, Snackbar.LENGTH_SHORT);
break;
}
} else {
Expand Down Expand Up @@ -209,12 +211,14 @@ private void exportCompleteSensorData(String sensor) {
} catch (FileNotFoundException e) {
e.printStackTrace();
}
Toast.makeText(context, "MPU6050 data exported successfully", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"MPU6050 data exported successfully",null,null,Snackbar.LENGTH_SHORT);
break;
}
}
} else {
Toast.makeText(context, "Can't write to storage", Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
"Can't write to storage",null,null,Snackbar.LENGTH_SHORT);
}
}

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

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

} else {
Toast.makeText(WaveGeneratorActivity.this, R.string.device_not_connected, Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_not_connected),null,null,Snackbar.LENGTH_SHORT);
}
}

Expand Down Expand Up @@ -668,7 +668,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
if (scienceLab.isConnected()) {
viewWaveDialog();
} else {
Toast.makeText(WaveGeneratorActivity.this, R.string.device_not_connected, Toast.LENGTH_SHORT).show();
CustomSnackBar.showSnackBar(findViewById(android.R.id.content),
getString(R.string.device_not_connected),null,null,Snackbar.LENGTH_SHORT);
}
break;
case R.id.show_guide:
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.Intent;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
Expand All @@ -13,7 +14,6 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

import org.json.JSONArray;
import org.json.JSONException;
Expand Down Expand Up @@ -53,6 +53,7 @@
import io.pslab.models.ThermometerData;
import io.pslab.models.WaveGeneratorData;
import io.pslab.others.CSVLogger;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.LocalDataLog;
import io.realm.RealmRecyclerViewAdapter;
import io.realm.RealmResults;
Expand Down Expand Up @@ -242,10 +243,9 @@ public void onClick(DialogInterface dialog, int whichButton) {
File.separator + CSVLogger.CSV_DIRECTORY +
File.separator + block.getSensorType() +
File.separator + CSVLogger.FILE_NAME_FORMAT.format(block.getBlock()) + ".csv");
Toast.makeText(context, logDirectory.delete()
? context.getString(R.string.log_deleted)
: context.getString(R.string.nothing_to_delete),
Toast.LENGTH_LONG).show();
CustomSnackBar.showSnackBar(context.findViewById(android.R.id.content),
logDirectory.delete()?context.getString(R.string.log_deleted)
:context.getString(R.string.nothing_to_delete),null,null, Snackbar.LENGTH_LONG);
if (block.getSensorType().equalsIgnoreCase(PSLabSensor.LUXMETER)) {
LocalDataLog.with().clearBlockOfLuxRecords(block.getBlock());
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.BAROMETER)) {
Expand Down Expand Up @@ -534,7 +534,8 @@ private void setMapDataToIntent(JSONArray array) {
context.startActivity(map);
} else {
map.putExtra("hasMarkers", false);
Toast.makeText(context, context.getResources().getString(R.string.no_location_data), Toast.LENGTH_LONG).show();
CustomSnackBar.showSnackBar(context.findViewById(android.R.id.content),
context.getString(R.string.no_location_data),null,null,Snackbar.LENGTH_LONG);
}
}

Expand Down
Loading