Skip to content
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

Fixes #2021 Improving application localization #2022

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Fixes #2021 Improving application localization #2022

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
105 changes: 39 additions & 66 deletions app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,76 +61,49 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou
applicationItemList = new ArrayList<>();
applicationAdapter = new ApplicationAdapter(context, applicationItemList,
item -> {
Intent intent;
switch (item.getApplicationName()) {
case "Oscilloscope":
intent = new Intent(context, OscilloscopeActivity.class);
intent.putExtra("who", "Instruments");
startActivity(intent);
break;
case "Multimeter":
intent = new Intent(context, MultimeterActivity.class);
startActivity(intent);
break;
case "Logic Analyzer":
intent = new Intent(context, LogicalAnalyzerActivity.class);
startActivity(intent);
break;
case "Sensors":
intent = new Intent(context, SensorActivity.class);
startActivity(intent);
break;
case "Wave Generator":
intent = new Intent(context, WaveGeneratorActivity.class);
startActivity(intent);
break;
case "Power Source":
intent = new Intent(context, PowerSourceActivity.class);
startActivity(intent);
break;
case PSLabSensor.LUXMETER:
intent = new Intent(context, LuxMeterActivity.class);
startActivity(intent);
break;
case "Accelerometer":
intent = new Intent(context, AccelerometerActivity.class);
startActivity(intent);
break;
case PSLabSensor.BAROMETER:
intent = new Intent(context, BarometerActivity.class);
startActivity(intent);
break;
case "Compass":
intent = new Intent(context, CompassActivity.class);
startActivity(intent);
break;
case "Gyroscope":
intent = new Intent(context, GyroscopeActivity.class);
startActivity(intent);
break;
case "Thermometer":
intent = new Intent(context, ThermometerActivity.class);
startActivity(intent);
break;
case "Robotic Arm":
intent = new Intent(context, RoboticArmActivity.class);
startActivity(intent);
break;
case "Gas Sensor":
intent = new Intent(context, GasSensorActivity.class);
startActivity(intent);
break;
case "Dust Sensor":
intent = new Intent(context, DustSensorActivity.class);
startActivity(intent);
break;
default:
break;
Intent intent = null;
String applicationName = item.getApplicationName();

if (applicationName.equals(getString(R.string.oscilloscope))) {
intent = new Intent(context, OscilloscopeActivity.class);
intent.putExtra("who", "Instruments");
}

if (applicationName.equals(getString(R.string.multimeter)))
intent = new Intent(context, MultimeterActivity.class);
if (applicationName.equals(getString(R.string.logical_analyzer)))
intent = new Intent(context, LogicalAnalyzerActivity.class);
if (applicationName.equals(getString(R.string.sensors)))
intent = new Intent(context, SensorActivity.class);
if (applicationName.equals(getString(R.string.wave_generator)))
intent = new Intent(context, WaveGeneratorActivity.class);
if (applicationName.equals(getString(R.string.power_source)))
intent = new Intent(context, PowerSourceActivity.class);
if (applicationName.equals(getString(R.string.lux_meter)))
intent = new Intent(context, LuxMeterActivity.class);
if (applicationName.equals(getString(R.string.accelerometer)))
intent = new Intent(context, AccelerometerActivity.class);
if (applicationName.equals(getString(R.string.baro_meter)))
intent = new Intent(context, BarometerActivity.class);
if (applicationName.equals(getString(R.string.compass)))
intent = new Intent(context, CompassActivity.class);
if (applicationName.equals(getString(R.string.gyroscope)))
intent = new Intent(context, GyroscopeActivity.class);
if (applicationName.equals(getString(R.string.thermometer)))
intent = new Intent(context, ThermometerActivity.class);
if (applicationName.equals(getString(R.string.robotic_arm)))
intent = new Intent(context, RoboticArmActivity.class);
if (applicationName.equals(getString(R.string.gas_sensor)))
intent = new Intent(context, GasSensorActivity.class);
if (applicationName.equals(getString(R.string.dust_sensor)))
intent = new Intent(context, DustSensorActivity.class);

if (intent != null)
startActivity(intent);
});
int rows = context.getResources().getConfiguration().orientation
== Configuration.ORIENTATION_PORTRAIT ? 1 : 2;

initiateViews(view, rows);
new loadList().execute();
return view;
Expand Down Expand Up @@ -208,7 +181,7 @@ protected Void doInBackground(Void... params) {
));
applicationItemList.add(new ApplicationItem(
getResources().getString(R.string.thermometer), R.drawable.thermometer_logo, getResources().getString(descriptions[11])
));
));
applicationItemList.add(new ApplicationItem(
getResources().getString(R.string.robotic_arm), R.drawable.robotic_arm, getResources().getString(descriptions[12])
));
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/io/pslab/models/PSLabSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public abstract class PSLabSensor extends AppCompatActivity {
public static final String THERMOMETER = "Thermometer";
public static final String THERMOMETER_CONFIGURATIONS = "Thermometer Configurations";
public static final String THERMOMETER_DATA_FORMAT = "%.2f";
public static final String DUSTSENSOR = "Dust Sensor";
public static final String DUSTSENSOR_CONFIGURATIONS = "Dust Sensor Configurations";
public static final String ROBOTIC_ARM = "Robotic Arm";
public static final String WAVE_GENERATOR = "Wave Generator";
Expand Down