Merge branch 'mapboxUpgrade' of s416084/find-my-tutor-android into develop
This commit is contained in:
commit
1abae28ae9
@ -10,7 +10,7 @@ android {
|
|||||||
applicationId "com.uam.wmi.findmytutor"
|
applicationId "com.uam.wmi.findmytutor"
|
||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 1
|
versionCode 2
|
||||||
versionName "0.9.2-alpha"
|
versionName "0.9.2-alpha"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
@ -52,7 +52,8 @@ dependencies {
|
|||||||
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
|
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
|
||||||
implementation 'io.swagger:swagger-annotations:1.5.15'
|
implementation 'io.swagger:swagger-annotations:1.5.15'
|
||||||
implementation 'org.threeten:threetenbp:1.3.5'
|
implementation 'org.threeten:threetenbp:1.3.5'
|
||||||
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.6.5'
|
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.2'
|
||||||
|
implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0'
|
||||||
implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
|
implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
|
||||||
implementation 'com.android.support:recyclerview-v7:27.1.1'
|
implementation 'com.android.support:recyclerview-v7:27.1.1'
|
||||||
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
|
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
|
||||||
@ -66,7 +67,6 @@ dependencies {
|
|||||||
implementation 'com.auth0.android:jwtdecode:1.1.1'
|
implementation 'com.auth0.android:jwtdecode:1.1.1'
|
||||||
implementation 'com.annimon:stream:1.2.1'
|
implementation 'com.annimon:stream:1.2.1'
|
||||||
implementation 'com.google.android.gms:play-services-location:16.0.0'
|
implementation 'com.google.android.gms:play-services-location:16.0.0'
|
||||||
implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0'
|
|
||||||
// FloatingBarMenu
|
// FloatingBarMenu
|
||||||
implementation 'com.getbase:floatingactionbutton:1.10.1'
|
implementation 'com.getbase:floatingactionbutton:1.10.1'
|
||||||
implementation 'org.apache.commons:commons-collections4:4.0'
|
implementation 'org.apache.commons:commons-collections4:4.0'
|
||||||
|
@ -126,7 +126,6 @@ public class MapActivity extends BaseActivity
|
|||||||
|
|
||||||
selectLocationButton = findViewById(R.id.select_location_button);
|
selectLocationButton = findViewById(R.id.select_location_button);
|
||||||
removeLocationButton = findViewById(R.id.remove_location_button);
|
removeLocationButton = findViewById(R.id.remove_location_button);
|
||||||
Mapbox.getInstance(this, getString(R.string.access_token));
|
|
||||||
mapView = findViewById(R.id.mapView);
|
mapView = findViewById(R.id.mapView);
|
||||||
mapView.onCreate(savedInstanceState);
|
mapView.onCreate(savedInstanceState);
|
||||||
mapView.getMapAsync(this);
|
mapView.getMapAsync(this);
|
||||||
@ -637,6 +636,7 @@ public class MapActivity extends BaseActivity
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getContentViewId() {
|
protected int getContentViewId() {
|
||||||
|
Mapbox.getInstance(this, getString(R.string.access_token));
|
||||||
return R.layout.activity_map;
|
return R.layout.activity_map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,5 +15,12 @@
|
|||||||
android:summary="%s"
|
android:summary="%s"
|
||||||
android:title="@string/title_language" />
|
android:title="@string/title_language" />
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="acra.disable"
|
||||||
|
android:title="@string/pref_disable_acra"
|
||||||
|
android:summaryOn="@string/pref_acra_disabled"
|
||||||
|
android:summaryOff="@string/pref_acra_enabled"
|
||||||
|
android:defaultValue="false"/>
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
@ -234,9 +234,12 @@
|
|||||||
<string name="manual_status_error">Error handling status fetch</string>
|
<string name="manual_status_error">Error handling status fetch</string>
|
||||||
<string name="error_status_fetch">Error handling status fetch</string>
|
<string name="error_status_fetch">Error handling status fetch</string>
|
||||||
|
|
||||||
|
<string name="pref_acra_disabled" translatable="false">Auto reporting on issue is OFF</string>
|
||||||
|
<string name="pref_acra_enabled" translatable="false">Auto reporting on issue is ON</string>
|
||||||
|
<string name="pref_disable_acra" translatable="false">ACRA reporting tool</string>
|
||||||
<string name="acra_toast_text" translatable="false">Sorry, the application crashed. A report will be sent to the developers</string>
|
<string name="acra_toast_text" translatable="false">Sorry, the application crashed. A report will be sent to the developers</string>
|
||||||
<string name="notification_text">Sorry, the application crashed. A report will be sent to the developers</string>
|
<string name="notification_text">Sorry, the application crashed. A report will be sent to the developers</string>
|
||||||
<string name="notification_title" translatable="false">FMT Crash</string>
|
<string name="notification_title" translatable="false">FMT Issue</string>
|
||||||
<string name="notification_channel" translatable="false">FMT</string>
|
<string name="notification_channel" translatable="false">FMT</string>
|
||||||
<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>
|
||||||
|
Loading…
Reference in New Issue
Block a user