added some translation and removed throwing error for testing

This commit is contained in:
Domagalski 2018-12-05 22:45:11 +01:00
parent d1adf451a0
commit 0dd0b0dc23
4 changed files with 12 additions and 8 deletions

View File

@ -29,7 +29,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@ -80,8 +80,6 @@ public class MapActivity extends BaseActivity
private int mInterval = 10000; private int mInterval = 10000;
private Handler mHandler = new Handler(); private Handler mHandler = new Handler();
private Runnable mStatusChecker; private Runnable mStatusChecker;
private Handler manualLocHandler = new Handler();
private Runnable manualLocStatusChecker;
private MapView mapView; private MapView mapView;
private MapboxMap mapboxMap; private MapboxMap mapboxMap;
private Button selectLocationButton; private Button selectLocationButton;
@ -301,8 +299,6 @@ public class MapActivity extends BaseActivity
tmpLocalMarker = null; tmpLocalMarker = null;
showLocationDialog(latLng); showLocationDialog(latLng);
// TODO remove after acra tests
throw new RuntimeException("This is a crash");
} }
}); });
}); });
@ -625,8 +621,6 @@ public class MapActivity extends BaseActivity
super.onDestroy(); super.onDestroy();
mapView.onDestroy(); mapView.onDestroy();
mHandler.removeCallbacks(mStatusChecker); mHandler.removeCallbacks(mStatusChecker);
// TODO remove after BG sending
manualLocHandler.removeCallbacks(manualLocStatusChecker);
disposable.dispose(); disposable.dispose();
} }

View File

@ -163,6 +163,10 @@
<string name="lack_duty_hours">Brak informacji o dyzurze.</string> <string name="lack_duty_hours">Brak informacji o dyzurze.</string>
<string name="lack_note">Brak notatki.</string> <string name="lack_note">Brak notatki.</string>
<string name="search">Wyszukiwarka</string> <string name="search">Wyszukiwarka</string>
<string name="description_notdisturb">Nie przeszkadzać</string>
<string name="description_awaiting">Czekam na studentów</string>
<string name="description_onholidays">Na wakacjach</string>
<string name="title_description">Status</string>
</resources> </resources>

View File

@ -73,11 +73,16 @@
<string name="key_location_level">key_location_level</string> <string name="key_location_level">key_location_level</string>
<string name="status_list_title">Choose status</string> <string name="status_list_title">Choose status</string>
<string name="key_status_value">key_status_value</string> <string name="key_status_value" translatable="false">key_status_value</string>
<string name="status_switch_title">Status</string> <string name="status_switch_title">Status</string>
<string name="description_busy">Busy</string> <string name="description_busy">Busy</string>
<string name="description_available">Available</string> <string name="description_available">Available</string>
<string name="description_consultation">Consultation</string> <string name="description_consultation">Consultation</string>
<string name="description_notdisturb">Do not disturb</string>
<string name="description_awaiting">Waiting for students</string>
<string name="description_onholidays">On holidays</string>
<string name="title_description">Status</string>
<string name="title_manual_status">Add custom status</string> <string name="title_manual_status">Add custom status</string>
@ -236,4 +241,5 @@
<string name="lack_duty_hours">Lack information about duty hours</string> <string name="lack_duty_hours">Lack information about duty hours</string>
<string name="lack_note">No note.</string> <string name="lack_note">No note.</string>
<string name="search">Search</string> <string name="search">Search</string>
<string name="mockup_location_string" translatable="false">mock location string</string>
</resources> </resources>