Skip to content

Commit abaafa9

Browse files
Mister-Caspermariobehling
Mister-Casper
authored and
mariobehling
committed
Fixes #2021 Improving application localization (#2022)
1 parent 07676ba commit abaafa9

File tree

2 files changed

+39
-67
lines changed

2 files changed

+39
-67
lines changed

‎app/src/main/java/io/pslab/fragment/InstrumentsFragment.java‎

Lines changed: 39 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -61,76 +61,49 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou
6161
applicationItemList = new ArrayList<>();
6262
applicationAdapter = new ApplicationAdapter(context, applicationItemList,
6363
item -> {
64-
Intent intent;
65-
switch (item.getApplicationName()) {
66-
case "Oscilloscope":
67-
intent = new Intent(context, OscilloscopeActivity.class);
68-
intent.putExtra("who", "Instruments");
69-
startActivity(intent);
70-
break;
71-
case "Multimeter":
72-
intent = new Intent(context, MultimeterActivity.class);
73-
startActivity(intent);
74-
break;
75-
case "Logic Analyzer":
76-
intent = new Intent(context, LogicalAnalyzerActivity.class);
77-
startActivity(intent);
78-
break;
79-
case "Sensors":
80-
intent = new Intent(context, SensorActivity.class);
81-
startActivity(intent);
82-
break;
83-
case "Wave Generator":
84-
intent = new Intent(context, WaveGeneratorActivity.class);
85-
startActivity(intent);
86-
break;
87-
case "Power Source":
88-
intent = new Intent(context, PowerSourceActivity.class);
89-
startActivity(intent);
90-
break;
91-
case PSLabSensor.LUXMETER:
92-
intent = new Intent(context, LuxMeterActivity.class);
93-
startActivity(intent);
94-
break;
95-
case "Accelerometer":
96-
intent = new Intent(context, AccelerometerActivity.class);
97-
startActivity(intent);
98-
break;
99-
case PSLabSensor.BAROMETER:
100-
intent = new Intent(context, BarometerActivity.class);
101-
startActivity(intent);
102-
break;
103-
case "Compass":
104-
intent = new Intent(context, CompassActivity.class);
105-
startActivity(intent);
106-
break;
107-
case "Gyroscope":
108-
intent = new Intent(context, GyroscopeActivity.class);
109-
startActivity(intent);
110-
break;
111-
case "Thermometer":
112-
intent = new Intent(context, ThermometerActivity.class);
113-
startActivity(intent);
114-
break;
115-
case "Robotic Arm":
116-
intent = new Intent(context, RoboticArmActivity.class);
117-
startActivity(intent);
118-
break;
119-
case "Gas Sensor":
120-
intent = new Intent(context, GasSensorActivity.class);
121-
startActivity(intent);
122-
break;
123-
case "Dust Sensor":
124-
intent = new Intent(context, DustSensorActivity.class);
125-
startActivity(intent);
126-
break;
127-
default:
128-
break;
64+
Intent intent = null;
65+
String applicationName = item.getApplicationName();
66+
67+
if (applicationName.equals(getString(R.string.oscilloscope))) {
68+
intent = new Intent(context, OscilloscopeActivity.class);
69+
intent.putExtra("who", "Instruments");
12970
}
13071

72+
if (applicationName.equals(getString(R.string.multimeter)))
73+
intent = new Intent(context, MultimeterActivity.class);
74+
if (applicationName.equals(getString(R.string.logical_analyzer)))
75+
intent = new Intent(context, LogicalAnalyzerActivity.class);
76+
if (applicationName.equals(getString(R.string.sensors)))
77+
intent = new Intent(context, SensorActivity.class);
78+
if (applicationName.equals(getString(R.string.wave_generator)))
79+
intent = new Intent(context, WaveGeneratorActivity.class);
80+
if (applicationName.equals(getString(R.string.power_source)))
81+
intent = new Intent(context, PowerSourceActivity.class);
82+
if (applicationName.equals(getString(R.string.lux_meter)))
83+
intent = new Intent(context, LuxMeterActivity.class);
84+
if (applicationName.equals(getString(R.string.accelerometer)))
85+
intent = new Intent(context, AccelerometerActivity.class);
86+
if (applicationName.equals(getString(R.string.baro_meter)))
87+
intent = new Intent(context, BarometerActivity.class);
88+
if (applicationName.equals(getString(R.string.compass)))
89+
intent = new Intent(context, CompassActivity.class);
90+
if (applicationName.equals(getString(R.string.gyroscope)))
91+
intent = new Intent(context, GyroscopeActivity.class);
92+
if (applicationName.equals(getString(R.string.thermometer)))
93+
intent = new Intent(context, ThermometerActivity.class);
94+
if (applicationName.equals(getString(R.string.robotic_arm)))
95+
intent = new Intent(context, RoboticArmActivity.class);
96+
if (applicationName.equals(getString(R.string.gas_sensor)))
97+
intent = new Intent(context, GasSensorActivity.class);
98+
if (applicationName.equals(getString(R.string.dust_sensor)))
99+
intent = new Intent(context, DustSensorActivity.class);
100+
101+
if (intent != null)
102+
startActivity(intent);
131103
});
132104
int rows = context.getResources().getConfiguration().orientation
133105
== Configuration.ORIENTATION_PORTRAIT ? 1 : 2;
106+
134107
initiateViews(view, rows);
135108
new loadList().execute();
136109
return view;
@@ -208,7 +181,7 @@ protected Void doInBackground(Void... params) {
208181
));
209182
applicationItemList.add(new ApplicationItem(
210183
getResources().getString(R.string.thermometer), R.drawable.thermometer_logo, getResources().getString(descriptions[11])
211-
));
184+
));
212185
applicationItemList.add(new ApplicationItem(
213186
getResources().getString(R.string.robotic_arm), R.drawable.robotic_arm, getResources().getString(descriptions[12])
214187
));

‎app/src/main/java/io/pslab/models/PSLabSensor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public abstract class PSLabSensor extends AppCompatActivity {
107107
public static final String THERMOMETER = "Thermometer";
108108
public static final String THERMOMETER_CONFIGURATIONS = "Thermometer Configurations";
109109
public static final String THERMOMETER_DATA_FORMAT = "%.2f";
110-
public static final String DUSTSENSOR = "Dust Sensor";
111110
public static final String DUSTSENSOR_CONFIGURATIONS = "Dust Sensor Configurations";
112111
public static final String ROBOTIC_ARM = "Robotic Arm";
113112
public static final String WAVE_GENERATOR = "Wave Generator";

0 commit comments

Comments
 (0)