Compare commits
No commits in common. "master" and "fix-android-permissions" have entirely different histories.
master
...
fix-androi
1
.gitignore
vendored
1
.gitignore
vendored
@ -64,4 +64,3 @@ fastlane/Preview.html
|
|||||||
fastlane/screenshots
|
fastlane/screenshots
|
||||||
fastlane/test_output
|
fastlane/test_output
|
||||||
fastlane/readme.md
|
fastlane/readme.md
|
||||||
app/src/main/res/.DS_Store
|
|
||||||
|
|||||||
6
.idea/encodings.xml
Normal file
6
.idea/encodings.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Encoding">
|
||||||
|
<file url="file://$PROJECT_DIR$/app/src/main/java/com/uam/wmi/findmytutor/activity/MapFragment.java" charset="UTF-8" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -10,11 +10,10 @@ android {
|
|||||||
applicationId "com.uam.wmi.findmytutor"
|
applicationId "com.uam.wmi.findmytutor"
|
||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 66
|
versionCode 1
|
||||||
versionName "1.0.0"
|
versionName "1.0"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
resConfigs "en", "pl"
|
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
@ -29,18 +28,10 @@ repositories {
|
|||||||
url 'http://dl.bintray.com/amulyakhare/maven'
|
url 'http://dl.bintray.com/amulyakhare/maven'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
def acraVersion = '5.2.1'
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "ch.acra:acra-http:$acraVersion"
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation "ch.acra:acra-toast:$acraVersion"
|
implementation 'com.android.support:appcompat-v7:27.1.1'
|
||||||
implementation "ch.acra:acra-notification:$acraVersion"
|
|
||||||
implementation "ch.acra:acra-limiter:$acraVersion"
|
|
||||||
|
|
||||||
|
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
|
||||||
implementation 'com.android.support:preference-v7:27.1.1'
|
|
||||||
implementation 'com.android.support:cardview-v7:27.1.1'
|
|
||||||
implementation 'com.android.support:design:27.1.1'
|
implementation 'com.android.support:design:27.1.1'
|
||||||
implementation 'com.android.support:support-v4:27.1.1'
|
implementation 'com.android.support:support-v4:27.1.1'
|
||||||
implementation 'com.android.support:support-vector-drawable:27.1.1'
|
implementation 'com.android.support:support-vector-drawable:27.1.1'
|
||||||
@ -51,30 +42,20 @@ dependencies {
|
|||||||
implementation 'com.google.code.gson:gson:2.8.5'
|
implementation 'com.google.code.gson:gson:2.8.5'
|
||||||
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
|
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
|
||||||
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.7.2'
|
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.4.0'
|
||||||
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'
|
||||||
implementation 'com.jakewharton:butterknife:8.8.1'
|
implementation "com.jakewharton:butterknife:8.8.1"
|
||||||
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
|
annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
|
||||||
implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
|
implementation "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0"
|
||||||
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
|
implementation "com.squareup.okhttp3:okhttp:3.11.0"
|
||||||
implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
|
implementation "com.squareup.okhttp3:okhttp-urlconnection:3.10.0"
|
||||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
|
implementation "com.squareup.okhttp3:logging-interceptor:3.11.0"
|
||||||
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
|
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
|
||||||
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'
|
|
||||||
// FloatingBarMenu
|
|
||||||
implementation 'com.getbase:floatingactionbutton:1.10.1'
|
|
||||||
implementation 'org.apache.commons:commons-collections4:4.0'
|
|
||||||
implementation 'com.android.support:design:27.1.1'
|
|
||||||
|
|
||||||
// spinner loaders library
|
|
||||||
implementation 'com.github.ybq:Android-SpinKit:1.2.0'
|
|
||||||
// rx binding
|
|
||||||
implementation 'com.jakewharton.rxbinding:rxbinding:0.3.0'
|
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -4,12 +4,13 @@
|
|||||||
package="com.uam.wmi.findmytutor">
|
package="com.uam.wmi.findmytutor">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES" />
|
<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
|
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
|
||||||
@ -17,20 +18,16 @@
|
|||||||
<uses-feature android:name="android.hardware.location.gps" />
|
<uses-feature android:name="android.hardware.location.gps" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".FindMyTutor"
|
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme">
|
||||||
android:configChanges="locale"
|
|
||||||
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.StartupActivity"
|
android:name=".activity.StartupActivity"
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
android:label="@string/title_activity_startup"
|
||||||
android:launchMode="singleInstance"
|
android:launchMode="singleInstance"
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:theme="@style/AppTheme.NoActionBar">
|
android:theme="@style/AppTheme.NoActionBar">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@ -40,44 +37,25 @@
|
|||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.MapActivity"
|
android:name=".activity.MapActivity"
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
android:label="@string/title_activity_main"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop" />
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:windowSoftInputMode="adjustPan" />
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.LoginActivity"
|
android:name=".activity.LoginActivity"
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
||||||
android:excludeFromRecents="true"
|
android:excludeFromRecents="true"
|
||||||
|
android:label="@string/title_activity_login"
|
||||||
android:launchMode="singleTask"
|
android:launchMode="singleTask"
|
||||||
android:noHistory="true"
|
android:noHistory="true" />
|
||||||
android:screenOrientation="portrait" />
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.SettingsActivity"
|
android:name=".activity.SettingsActivity"
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
android:label="@string/title_activity_settings" />
|
||||||
android:screenOrientation="portrait" />
|
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".service.BackgroundLocalizationService"
|
android:name=".service.BackgroundLocalizationService"
|
||||||
android:enabled="true"
|
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:launchMode="singleTop" />
|
android:launchMode="singleTop"
|
||||||
|
android:enabled="true"
|
||||||
<activity
|
/>
|
||||||
android:name=".activity.TutorTab"
|
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
||||||
android:windowSoftInputMode="stateHidden|adjustPan"
|
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:theme="@style/AppTheme" />
|
|
||||||
<activity
|
|
||||||
android:name=".activity.WhiteList"
|
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:theme="@style/AppTheme" />
|
|
||||||
<activity
|
|
||||||
android:name=".activity.BlackList"
|
|
||||||
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
||||||
android:screenOrientation="portrait"
|
|
||||||
android:theme="@style/AppTheme" />
|
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
|
|||||||
@ -1,398 +0,0 @@
|
|||||||
{
|
|
||||||
"features": [
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Skrzydło B",
|
|
||||||
"longitude" : 52.466669,
|
|
||||||
"latitude" : 16.926624
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92618,
|
|
||||||
52.466248
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926435,
|
|
||||||
52.466201
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92646,
|
|
||||||
52.466255
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926516,
|
|
||||||
52.466244
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926999,
|
|
||||||
52.46711
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926796,
|
|
||||||
52.467145
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926782,
|
|
||||||
52.467117
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926784,
|
|
||||||
52.467121
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926691,
|
|
||||||
52.467139
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926662,
|
|
||||||
52.46709
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926757,
|
|
||||||
52.467072
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926544,
|
|
||||||
52.466691
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926434,
|
|
||||||
52.46671
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926396,
|
|
||||||
52.466655
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926519,
|
|
||||||
52.466628
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926323,
|
|
||||||
52.466281
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926213,
|
|
||||||
52.466307
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92618,
|
|
||||||
52.466248
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "41798cf663bc55c10e6c51c3fe174eda"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Biblioteka",
|
|
||||||
"longitude" : 52.467351,
|
|
||||||
"latitude" : 16.926900
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927048,
|
|
||||||
52.46721
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926627,
|
|
||||||
52.467295
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926732,
|
|
||||||
52.467482
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926876,
|
|
||||||
52.467461
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926967,
|
|
||||||
52.467428
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927014,
|
|
||||||
52.467402
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927171,
|
|
||||||
52.467359
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.9271,
|
|
||||||
52.467202
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927048,
|
|
||||||
52.46721
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "7328c3c9dffd3e76be8d3dcef4f58ddc"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Łącznik",
|
|
||||||
"longitude" : 52.466619,
|
|
||||||
"latitude" : 16.926860
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926759,
|
|
||||||
52.466683
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927088,
|
|
||||||
52.46661
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927019,
|
|
||||||
52.466502
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.9267,
|
|
||||||
52.466571
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926759,
|
|
||||||
52.466683
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "8c19ee28e4c07ece9756fd21f290713b"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Skrzydło A",
|
|
||||||
"longitude" : 52.466559,
|
|
||||||
"latitude" : 16.927163
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926771,
|
|
||||||
52.466106
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926898,
|
|
||||||
52.466079
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926926,
|
|
||||||
52.466126
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927026,
|
|
||||||
52.466107
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92723,
|
|
||||||
52.466473
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927184,
|
|
||||||
52.466483
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927243,
|
|
||||||
52.466586
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927334,
|
|
||||||
52.46656
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927602,
|
|
||||||
52.466889
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927275,
|
|
||||||
52.466959
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926771,
|
|
||||||
52.466106
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "c33bfba772c85cc38ae417843d31b1ff"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Aule",
|
|
||||||
"longitude" : 52.467114,
|
|
||||||
"latitude" : 16.927621
|
|
||||||
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92731,
|
|
||||||
52.467158
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927315,
|
|
||||||
52.46718
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927348,
|
|
||||||
52.467199
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927393,
|
|
||||||
52.467224
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927426,
|
|
||||||
52.467239
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927476,
|
|
||||||
52.467258
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92755,
|
|
||||||
52.467264
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927625,
|
|
||||||
52.467263
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927699,
|
|
||||||
52.467246
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92776,
|
|
||||||
52.467212
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927821,
|
|
||||||
52.467158
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927838,
|
|
||||||
52.467099
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927827,
|
|
||||||
52.467059
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927793,
|
|
||||||
52.467012
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927738,
|
|
||||||
52.466976
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927661,
|
|
||||||
52.466949
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927581,
|
|
||||||
52.466939
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927534,
|
|
||||||
52.466938
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927467,
|
|
||||||
52.466949
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927387,
|
|
||||||
52.467047
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927315,
|
|
||||||
52.467153
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92731,
|
|
||||||
52.467158
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "c779419e3fd7faef8555e1099547a82c"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Hol",
|
|
||||||
"longitude" : 52.4671021,
|
|
||||||
"latitude" : 16.927122
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926625,
|
|
||||||
52.467294
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926568,
|
|
||||||
52.46719
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927008,
|
|
||||||
52.467108
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926953,
|
|
||||||
52.467024
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927463,
|
|
||||||
52.466919
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927467,
|
|
||||||
52.466956
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927316,
|
|
||||||
52.467153
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926907,
|
|
||||||
52.467235
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926625,
|
|
||||||
52.467294
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "facdd5349991758b9ad99d4e123c91cc"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "FeatureCollection"
|
|
||||||
}
|
|
||||||
@ -1,727 +0,0 @@
|
|||||||
{
|
|
||||||
"features": [
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Pokoje profesorskie"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926707,
|
|
||||||
52.46657
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92652,
|
|
||||||
52.466244
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926459,
|
|
||||||
52.466255
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926645,
|
|
||||||
52.466582
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926707,
|
|
||||||
52.46657
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "07f45cd94d45bb5ad0b6b285b0f6fbbb"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Skrzydło B"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926961,
|
|
||||||
52.467026
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466682
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92652,
|
|
||||||
52.466244
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926459,
|
|
||||||
52.466255
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926428,
|
|
||||||
52.466203
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926175,
|
|
||||||
52.46625
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92621,
|
|
||||||
52.466306
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926323,
|
|
||||||
52.466282
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926515,
|
|
||||||
52.466632
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926408,
|
|
||||||
52.466654
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92644,
|
|
||||||
52.466712
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926543,
|
|
||||||
52.46669
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926754,
|
|
||||||
52.467067
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926961,
|
|
||||||
52.467026
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "143facf35f322434cfc5776f70f1db36"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Winda"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92669,
|
|
||||||
52.467141
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92666,
|
|
||||||
52.467089
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926755,
|
|
||||||
52.46707
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926786,
|
|
||||||
52.467121
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92669,
|
|
||||||
52.467141
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "1a35bfafd619b80ffb8b36f03549e9e3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "D2"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926876,
|
|
||||||
52.466659
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926984,
|
|
||||||
52.466635
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92694,
|
|
||||||
52.466557
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926831,
|
|
||||||
52.46658
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926876,
|
|
||||||
52.466659
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "3e0a32a0583254e9e7c47fea1f402472"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Sale A"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92714,
|
|
||||||
52.466489
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926925,
|
|
||||||
52.466127
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927027,
|
|
||||||
52.466106
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927232,
|
|
||||||
52.466472
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92714,
|
|
||||||
52.466489
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "3e56cb54baf90049a3ce2f16577c2cd8"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "D1"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926984,
|
|
||||||
52.466635
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927084,
|
|
||||||
52.466614
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92704,
|
|
||||||
52.466536
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92694,
|
|
||||||
52.466557
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926984,
|
|
||||||
52.466635
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "56c2a7ab4e4d2ac14a46448d523470dc"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Hol"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927104,
|
|
||||||
52.467081
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927039,
|
|
||||||
52.467095
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.9268,
|
|
||||||
52.467145
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926754,
|
|
||||||
52.467067
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926961,
|
|
||||||
52.467026
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927277,
|
|
||||||
52.46696
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927272,
|
|
||||||
52.466951
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927451,
|
|
||||||
52.466918
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927494,
|
|
||||||
52.467002
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927278,
|
|
||||||
52.467047
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927144,
|
|
||||||
52.467073
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927104,
|
|
||||||
52.467081
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "6f1db27a4df5a46f7a6913556b01effe"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Pokoje profesorskie"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466683
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926961,
|
|
||||||
52.467026
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926887,
|
|
||||||
52.467041
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926695,
|
|
||||||
52.466699
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466683
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "94f310dcaa6cee75d9e7800bf8d94155"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Biblioteka"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926801,
|
|
||||||
52.467144
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926971,
|
|
||||||
52.467424
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926956,
|
|
||||||
52.46743
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926944,
|
|
||||||
52.467436
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92693,
|
|
||||||
52.467441
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926903,
|
|
||||||
52.467452
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926861,
|
|
||||||
52.467464
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926778,
|
|
||||||
52.467476
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926731,
|
|
||||||
52.467485
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926567,
|
|
||||||
52.467194
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926801,
|
|
||||||
52.467144
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "aadab5775bdeb4eaf82c940255ddadd7"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Sale A"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927082,
|
|
||||||
52.466492
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926999,
|
|
||||||
52.466509
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926771,
|
|
||||||
52.466109
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926857,
|
|
||||||
52.466088
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927082,
|
|
||||||
52.466492
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "b39857ed605e5794fa6c9cdee5d7d6cf"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Pokoje profesorskie"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926754,
|
|
||||||
52.467066
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926814,
|
|
||||||
52.467054
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926605,
|
|
||||||
52.466676
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926542,
|
|
||||||
52.46669
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926564,
|
|
||||||
52.466728
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926754,
|
|
||||||
52.467066
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "b754d867fde3826e72fe8c243399ff26"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Sale A"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927272,
|
|
||||||
52.46695
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927083,
|
|
||||||
52.466613
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927167,
|
|
||||||
52.466595
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92735,
|
|
||||||
52.466936
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927272,
|
|
||||||
52.46695
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "c3726b2a2b3a589995fd3f17eecd1f53"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "D3"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466682
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926876,
|
|
||||||
52.466659
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926832,
|
|
||||||
52.46658
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926725,
|
|
||||||
52.466604
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466682
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "c73d9bdbccc15d9907e24b8bb731118a"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Pokoje profesorskie"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.926324,
|
|
||||||
52.466282
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926503,
|
|
||||||
52.46661
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926579,
|
|
||||||
52.466595
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926398,
|
|
||||||
52.466268
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926324,
|
|
||||||
52.466282
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "d54475cedfa0a866e13933c56bf35d76"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Sale A"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927607,
|
|
||||||
52.466891
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92734,
|
|
||||||
52.466562
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927242,
|
|
||||||
52.466585
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927451,
|
|
||||||
52.466918
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927607,
|
|
||||||
52.466891
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "d97989e446002de50bc8844d2d9cdf5c"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Winda"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.92669,
|
|
||||||
52.467141
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92666,
|
|
||||||
52.467089
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926755,
|
|
||||||
52.46707
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926786,
|
|
||||||
52.467121
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92669,
|
|
||||||
52.467141
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "dfdba4ee1ee0c55193b8dd04f8b00f6c"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"properties": {
|
|
||||||
"name": "Skrzydło A"
|
|
||||||
},
|
|
||||||
"geometry": {
|
|
||||||
"coordinates": [
|
|
||||||
[
|
|
||||||
[
|
|
||||||
16.927606,
|
|
||||||
52.466891
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927339,
|
|
||||||
52.466562
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927242,
|
|
||||||
52.466585
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92718,
|
|
||||||
52.466482
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927232,
|
|
||||||
52.466473
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927025,
|
|
||||||
52.466105
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926924,
|
|
||||||
52.466126
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926896,
|
|
||||||
52.466078
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92677,
|
|
||||||
52.466108
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.926998,
|
|
||||||
52.466509
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927041,
|
|
||||||
52.466537
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927075,
|
|
||||||
52.466595
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927082,
|
|
||||||
52.466614
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927277,
|
|
||||||
52.46696
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927358,
|
|
||||||
52.466942
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927354,
|
|
||||||
52.466935
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.92745,
|
|
||||||
52.466918
|
|
||||||
],
|
|
||||||
[
|
|
||||||
16.927606,
|
|
||||||
52.466891
|
|
||||||
]
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"type": "Polygon"
|
|
||||||
},
|
|
||||||
"id": "faaa569e3642a741f70a77071f19f131"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "FeatureCollection"
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
@ -1,95 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.content.res.Configuration;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.utils.Const;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
|
|
||||||
import org.acra.ACRA;
|
|
||||||
import org.acra.annotation.AcraLimiter;
|
|
||||||
import org.acra.annotation.AcraNotification;
|
|
||||||
import org.acra.config.CoreConfigurationBuilder;
|
|
||||||
import org.acra.config.HttpSenderConfigurationBuilder;
|
|
||||||
import org.acra.config.ToastConfigurationBuilder;
|
|
||||||
import org.acra.data.StringFormat;
|
|
||||||
import org.acra.sender.HttpSender;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static org.acra.ReportField.ANDROID_VERSION;
|
|
||||||
import static org.acra.ReportField.BUILD_CONFIG;
|
|
||||||
import static org.acra.ReportField.CUSTOM_DATA;
|
|
||||||
import static org.acra.ReportField.LOGCAT;
|
|
||||||
import static org.acra.ReportField.PHONE_MODEL;
|
|
||||||
import static org.acra.ReportField.REPORT_ID;
|
|
||||||
import static org.acra.ReportField.SHARED_PREFERENCES;
|
|
||||||
import static org.acra.ReportField.STACK_TRACE;
|
|
||||||
import static org.acra.ReportField.USER_APP_START_DATE;
|
|
||||||
import static org.acra.ReportField.USER_CRASH_DATE;
|
|
||||||
|
|
||||||
|
|
||||||
@AcraNotification(resText = R.string.notification_text,
|
|
||||||
resTitle = R.string.notification_title,
|
|
||||||
resChannelName = R.string.notification_channel)
|
|
||||||
@AcraLimiter(failedReportLimit = 2)
|
|
||||||
public class FindMyTutor extends Application {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(base);
|
|
||||||
//super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
|
|
||||||
// ACRA core
|
|
||||||
CoreConfigurationBuilder builder = new CoreConfigurationBuilder(this)
|
|
||||||
.setBuildConfigClass(BuildConfig.class)
|
|
||||||
.setReportContent(REPORT_ID, PHONE_MODEL, LOGCAT, USER_APP_START_DATE, USER_CRASH_DATE, SHARED_PREFERENCES,
|
|
||||||
ANDROID_VERSION, STACK_TRACE, CUSTOM_DATA, BUILD_CONFIG)
|
|
||||||
.setReportFormat(StringFormat.JSON);
|
|
||||||
|
|
||||||
// Toast for user
|
|
||||||
builder.setBuildConfigClass(BuildConfig.class)
|
|
||||||
.setReportFormat(StringFormat.JSON);
|
|
||||||
builder.getPluginConfigurationBuilder(
|
|
||||||
ToastConfigurationBuilder.class
|
|
||||||
).setResText(R.string.acra_toast_text);
|
|
||||||
|
|
||||||
|
|
||||||
SharedPreferences sharedPreferences = base.getSharedPreferences("com.uam.wmi.findmytutor_preferences", Context.MODE_PRIVATE);
|
|
||||||
Map header = new HashMap();
|
|
||||||
String token = sharedPreferences.getString("API_KEY", "KEY_EMPTY");
|
|
||||||
header.put("Authorization", "Bearer " + token);
|
|
||||||
|
|
||||||
// Api POST
|
|
||||||
builder.getPluginConfigurationBuilder(
|
|
||||||
HttpSenderConfigurationBuilder.class
|
|
||||||
// ).setUri("http://192.168.0.15:3000/api/acra")
|
|
||||||
).setUri(Const.BASE_URL + "api/Feedback/autoFeedback")
|
|
||||||
.setHttpMethod(HttpSender.Method.POST)
|
|
||||||
.setHttpHeaders(header)
|
|
||||||
.setEnabled(true);
|
|
||||||
|
|
||||||
ACRA.init(this, builder);
|
|
||||||
//Shared preferences
|
|
||||||
ACRA.getErrorReporter().putCustomData("USER_ID", sharedPreferences.getString("USER_ID", "no user id"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called by the system when the device configuration changes while your component is running.
|
|
||||||
// Overriding this method is totally optional!
|
|
||||||
@Override
|
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
|
||||||
super.onConfigurationChanged(newConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is called when the overall system is running low on memory,
|
|
||||||
// and would like actively running processes to tighten their belts.
|
|
||||||
// Overriding this method is totally optional!
|
|
||||||
@Override
|
|
||||||
public void onLowMemory() {
|
|
||||||
super.onLowMemory();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@ -14,8 +13,6 @@ import android.view.MenuInflater;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
|
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
|
||||||
* to be used with AppCompat.
|
* to be used with AppCompat.
|
||||||
|
|||||||
@ -1,14 +1,11 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.app.Fragment;
|
import android.app.Fragment;
|
||||||
import android.app.FragmentTransaction;
|
import android.app.FragmentTransaction;
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
@ -22,44 +19,20 @@ import android.support.v7.app.ActionBarDrawerToggle;
|
|||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.SearchView;
|
import android.support.v7.widget.SearchView;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
|
import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
|
||||||
import com.uam.wmi.findmytutor.utils.ActiveFragment;
|
import com.uam.wmi.findmytutor.utils.ActiveFragment;
|
||||||
import com.uam.wmi.findmytutor.utils.FeedbackUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.RxSearchObservable;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.ObservableSource;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.functions.Function;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.defaultMapZoom;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.onlineBackgroundLocationInterval;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.searchMapZoom;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationStatus;
|
|
||||||
|
|
||||||
|
|
||||||
public abstract class BaseActivity
|
public abstract class BaseActivity
|
||||||
@ -67,8 +40,11 @@ public abstract class BaseActivity
|
|||||||
implements BottomNavigationView.OnNavigationItemSelectedListener {
|
implements BottomNavigationView.OnNavigationItemSelectedListener {
|
||||||
|
|
||||||
private final static int REQUEST_CODE_ASK_PERMISSIONS = 1;
|
private final static int REQUEST_CODE_ASK_PERMISSIONS = 1;
|
||||||
|
|
||||||
private static final String[] REQUIRED_SDK_PERMISSIONS = new String[] {
|
private static final String[] REQUIRED_SDK_PERMISSIONS = new String[] {
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS };
|
Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS };
|
||||||
|
|
||||||
|
protected static final int REQUEST_PERMISSIONS = 100;
|
||||||
public DrawerLayout drawerLayout;
|
public DrawerLayout drawerLayout;
|
||||||
protected BottomNavigationView navigationView;
|
protected BottomNavigationView navigationView;
|
||||||
protected NavigationView drawerNavigationView;
|
protected NavigationView drawerNavigationView;
|
||||||
@ -76,67 +52,47 @@ public abstract class BaseActivity
|
|||||||
protected Toolbar toolbar;
|
protected Toolbar toolbar;
|
||||||
protected boolean isTutor;
|
protected boolean isTutor;
|
||||||
|
|
||||||
String tag = getClass().getName();
|
|
||||||
|
|
||||||
protected FeedbackUtils feedbackUtils;
|
|
||||||
|
|
||||||
private ActionBarDrawerToggle actionBarDrawerToggle;
|
private ActionBarDrawerToggle actionBarDrawerToggle;
|
||||||
private SharingFragment sharingFragment;
|
private SharingFragment sharingFragment;
|
||||||
|
|
||||||
private Fragment userListFragment;
|
private Fragment userListFragment;
|
||||||
public ActiveFragment activeFragment = ActiveFragment.NONE;
|
private ActiveFragment activeFragment = ActiveFragment.NONE;
|
||||||
private Fragment activeBottomMenu = null;
|
|
||||||
public SearchView searchView;
|
|
||||||
public MenuItem infoMenuItem;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("CheckResult")
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(getContentViewId());
|
setContentView(getContentViewId());
|
||||||
|
|
||||||
drawerNavigationView = findViewById(R.id.nav_view);
|
drawerNavigationView = findViewById(R.id.nav_view);
|
||||||
sideDrawer = findViewById(R.id.activity_container);
|
sideDrawer = findViewById(R.id.activity_container);
|
||||||
feedbackUtils = new FeedbackUtils(BaseActivity.this);
|
|
||||||
|
|
||||||
drawerNavigationView.setNavigationItemSelectedListener(
|
drawerNavigationView.setNavigationItemSelectedListener(
|
||||||
item -> {
|
item -> {
|
||||||
String itemName = (String) item.getTitle();
|
String itemName = (String) item.getTitle();
|
||||||
Intent launchIntent;
|
Intent launchIntent;
|
||||||
if (itemName.equals(getResources().getString(R.string.navigation_item_whitelist))) {
|
if (itemName.equals(getResources().getString(R.string.navigation_item_whitelist))) {
|
||||||
launchIntent = new Intent(getApplicationContext(), WhiteList.class);
|
/* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
|
||||||
startActivity(launchIntent);
|
startActivity(launchIntent);*/
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) {
|
} else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) {
|
||||||
launchIntent = new Intent(getApplicationContext(),BlackList.class);
|
/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
|
||||||
startActivity(launchIntent);
|
startActivity(launchIntent);*/
|
||||||
|
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_profile))) {
|
} else if (itemName.equals(getResources().getString(R.string.navigation_item_profile))) {
|
||||||
|
/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
|
||||||
launchIntent = new Intent(getApplicationContext(), TutorTab.class);
|
startActivity(launchIntent);*/
|
||||||
startActivity(launchIntent);
|
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_settings))) {
|
} else if (itemName.equals(getResources().getString(R.string.navigation_item_settings))) {
|
||||||
launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);
|
launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);
|
||||||
startActivity(launchIntent);
|
startActivity(launchIntent);
|
||||||
|
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_logout))) {
|
} else if (itemName.equals(getResources().getString(R.string.navigation_item_logout))) {
|
||||||
if(PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext())) {
|
|
||||||
stopBackgroundLocalizationTask();
|
stopBackgroundLocalizationTask();
|
||||||
|
|
||||||
|
PrefUtils.cleanUserLocalStorage(getApplicationContext());
|
||||||
|
Intent i = getBaseContext().getPackageManager()
|
||||||
|
.getLaunchIntentForPackage(getBaseContext().getPackageName());
|
||||||
|
if (i != null) {
|
||||||
|
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
}
|
}
|
||||||
logout();
|
startActivity(i);
|
||||||
|
finish();
|
||||||
|
|
||||||
|
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_feedback))) {
|
|
||||||
feedbackUtils.showNoteDialog("FEEDBACK");
|
|
||||||
|
|
||||||
/*showNoteDialog(BaseActivity.this, );*/
|
|
||||||
} else if (itemName.equals(getResources().getString(R.string.navigation_item_bug))) {
|
|
||||||
feedbackUtils.showNoteDialog("BUG REPORT");
|
|
||||||
/*showNoteDialog(BaseActivity.this, "BUG REPORT");*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sideDrawer.closeDrawers();
|
sideDrawer.closeDrawers();
|
||||||
@ -150,29 +106,15 @@ public abstract class BaseActivity
|
|||||||
sharingFragment = new SharingFragment();
|
sharingFragment = new SharingFragment();
|
||||||
userListFragment = new UsersListFragment();
|
userListFragment = new UsersListFragment();
|
||||||
|
|
||||||
isTutor = PrefUtils.getIsTutor(getApplicationContext());
|
|
||||||
|
|
||||||
|
isTutor = PrefUtils.getIsTutor(getApplicationContext());
|
||||||
if (!isTutor) {
|
if (!isTutor) {
|
||||||
navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE);
|
navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE);
|
||||||
drawerNavigationView.getMenu().setGroupVisible(R.id.drawer_group_tutor, false);
|
|
||||||
}
|
}
|
||||||
|
checkPermissions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void logout(){
|
|
||||||
storeBackgroundLocationStatus(getApplication(), false);
|
|
||||||
PrefUtils.storeIsLoggedIn(getApplicationContext(), false);
|
|
||||||
PrefUtils.setBatteryExlusionInfoStatus(getApplicationContext(), true);
|
|
||||||
|
|
||||||
Intent i = getBaseContext().getPackageManager()
|
|
||||||
.getLaunchIntentForPackage(getBaseContext().getPackageName());
|
|
||||||
if (i != null) {
|
|
||||||
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
||||||
}
|
|
||||||
startActivity(i);
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void checkPermissions() {
|
protected void checkPermissions() {
|
||||||
final List<String> missingPermissions = new ArrayList<String>();
|
final List<String> missingPermissions = new ArrayList<String>();
|
||||||
|
|
||||||
@ -215,21 +157,25 @@ public abstract class BaseActivity
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void stopBackgroundLocalizationTask() {
|
public void stopBackgroundLocalizationTask() {
|
||||||
PrefUtils.storeEnableSharingLocalization(getApplicationContext(), false);
|
|
||||||
|
|
||||||
Intent stopIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
Intent stopIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
||||||
stopIntent.putExtra("request_stop", true);
|
stopIntent.putExtra("request_stop", true);
|
||||||
|
startService(stopIntent);
|
||||||
stopService(stopIntent);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startBackgroundLocalizationTask() {
|
public void startBackgroundLocalizationTask() {
|
||||||
checkPermissions();
|
if ((ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
|
||||||
PrefUtils.storeEnableSharingLocalization(getApplicationContext(), true);
|
|
||||||
|
if ((ActivityCompat.shouldShowRequestPermissionRationale(this, android.Manifest.permission.ACCESS_FINE_LOCATION))) {
|
||||||
|
|
||||||
|
} else {
|
||||||
|
ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION
|
||||||
|
|
||||||
|
},
|
||||||
|
REQUEST_PERMISSIONS);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
||||||
startIntent.putExtra("notify_interval", onlineBackgroundLocationInterval);
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
startForegroundService(startIntent);
|
startForegroundService(startIntent);
|
||||||
@ -237,11 +183,10 @@ public abstract class BaseActivity
|
|||||||
startService(startIntent);
|
startService(startIntent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void handleBackgroundTaskLifeCycle() {
|
public void handleBackgroundTaskLifeCycle() {
|
||||||
Boolean shouldServiceRun = PrefUtils.isEnableSharingLocalization(getApplicationContext()) && isTutor;
|
if (PrefUtils.isEnableSharingLocalization(getApplicationContext())) {
|
||||||
|
|
||||||
if (shouldServiceRun) {
|
|
||||||
startBackgroundLocalizationTask();
|
startBackgroundLocalizationTask();
|
||||||
} else {
|
} else {
|
||||||
stopBackgroundLocalizationTask();
|
stopBackgroundLocalizationTask();
|
||||||
@ -285,6 +230,7 @@ public abstract class BaseActivity
|
|||||||
setUpNav();
|
setUpNav();
|
||||||
|
|
||||||
actionBarDrawerToggle.syncState();
|
actionBarDrawerToggle.syncState();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -293,93 +239,50 @@ public abstract class BaseActivity
|
|||||||
actionBarDrawerToggle.onConfigurationChanged(newConfig);
|
actionBarDrawerToggle.onConfigurationChanged(newConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressLint("CheckResult")
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
getMenuInflater().inflate(R.menu.menu_main, menu);
|
getMenuInflater().inflate(R.menu.menu_main, menu);
|
||||||
infoMenuItem = menu.findItem(R.id.action_info);
|
|
||||||
|
|
||||||
MenuItem myActionMenuItem = menu.findItem(R.id.action_search);
|
MenuItem myActionMenuItem = menu.findItem(R.id.action_search);
|
||||||
searchView = (SearchView) myActionMenuItem.getActionView();
|
final SearchView searchView = (SearchView) myActionMenuItem.getActionView();
|
||||||
|
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
|
||||||
searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
|
@Override
|
||||||
if (!hasFocus && activeFragment.equals(ActiveFragment.NONE)) {
|
public boolean onQueryTextSubmit(String input) {
|
||||||
restoreMapMarkers();
|
if (activeFragment.equals(ActiveFragment.USER_LIST)) {
|
||||||
adjustMapToSearch(defaultMapZoom);
|
executeUserListSearch(input);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hasFocus && activeFragment.equals(ActiveFragment.USER_LIST)) {
|
return false;
|
||||||
((UsersListFragment) userListFragment).restoreUsersList();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(hasFocus && activeFragment.equals(ActiveFragment.NONE)){
|
@Override
|
||||||
adjustMapToSearch(searchMapZoom);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
RxSearchObservable.fromView(searchView)
|
public boolean onQueryTextChange(String input) {
|
||||||
.skip(0)
|
if (activeFragment.equals(ActiveFragment.USER_LIST)) {
|
||||||
.map(String::toLowerCase)
|
executeUserListSearch(input);
|
||||||
.filter(t -> !t.isEmpty())
|
}
|
||||||
.debounce(250, TimeUnit.MILLISECONDS)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.switchMap((Function<String, ObservableSource<String>>) Observable::just)
|
|
||||||
.subscribe(this::executeSearch);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void executeSearch(String input) {
|
});
|
||||||
if (activeFragment.equals(ActiveFragment.USER_LIST)) {
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void executeUserListSearch(String input) {
|
||||||
((UsersListFragment) userListFragment).searchUser(input);
|
((UsersListFragment) userListFragment).searchUser(input);
|
||||||
|
|
||||||
} else if (activeFragment.equals(ActiveFragment.NONE)) {
|
|
||||||
searchUser(input);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
abstract void searchUser(String textToSearch);
|
|
||||||
|
|
||||||
abstract void restoreMapMarkers();
|
|
||||||
|
|
||||||
abstract void adjustMapToSearch(Integer zoom);
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (actionBarDrawerToggle.onOptionsItemSelected(item)) {
|
if (actionBarDrawerToggle.onOptionsItemSelected(item)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.getItemId()==R.id.action_info){
|
|
||||||
int layoutID;
|
|
||||||
switch (activeFragment){
|
|
||||||
case SHARED_PREFERENCES:
|
|
||||||
layoutID = R.layout.info_popup_sharing_tab;
|
|
||||||
break;
|
|
||||||
case USER_LIST:
|
|
||||||
layoutID = R.layout.info_popup_userlist;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
layoutID = R.layout.info_popup_map;
|
|
||||||
}
|
|
||||||
|
|
||||||
View popupView = getLayoutInflater().inflate(layoutID,null);
|
|
||||||
|
|
||||||
PopupWindow popupWindow = new PopupWindow(popupView,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
||||||
// If the PopupWindow should be focusable
|
|
||||||
popupWindow.setFocusable(true);
|
|
||||||
// If you need the PopupWindow to dismiss when when touched outside
|
|
||||||
popupWindow.setBackgroundDrawable(new ColorDrawable());
|
|
||||||
// Get the View's(the one that was clicked in the Fragment) location
|
|
||||||
View anchorView= getWindow().getDecorView().findViewById(android.R.id.content);
|
|
||||||
popupWindow.showAtLocation(anchorView,Gravity.TOP|Gravity.END, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
@ -407,16 +310,12 @@ public abstract class BaseActivity
|
|||||||
if (itemId == R.id.nav_map) {
|
if (itemId == R.id.nav_map) {
|
||||||
removeFragment(sharingFragment);
|
removeFragment(sharingFragment);
|
||||||
removeFragment(userListFragment);
|
removeFragment(userListFragment);
|
||||||
activeFragment = ActiveFragment.NONE;
|
|
||||||
findViewById(R.id.action_search).setVisibility(View.VISIBLE);
|
|
||||||
} else if (itemId == R.id.nav_profile) {
|
} else if (itemId == R.id.nav_profile) {
|
||||||
loadUserSettingsFragment();
|
loadUserSettingsFragment();
|
||||||
findViewById(R.id.action_search).setVisibility(View.GONE);
|
|
||||||
} else if (itemId == R.id.nav_user_list) {
|
} else if (itemId == R.id.nav_user_list) {
|
||||||
loadUserListFragment();
|
loadUserListFragment();
|
||||||
findViewById(R.id.action_search).setVisibility(View.VISIBLE);
|
|
||||||
}
|
}
|
||||||
selectBottomNavigationBarItem(itemId);
|
|
||||||
}, 300);
|
}, 300);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -427,7 +326,6 @@ public abstract class BaseActivity
|
|||||||
sharingFragment = SharingFragment.newInstance();
|
sharingFragment = SharingFragment.newInstance();
|
||||||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||||
ft.replace(R.id.activity_content, sharingFragment);
|
ft.replace(R.id.activity_content, sharingFragment);
|
||||||
//ft.addToBackStack(null);
|
|
||||||
ft.commit();
|
ft.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -437,12 +335,11 @@ public abstract class BaseActivity
|
|||||||
userListFragment = UsersListFragment.newInstance();
|
userListFragment = UsersListFragment.newInstance();
|
||||||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||||
ft.replace(R.id.activity_content, userListFragment);
|
ft.replace(R.id.activity_content, userListFragment);
|
||||||
//ft.addToBackStack(null);
|
|
||||||
ft.commit();
|
ft.commit();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateNavigationBarState() {
|
|
||||||
|
private void updateNavigationBarState() {
|
||||||
int actionId = getNavigationMenuItemId();
|
int actionId = getNavigationMenuItemId();
|
||||||
selectBottomNavigationBarItem(actionId);
|
selectBottomNavigationBarItem(actionId);
|
||||||
}
|
}
|
||||||
@ -453,9 +350,6 @@ public abstract class BaseActivity
|
|||||||
}
|
}
|
||||||
|
|
||||||
abstract int getNavigationMenuItemId();
|
abstract int getNavigationMenuItemId();
|
||||||
|
|
||||||
abstract int getContentViewId();
|
abstract int getContentViewId();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,370 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.design.widget.CoordinatorLayout;
|
|
||||||
import android.support.design.widget.FloatingActionButton;
|
|
||||||
import android.support.design.widget.Snackbar;
|
|
||||||
import android.support.v7.app.ActionBar;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.support.v7.widget.DefaultItemAnimator;
|
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.support.v7.widget.Toolbar;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.CompoundButton;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
import android.widget.Switch;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
import android.widget.ToggleButton;
|
|
||||||
|
|
||||||
import com.github.ybq.android.spinkit.SpinKitView;
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.mapbox.geojson.Point;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.adapters.BlackListAdapter;
|
|
||||||
import com.uam.wmi.findmytutor.model.IsUsingListBool;
|
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.StudentIdModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.model.UserResponseModel;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.SharingLevel;
|
|
||||||
import com.uam.wmi.findmytutor.utils.WrapContentLinearLayoutManager;
|
|
||||||
|
|
||||||
import java.text.Collator;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.ObservableSource;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.disposables.Disposable;
|
|
||||||
import io.reactivex.functions.Function;
|
|
||||||
import io.reactivex.observers.DisposableObserver;
|
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
public class BlackList extends AppCompatActivity {
|
|
||||||
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private UserService userService;
|
|
||||||
private boolean didFetched = false;
|
|
||||||
private String tutorId;
|
|
||||||
|
|
||||||
@BindView(R.id.recycler_view_blacklist)
|
|
||||||
RecyclerView recyclerView;
|
|
||||||
@BindView(R.id.black_list_empty_text_view)
|
|
||||||
TextView noNotesView;
|
|
||||||
@BindView(R.id.switch_blacklist_toggle)
|
|
||||||
Switch aSwitch;
|
|
||||||
@BindView(R.id.add_to_black_list_fab)
|
|
||||||
FloatingActionButton addToBlackListFab;
|
|
||||||
@BindView(R.id.loader)
|
|
||||||
SpinKitView loader;
|
|
||||||
|
|
||||||
|
|
||||||
private Integer prevSize;
|
|
||||||
private BlackListAdapter mAdapter;
|
|
||||||
private List<User> blacklistedUsers = new ArrayList<>();
|
|
||||||
private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
|
|
||||||
setContentView(R.layout.activity_black_list);
|
|
||||||
ButterKnife.bind(this);
|
|
||||||
|
|
||||||
tutorId = PrefUtils.getUserId(getApplicationContext());
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
|
|
||||||
if (PrefUtils.isBlackListing(this)){
|
|
||||||
aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.on));
|
|
||||||
aSwitch.setChecked(true);
|
|
||||||
handleChangeRequest(true);
|
|
||||||
}else{
|
|
||||||
aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.off) );
|
|
||||||
aSwitch.setChecked(false);
|
|
||||||
handleChangeRequest(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
|
||||||
toolbar.setTitle(getString(R.string.activity_title_blacklist));
|
|
||||||
setSupportActionBar(toolbar);
|
|
||||||
|
|
||||||
mAdapter = new BlackListAdapter(this, blacklistedUsers);
|
|
||||||
recyclerView.setLayoutManager(new WrapContentLinearLayoutManager(getApplicationContext()));
|
|
||||||
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
|
||||||
recyclerView.addItemDecoration(new MyDividerItemDecoration(this, LinearLayoutManager.VERTICAL, 16));
|
|
||||||
recyclerView.setAdapter(mAdapter);
|
|
||||||
noNotesView.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
fetchBlackListedUsers();
|
|
||||||
/**
|
|
||||||
* On long press on RecyclerView item, open alert dialog
|
|
||||||
* with options to choose
|
|
||||||
* Edit and Delete
|
|
||||||
* */
|
|
||||||
recyclerView.addOnItemTouchListener(new RecyclerTouchListener(this,
|
|
||||||
recyclerView, new RecyclerTouchListener.ClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view, final int position) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLongClick(View view, int position) {
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
addToBlackListFab.setOnClickListener(this::showFabDialog);
|
|
||||||
handleSwitch();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Observable<List<String>> getListOfBlacklistedUsers(String userId) {
|
|
||||||
return userService.getTutorBlacklistedByID(userId)
|
|
||||||
.toObservable()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Observable<User> getUserObservable(String userId) {
|
|
||||||
return userService
|
|
||||||
.getUserById(userId)
|
|
||||||
.toObservable()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void fetchBlackListedUsers() {
|
|
||||||
disposable.add(getListOfBlacklistedUsers(tutorId)
|
|
||||||
.doOnSubscribe(this::handleDoOnSubscribe)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.flatMap(Observable::fromIterable)
|
|
||||||
.flatMap(this::getUserObservable)
|
|
||||||
.subscribe(user -> blacklistedUsers.add(user), this::handleError,this::handleComplete));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDoOnSubscribe(Disposable disposable) {
|
|
||||||
prevSize = blacklistedUsers.size();
|
|
||||||
blacklistedUsers.clear();
|
|
||||||
didFetched = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleComplete() {
|
|
||||||
Collections.sort(blacklistedUsers, this::sortByUserName);
|
|
||||||
didFetched = true;
|
|
||||||
refreshUI();
|
|
||||||
}
|
|
||||||
private void handleError(Throwable e){
|
|
||||||
showError(e);
|
|
||||||
didFetched = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void refreshUI(){
|
|
||||||
toggleEmptyNotes();
|
|
||||||
mAdapter.notifyItemRangeInserted(prevSize, blacklistedUsers.size() - prevSize);
|
|
||||||
mAdapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int sortByUserName(User t1, User t2) {
|
|
||||||
return plCollator.compare(t1.getLastName(), t2.getLastName());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showFabDialog(View v){
|
|
||||||
LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
|
|
||||||
@SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.black_list_fab_modal, null);
|
|
||||||
AlertDialog.Builder alertDialogBuilderUserInput = new android.support.v7.app.AlertDialog.Builder(this);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput.setView(view).setPositiveButton(getApplicationContext().getString(R.string.modal_location_send), null);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput
|
|
||||||
.setPositiveButton(R.string.add, null)
|
|
||||||
.setNegativeButton(R.string.cancel, null);
|
|
||||||
|
|
||||||
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
|
|
||||||
|
|
||||||
EditText modalUserInput = view.findViewById(R.id.black_list_modal_input);
|
|
||||||
|
|
||||||
alertDialog.setOnShowListener(dialogInterface -> {
|
|
||||||
Button sendButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
|
|
||||||
|
|
||||||
Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
|
|
||||||
|
|
||||||
dismissButton.setOnClickListener(view1 -> alertDialog.dismiss());
|
|
||||||
|
|
||||||
sendButton.setOnClickListener(view1 -> {
|
|
||||||
String body = modalUserInput.getText().toString();
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(body)) {
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.can_not_be_empty, Toast.LENGTH_SHORT).show();
|
|
||||||
modalUserInput.requestFocus();
|
|
||||||
} else {
|
|
||||||
sendUserToBlacklist(body);
|
|
||||||
alertDialog.dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
alertDialog.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendUserToBlacklist(String body) {
|
|
||||||
StudentIdModel studentIdModel = new StudentIdModel(body);
|
|
||||||
disposable.add(
|
|
||||||
userService.addStudentToBlacklist(PrefUtils.getUserId(getApplicationContext()), studentIdModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleAddUser,this::showError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleAddUser(User user) {
|
|
||||||
Toast.makeText(this, R.string.add_user_to_list, Snackbar.LENGTH_LONG).show();
|
|
||||||
blacklistedUsers.clear();
|
|
||||||
fetchBlackListedUsers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
if (((HttpException) e).response().code() == 404) {
|
|
||||||
message = getString(R.string.no_such_a_user);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
message = "Network Error !";
|
|
||||||
}
|
|
||||||
|
|
||||||
Toast.makeText(this, message, Snackbar.LENGTH_LONG).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void toggleEmptyNotes() {
|
|
||||||
if (didFetched && blacklistedUsers.size() == 0) {
|
|
||||||
noNotesView.setVisibility(View.VISIBLE);
|
|
||||||
noNotesView.setText(R.string.list_is_empty);
|
|
||||||
loader.setVisibility(View.GONE);
|
|
||||||
}else if (blacklistedUsers.size() > 0) {
|
|
||||||
noNotesView.setVisibility(View.GONE);
|
|
||||||
loader.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
loader.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
// Inflate the menu; this adds items to the action bar if it is present.
|
|
||||||
getMenuInflater().inflate(R.menu.menu_black_list, menu);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
|
|
||||||
if (item.getItemId()==R.id.action_blacklist_info_popup){
|
|
||||||
int layoutID = R.layout.info_popup_blacklist;
|
|
||||||
|
|
||||||
View popupView = getLayoutInflater().inflate(layoutID,null);
|
|
||||||
|
|
||||||
PopupWindow popupWindow = new PopupWindow(popupView,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
||||||
// If the PopupWindow should be focusable
|
|
||||||
popupWindow.setFocusable(true);
|
|
||||||
// If you need the PopupWindow to dismiss when when touched outside
|
|
||||||
popupWindow.setBackgroundDrawable(new ColorDrawable());
|
|
||||||
// Get the View's(the one that was clicked in the Fragment) location
|
|
||||||
View anchorView= getWindow().getDecorView().findViewById(android.R.id.content);
|
|
||||||
popupWindow.showAtLocation(anchorView,Gravity.TOP|Gravity.END, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleSwitch(){
|
|
||||||
aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
|
||||||
if (isChecked){
|
|
||||||
aSwitch.setText(getString(R.string.action_black_list) + " "+ getString(R.string.on));
|
|
||||||
handleChangeRequest(true);
|
|
||||||
PrefUtils.useBlacklist(this,true);
|
|
||||||
}else {
|
|
||||||
aSwitch.setText(getString(R.string.action_black_list) + " "+getString(R.string.off));
|
|
||||||
handleChangeRequest(false);
|
|
||||||
PrefUtils.useBlacklist(this,false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleChangeRequest(boolean value){
|
|
||||||
IsUsingListBool isUsingListBool = new IsUsingListBool();
|
|
||||||
isUsingListBool.setIsUsing(value);
|
|
||||||
disposable.add(
|
|
||||||
userService.setTutorBlacklist(tutorId, isUsingListBool)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(()->{
|
|
||||||
},this::showError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
super.onPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop() {
|
|
||||||
super.onStop();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
disposable.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -10,11 +10,14 @@ import android.os.Bundle;
|
|||||||
import android.support.design.widget.Snackbar;
|
import android.support.design.widget.Snackbar;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.inputmethod.EditorInfo;
|
import android.view.inputmethod.EditorInfo;
|
||||||
import android.widget.AutoCompleteTextView;
|
import android.widget.AutoCompleteTextView;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
import android.widget.Switch;
|
||||||
|
|
||||||
import com.auth0.android.jwt.Claim;
|
import com.auth0.android.jwt.Claim;
|
||||||
import com.auth0.android.jwt.JWT;
|
import com.auth0.android.jwt.JWT;
|
||||||
@ -27,11 +30,9 @@ import com.uam.wmi.findmytutor.model.ValidateUser;
|
|||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
import com.uam.wmi.findmytutor.network.ApiClient;
|
||||||
import com.uam.wmi.findmytutor.service.LdapService;
|
import com.uam.wmi.findmytutor.service.LdapService;
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
import com.uam.wmi.findmytutor.service.UserService;
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@ -42,6 +43,7 @@ import okhttp3.ResponseBody;
|
|||||||
|
|
||||||
public class LoginActivity extends AppCompatActivity {
|
public class LoginActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
// UI references.
|
||||||
private AutoCompleteTextView mLoginNameView;
|
private AutoCompleteTextView mLoginNameView;
|
||||||
private EditText mPasswordView;
|
private EditText mPasswordView;
|
||||||
private View mProgressView;
|
private View mProgressView;
|
||||||
@ -70,6 +72,12 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Switch tutorLogin = findViewById(R.id.tutor_login_switch);
|
||||||
|
|
||||||
|
tutorLogin.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
||||||
|
PrefUtils.storeIsTutor(getApplicationContext(), isChecked);
|
||||||
|
});
|
||||||
|
|
||||||
Button mEmailSignInButton = findViewById(R.id.email_sign_in_button);
|
Button mEmailSignInButton = findViewById(R.id.email_sign_in_button);
|
||||||
mEmailSignInButton.setOnClickListener(view -> attemptLogin());
|
mEmailSignInButton.setOnClickListener(view -> attemptLogin());
|
||||||
|
|
||||||
@ -148,11 +156,19 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void loginProcess(String email, String password) {
|
private void loginProcess(String email, String password) {
|
||||||
ValidateUser user = new ValidateUser(email, password);
|
Log.e("LOGIN", String.valueOf(PrefUtils.getIsTutor(getApplicationContext())));
|
||||||
// LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
|
|
||||||
disposable.add(ldapService.validate(user)
|
//Fake validate
|
||||||
//disposable.add(ldapService.fakeValidate(fakeUser)
|
LdapUser user = new LdapUser(email, password, "admin", (PrefUtils.getIsTutor(getApplicationContext())) ? "Tutor" : "Student", "string", "string", email);
|
||||||
|
|
||||||
|
// ValidateUser user = new ValidateUser(email, password);
|
||||||
|
|
||||||
|
// LDAP logging
|
||||||
|
// disposable.add(ldapService.validate(user)
|
||||||
|
|
||||||
|
disposable.add(ldapService.fakeValidate(user)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe(this::handleResponse, this::handleError));
|
.subscribe(this::handleResponse, this::handleError));
|
||||||
@ -160,7 +176,7 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
private void getUserProfile(String userId) {
|
private void getUserProfile(String userId) {
|
||||||
|
|
||||||
disposable.add(userService.getUserById(userId)
|
disposable.add(userService.getUserByID(userId)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe(this::saveUserProfileToSharedPreferences, this::handleError));
|
.subscribe(this::saveUserProfileToSharedPreferences, this::handleError));
|
||||||
@ -176,21 +192,13 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
String token = jwtToken.getToken();
|
String token = jwtToken.getToken();
|
||||||
JWT jwt = new JWT(token);
|
JWT jwt = new JWT(token);
|
||||||
Claim userId = jwt.getClaim("nameid");
|
Claim role = jwt.getClaim("nameid");
|
||||||
Claim role = jwt.getClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role");
|
|
||||||
|
|
||||||
if (Objects.requireNonNull(role.asString()).equals("Student")) {
|
|
||||||
PrefUtils.storeIsTutor(getApplicationContext(), false);
|
|
||||||
} else {
|
|
||||||
PrefUtils.storeIsTutor(getApplicationContext(), true);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
|
PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
|
||||||
PrefUtils.storeApiKey(getApplicationContext(), token);
|
PrefUtils.storeApiKey(getApplicationContext(), token);
|
||||||
PrefUtils.storeUserId(getApplicationContext(), userId.asString());
|
PrefUtils.storeUserId(getApplicationContext(), role.asString());
|
||||||
|
|
||||||
getUserProfile(userId.asString());
|
|
||||||
|
|
||||||
|
getUserProfile(role.asString());
|
||||||
|
|
||||||
Intent data = new Intent();
|
Intent data = new Intent();
|
||||||
String txt = "Main Activity";
|
String txt = "Main Activity";
|
||||||
@ -217,5 +225,6 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
PrefUtils.storeUserLastName(getApplicationContext(), user.getLastName());
|
PrefUtils.storeUserLastName(getApplicationContext(), user.getLastName());
|
||||||
PrefUtils.storeUserName(getApplicationContext(), user.getUserName());
|
PrefUtils.storeUserName(getApplicationContext(), user.getUserName());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,783 +1,228 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.Manifest;
|
|
||||||
import android.animation.ObjectAnimator;
|
import android.animation.ObjectAnimator;
|
||||||
|
import android.animation.TypeEvaluator;
|
||||||
import android.animation.ValueAnimator;
|
import android.animation.ValueAnimator;
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.location.Location;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.content.res.Configuration;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.PowerManager;
|
import android.util.DisplayMetrics;
|
||||||
import android.support.v4.content.ContextCompat;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.animation.LinearInterpolator;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.annimon.stream.Stream;
|
|
||||||
import com.getbase.floatingactionbutton.FloatingActionButton;
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.mapbox.android.core.permissions.PermissionsListener;
|
|
||||||
import com.mapbox.android.core.permissions.PermissionsManager;
|
|
||||||
import com.mapbox.geojson.Point;
|
|
||||||
import com.mapbox.mapboxsdk.Mapbox;
|
import com.mapbox.mapboxsdk.Mapbox;
|
||||||
import com.mapbox.mapboxsdk.annotations.Icon;
|
|
||||||
import com.mapbox.mapboxsdk.annotations.IconFactory;
|
|
||||||
import com.mapbox.mapboxsdk.annotations.Marker;
|
import com.mapbox.mapboxsdk.annotations.Marker;
|
||||||
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
|
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
|
||||||
|
import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
import com.mapbox.mapboxsdk.geometry.LatLng;
|
||||||
import com.mapbox.mapboxsdk.location.LocationComponent;
|
|
||||||
import com.mapbox.mapboxsdk.location.LocationComponentOptions;
|
|
||||||
import com.mapbox.mapboxsdk.location.modes.CameraMode;
|
|
||||||
import com.mapbox.mapboxsdk.location.modes.RenderMode;
|
|
||||||
import com.mapbox.mapboxsdk.maps.MapView;
|
import com.mapbox.mapboxsdk.maps.MapView;
|
||||||
import com.mapbox.mapboxsdk.maps.MapboxMap;
|
import com.mapbox.mapboxsdk.maps.MapboxMap;
|
||||||
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
|
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
import com.uam.wmi.findmytutor.model.Coordinate;
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
import com.uam.wmi.findmytutor.network.ApiClient;
|
||||||
|
import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
|
||||||
import com.uam.wmi.findmytutor.service.CoordinateService;
|
import com.uam.wmi.findmytutor.service.CoordinateService;
|
||||||
import com.uam.wmi.findmytutor.service.PredefinedCoordinatesService;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
|
|
||||||
import com.uam.wmi.findmytutor.utils.EnableSharingDialog;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.ManualLocationUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapMarker;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.SharingLevel;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Map;
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
|
import io.reactivex.annotations.NonNull;
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
import io.reactivex.disposables.CompositeDisposable;
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
import io.reactivex.observers.DisposableSingleObserver;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
import timber.log.Timber;
|
|
||||||
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.mapRefreshInterval;
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
public class MapActivity extends BaseActivity
|
public class MapActivity extends BaseActivity
|
||||||
implements PermissionsListener, OnMapReadyCallback {
|
implements OnMapReadyCallback {
|
||||||
|
|
||||||
|
String tag = "LifeCycleEvents";
|
||||||
|
|
||||||
private HashMap<Long, String> markerUserHash = new HashMap<>();
|
|
||||||
private String tag = getClass().getName();
|
|
||||||
private PermissionsManager permissionsManager;
|
|
||||||
private LocationComponent locationComponent;
|
|
||||||
private CoordinateService coordinateService;
|
|
||||||
private UserService userService;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private int mInterval = mapRefreshInterval;
|
|
||||||
private Handler mHandler = new Handler();
|
|
||||||
private Runnable mStatusChecker;
|
|
||||||
private MapView mapView;
|
private MapView mapView;
|
||||||
private MapboxMap mapboxMap;
|
private MapboxMap mapboxMap;
|
||||||
private Button selectLocationButton;
|
private int mInterval = 10000;
|
||||||
private Button removeLocationButton;
|
private Handler mHandler;
|
||||||
private Marker tmpLocalMarker;
|
|
||||||
private Coordinate droppedMarkercoordinate;
|
|
||||||
public HashMap<String, Coordinate> coordsMap = new HashMap<>();
|
|
||||||
private HashMap<String, MapMarker> markerHash = new HashMap<>();
|
|
||||||
private Set<String> previousCoordsIds = new HashSet<>();
|
|
||||||
private ManualLocationUtils manualLocationUtils;
|
|
||||||
// Camera Animation params
|
|
||||||
private int zoomParam = 17;
|
|
||||||
private int bearingParam = 180;
|
|
||||||
private int tiltParam = 30;
|
|
||||||
private String myId;
|
|
||||||
private boolean isTutor;
|
|
||||||
private ApproximatedLocalization approximatedLocalization;
|
|
||||||
private boolean shouldFetchNewCoords = true;
|
|
||||||
|
|
||||||
@Override
|
private Map<String,Coordinate> coordsMap = new HashMap<>();
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
private CoordinateService coordinateService;
|
||||||
}
|
private CompositeDisposable disposable = new CompositeDisposable();
|
||||||
|
|
||||||
|
private Runnable mStatusChecker;
|
||||||
|
|
||||||
|
Locale myLocale;
|
||||||
|
String currentLanguage = "pl", currentLang;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
isTutor = PrefUtils.getIsTutor(this);
|
final SharedPreferences sharedPref = getSharedPreferences("fmtPrefs", Context.MODE_PRIVATE);
|
||||||
myId = PrefUtils.getUserId(getApplicationContext());
|
final String authToken = sharedPref.getString("authToken",null);
|
||||||
|
|
||||||
coordinateService = ApiClient.getClient(getApplicationContext())
|
mStatusChecker = new Runnable() {
|
||||||
.create(CoordinateService.class);
|
@Override
|
||||||
|
public void run() {
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
|
|
||||||
mStatusChecker = () -> {
|
|
||||||
try{
|
try{
|
||||||
if (shouldFetchNewCoords) {
|
|
||||||
checkIfUsesCanBeTutor();
|
|
||||||
fetchTopCoords();
|
fetchTopCoords();
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
mHandler.postDelayed(mStatusChecker, mInterval);
|
mHandler.postDelayed(mStatusChecker, mInterval);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
selectLocationButton = findViewById(R.id.select_location_button);
|
// fetching coords service
|
||||||
removeLocationButton = findViewById(R.id.remove_location_button);
|
coordinateService = ApiClient.getClient(getApplicationContext())
|
||||||
mapView = findViewById(R.id.mapView);
|
.create(CoordinateService.class);
|
||||||
|
mHandler = new Handler();
|
||||||
|
Bundle extras = getIntent().getExtras();
|
||||||
|
|
||||||
|
Mapbox.getInstance(this, getString(R.string.access_token));
|
||||||
|
|
||||||
|
mapView = (MapView) findViewById(R.id.mapView);
|
||||||
mapView.onCreate(savedInstanceState);
|
mapView.onCreate(savedInstanceState);
|
||||||
mapView.getMapAsync(this);
|
mapView.getMapAsync(this);
|
||||||
|
|
||||||
//start background task
|
//start background task
|
||||||
handleBackgroundTaskLifeCycle();
|
startBackgroundLocalizationTask();
|
||||||
manualLocationUtils = new ManualLocationUtils(MapActivity.this);
|
|
||||||
approximatedLocalization = new ApproximatedLocalization(MapUtils.loadJsonFromAsset(getApplicationContext(), "building.geojson"));
|
|
||||||
|
|
||||||
if(isTutor){
|
currentLanguage = getIntent().getStringExtra(currentLang);
|
||||||
MapUtils.BatteryOptimizationsExceptionCheck(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMapReady(MapboxMap mapboxMap) {
|
public void onMapReady(MapboxMap map) {
|
||||||
MapActivity.this.mapboxMap = mapboxMap;
|
mapboxMap = map;
|
||||||
|
final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
||||||
|
.position(new LatLng(52.466782,16.927549)));
|
||||||
mStatusChecker.run();
|
mStatusChecker.run();
|
||||||
enableLocationPlugin();
|
|
||||||
|
|
||||||
mapboxMap.setOnMarkerClickListener(marker -> {
|
mapboxMap.addOnMapClickListener(new MapboxMap.OnMapClickListener() {
|
||||||
String id = markerUserHash.get(marker.getId());
|
@Override
|
||||||
createMarkerModal(id);
|
public void onMapClick(@NonNull LatLng point) {
|
||||||
|
|
||||||
return true;
|
// When the user clicks on the map, we want to animate the marker to that
|
||||||
});
|
// location.
|
||||||
|
ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
|
||||||
if (isTutor) {
|
new LatLngEvaluator(), marker.getPosition(), point);
|
||||||
setOnMapLongClickListener();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
setOnMapClickListener();
|
|
||||||
MapUtils.setMapBoundsArea(getApplicationContext(), mapboxMap, mapView, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateUserHashMap(String userId, Long markerId) {
|
|
||||||
disposable.add(userService.getUserById(userId)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(t -> saveUserToHashMap(t, markerId), this::handleError));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveUserToHashMap(User user, Long markerId) {
|
|
||||||
markerUserHash.put(markerId, user.getId());
|
|
||||||
markerHash.get(user.getId()).getMarker().setTitle(user.getFirstName() + " " + user.getLastName());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void createMarkerModal(String userId) {
|
|
||||||
disposable.add(userService.getUserById(userId)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::createMarkerModalView, this::handleError));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void createMarkerModalView(User user) {
|
|
||||||
String cordStatus = coordsMap.get(user.getId()).getLabel();
|
|
||||||
String sharingLevel = coordsMap.get(user.getId()).getDisplayMode();
|
|
||||||
|
|
||||||
LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
|
|
||||||
@SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.marker_modal, null);
|
|
||||||
|
|
||||||
AlertDialog.Builder alertDialogBuilderUserInput = new android.support.v7.app.AlertDialog.Builder(this);
|
|
||||||
alertDialogBuilderUserInput.setView(view);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput.setNegativeButton(R.string.cancel, (dialog, id) -> {
|
|
||||||
// User cancelled the dialog
|
|
||||||
});
|
|
||||||
|
|
||||||
TextView userName = view.findViewById(R.id.userName);
|
|
||||||
TextView status = view.findViewById(R.id.label);
|
|
||||||
TextView sharingLevelView = view.findViewById(R.id.sharing_level);
|
|
||||||
|
|
||||||
userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));
|
|
||||||
|
|
||||||
if (cordStatus.equals("")) {
|
|
||||||
status.setText(String.format("%s: %s", getResources().getString(R.string.status_switch_title), getString(R.string.lack_of_status)));
|
|
||||||
} else {
|
|
||||||
status.setText(String.format("%s: %s", getResources().getString(R.string.status_switch_title), cordStatus));
|
|
||||||
}
|
|
||||||
|
|
||||||
String sharingLevelToRender = sharingLevel;
|
|
||||||
Log.e("LOCALE",PrefUtils.getLocale(getApplicationContext()));
|
|
||||||
|
|
||||||
if (PrefUtils.getLocale(getApplicationContext()).equals("pl") ||
|
|
||||||
PrefUtils.getLocale(getApplicationContext()).equals("pl-PL") ||
|
|
||||||
PrefUtils.getLocale(getApplicationContext()).equals("[pl-PL]")) {
|
|
||||||
if (sharingLevel.equals(SharingLevel.MANUAL.toString())) {
|
|
||||||
sharingLevelToRender = getString(R.string.manual_mode);
|
|
||||||
} else if (sharingLevel.equals(SharingLevel.EXACT.toString())) {
|
|
||||||
sharingLevelToRender = getString(R.string.exact_mode);
|
|
||||||
} else if (sharingLevel.equals(SharingLevel.APPROXIMATED.toString())) {
|
|
||||||
sharingLevelToRender = getString(R.string.approx_mode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sharingLevelView.setText(String.format("%s: %s", getResources().getString(R.string.settings_location_level), sharingLevelToRender));
|
|
||||||
|
|
||||||
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
alertDialog.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleError(Throwable error) {
|
|
||||||
showError(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
} else {
|
|
||||||
message = getString(R.string.network_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
Toast.makeText(MapActivity.this, message, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setOnMapClickListener() {
|
|
||||||
|
|
||||||
mapboxMap.addOnMapClickListener(e -> {
|
|
||||||
removeLocationButton.setVisibility(View.GONE);
|
|
||||||
selectLocationButton.setVisibility(View.GONE);
|
|
||||||
restoreMapMarkers();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setOnMapLongClickListener() {
|
|
||||||
|
|
||||||
mapboxMap.addOnMapLongClickListener((LatLng latLng) -> {
|
|
||||||
selectLocationButton.setVisibility(View.VISIBLE);
|
|
||||||
removeLocationButton.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
if (tmpLocalMarker == null) {
|
|
||||||
String sharingLevel = SharingLevel.MANUAL.toString();
|
|
||||||
Icon defaultIcon = getMapIcon(sharingLevel, myId);
|
|
||||||
|
|
||||||
MarkerOptions markerOptions = new MarkerOptions()
|
|
||||||
.setIcon(defaultIcon)
|
|
||||||
.position(latLng);
|
|
||||||
|
|
||||||
tmpLocalMarker = mapboxMap.addMarker(markerOptions);
|
|
||||||
new MapMarker(tmpLocalMarker, markerOptions, defaultIcon, sharingLevel);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
ValueAnimator markerAnimator = ObjectAnimator.ofObject(tmpLocalMarker, "position",
|
|
||||||
new MapUtils.LatLngEvaluator(), tmpLocalMarker.getPosition(), latLng);
|
|
||||||
markerAnimator.setDuration(2000);
|
markerAnimator.setDuration(2000);
|
||||||
markerAnimator.start();
|
markerAnimator.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
selectLocationButton.setOnClickListener((View view) -> {
|
|
||||||
if (tmpLocalMarker != null) {
|
|
||||||
|
|
||||||
String approximatedLocation = approximatedLocalization.getNameOfBuildingPart(Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()));
|
|
||||||
|
|
||||||
try {
|
|
||||||
droppedMarkercoordinate = new Coordinate(
|
|
||||||
latLng.getLatitude(),
|
|
||||||
latLng.getLongitude(),
|
|
||||||
latLng.getAltitude(),
|
|
||||||
approximatedLocation,
|
|
||||||
PrefUtils.getUserFirstName(getApplicationContext()) + " " + PrefUtils.getUserLastName(getApplicationContext()),
|
|
||||||
PrefUtils.getUserId(getApplicationContext()),
|
|
||||||
PrefUtils.getLocationLevel(getApplicationContext())
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!PrefUtils.isEnableSharingLocalization(getApplicationContext())) {
|
|
||||||
EnableSharingDialog sharingDialog = new EnableSharingDialog();
|
|
||||||
sharingDialog.show(getFragmentManager(), "Sharing");
|
|
||||||
}
|
|
||||||
|
|
||||||
PrefUtils.putManualLocation(this, latLng, approximatedLocation);
|
|
||||||
|
|
||||||
handleBackgroundTaskLifeCycle();
|
|
||||||
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
Timber.e(String.valueOf(e));
|
|
||||||
}
|
|
||||||
|
|
||||||
Toast.makeText(
|
|
||||||
MapActivity.this,
|
|
||||||
getString(R.string.manual_location_selected),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show();
|
|
||||||
|
|
||||||
selectLocationButton.setVisibility(View.GONE);
|
|
||||||
mapboxMap.removeMarker(tmpLocalMarker);
|
|
||||||
tmpLocalMarker = null;
|
|
||||||
|
|
||||||
showLocationDialog(latLng);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void showLocationDialog(LatLng latLng) {
|
private static class LatLngEvaluator implements TypeEvaluator<LatLng> {
|
||||||
|
// Method is used to interpolate the marker animation.
|
||||||
|
|
||||||
LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
|
private LatLng latLng = new LatLng();
|
||||||
@SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.location_modal, null);
|
|
||||||
AlertDialog.Builder alertDialogBuilderUserInput = new android.support.v7.app.AlertDialog.Builder(this);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput.setView(view).setPositiveButton(getApplicationContext().getString(R.string.modal_location_send), null);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput
|
|
||||||
.setPositiveButton(R.string.lbl_ok, null)
|
|
||||||
.setNegativeButton(R.string.lbl_cancel, null);
|
|
||||||
|
|
||||||
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
|
|
||||||
EditText modalUserInput = view.findViewById(R.id.manual_input);
|
|
||||||
|
|
||||||
alertDialog.setOnShowListener(dialogInterface -> {
|
|
||||||
Button sendButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
|
|
||||||
Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
|
|
||||||
|
|
||||||
dismissButton.setOnClickListener(view1 -> {
|
|
||||||
PrefUtils.putCurrentManualLocationName(getApplicationContext(), getString(R.string.other_location));
|
|
||||||
PrefUtils.putCurrentManualLocation(getApplicationContext(), "-1");
|
|
||||||
|
|
||||||
alertDialog.dismiss();
|
|
||||||
});
|
|
||||||
|
|
||||||
sendButton.setOnClickListener(view1 -> {
|
|
||||||
String body = modalUserInput.getText().toString();
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(body)) {
|
|
||||||
Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.modal_location_hint), Toast.LENGTH_SHORT).show();
|
|
||||||
modalUserInput.requestFocus();
|
|
||||||
} else {
|
|
||||||
sendLocation(body, latLng);
|
|
||||||
PrefUtils.putCurrentManualLocationName(getApplicationContext(), body);
|
|
||||||
alertDialog.dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
alertDialog.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void sendLocation(String body, LatLng latLng) {
|
|
||||||
PredefinedCoordinatesService predefinedCoordinatesService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class);
|
|
||||||
|
|
||||||
PredefinedCoordViewModel droppedMarkercoordinate = new PredefinedCoordViewModel(
|
|
||||||
latLng.getLatitude(),
|
|
||||||
latLng.getLongitude(),
|
|
||||||
latLng.getAltitude(),
|
|
||||||
PrefUtils.getUserId(getApplicationContext()),
|
|
||||||
approximatedLocalization.getNameOfBuildingPart(Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude())),
|
|
||||||
SharingLevel.PREDEFINED.toString(),
|
|
||||||
body
|
|
||||||
);
|
|
||||||
|
|
||||||
CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
disposable.add(
|
|
||||||
predefinedCoordinatesService.postUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), droppedMarkercoordinate)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::SaveCurrentManualLocation, this::handleError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SaveCurrentManualLocation(PredefinedCoordViewModel resp) {
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.location_saved, Toast.LENGTH_SHORT).show();
|
|
||||||
PrefUtils.putCurrentManualLocation(getApplicationContext(), resp.getPredefinedCoordinateId());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void checkIfUsesCanBeTutor(){
|
|
||||||
disposable.add(
|
|
||||||
userService.getSelf(myId)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<User>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(User user) {
|
|
||||||
boolean tutorFromBackend = user.getTitle().equals("tutor");
|
|
||||||
|
|
||||||
if(tutorFromBackend != PrefUtils.getIsTutor(getApplicationContext())){
|
|
||||||
logout();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e) {
|
public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
|
||||||
showError(e);
|
latLng.setLatitude(startValue.getLatitude()
|
||||||
|
+ ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
|
||||||
|
latLng.setLongitude(startValue.getLongitude()
|
||||||
|
+ ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
|
||||||
|
return latLng;
|
||||||
}
|
}
|
||||||
}));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fetchTopCoords() {
|
private void fetchTopCoords() {
|
||||||
|
|
||||||
disposable.add(
|
disposable.add(
|
||||||
|
// coordinateService.getTopCoordinates()
|
||||||
coordinateService.getOnlineCoordinates()
|
coordinateService.getOnlineCoordinates()
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.map(tutors -> Stream.of(tutors).
|
|
||||||
filterNot(t -> t.getDisplayMode().equals(SharingLevel.PRESENCE.toString())).toList())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<List<Coordinate>>() {
|
.subscribeWith(new DisposableSingleObserver<List<Coordinate>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<Coordinate> coordsList) {
|
public void onSuccess(List<Coordinate> coordsList) {
|
||||||
|
|
||||||
if (tmpLocalMarker != null && coordsList.isEmpty()) {
|
|
||||||
Log.e("MapActivity", "200 empty []");
|
|
||||||
mapboxMap.clear();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ArrayList<String> tmp = new ArrayList<>();
|
|
||||||
for (Coordinate coordinate : coordsList) {
|
|
||||||
tmp.add(coordinate.getUserId());
|
|
||||||
}
|
|
||||||
|
|
||||||
Set<String> currentCoordsIds = new HashSet<>(tmp);
|
|
||||||
if (previousCoordsIds.isEmpty()) {
|
|
||||||
previousCoordsIds.addAll(currentCoordsIds);
|
|
||||||
} else {
|
|
||||||
// here we clear + it returns bool if sth was removed
|
|
||||||
|
|
||||||
previousCoordsIds.removeAll(currentCoordsIds);
|
|
||||||
for (String toRemoveId : previousCoordsIds) {
|
|
||||||
Log.e(tag + "delete: ", "removing: " + toRemoveId + ": " + markerHash.get(toRemoveId));
|
|
||||||
mapboxMap.removeMarker(markerHash.get(toRemoveId).getMarker());
|
|
||||||
markerHash.remove(toRemoveId);
|
|
||||||
coordsMap.remove(toRemoveId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Coordinate element : coordsList) {
|
for (Coordinate element : coordsList) {
|
||||||
String id = element.getUserId();
|
String id = element.getUserId();
|
||||||
String newLabel = element.getLabel();
|
Coordinate cord = coordsMap.get(id);
|
||||||
String newSharingLevel = element.getDisplayMode();
|
|
||||||
|
|
||||||
Coordinate coordinate = coordsMap.get(id);
|
|
||||||
|
|
||||||
Log.e(tag, "hashMapSize: " + coordsMap.size());
|
Log.d("mapper", "a " + mapboxMap.getMarkerViewManager());
|
||||||
Log.e(tag, "markerMapSize: " + coordsMap.size());
|
Log.d("mapper", "b " + coordsMap.size());
|
||||||
|
if (cord != null) {
|
||||||
if (coordinate != null) {
|
if (!cord.getLongitude().equals(element.getLongitude())
|
||||||
|
) {
|
||||||
boolean isTheSameLocalization = coordinate.getLatitude().equals(element.getLatitude()) || coordinate.getLongitude().equals(element.getLongitude());
|
Log.d("mapper", " cos sie zienilo ");
|
||||||
|
Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
|
||||||
if (!isTheSameLocalization) {
|
.title(cord.getUserId())
|
||||||
//Replace prev marker and animate
|
.position(new LatLng(cord.getLatitude(),cord.getLongitude())));
|
||||||
Marker marker = markerHash.get(id).getMarker();
|
|
||||||
Boolean showModalAfterAnimation = false;
|
|
||||||
|
|
||||||
if (marker.isInfoWindowShown()) {
|
|
||||||
marker.hideInfoWindow();
|
|
||||||
showModalAfterAnimation = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
LatLng toDestination = new LatLng(element.getLatitude(), element.getLongitude());
|
|
||||||
|
|
||||||
ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
|
ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
|
||||||
new MapUtils.LatLngEvaluator(),
|
new LatLngEvaluator(), marker.getPosition(), new LatLng(element.getLatitude(),element.getLongitude()));
|
||||||
marker.getPosition(),
|
|
||||||
toDestination);
|
|
||||||
markerAnimator.setDuration(2000);
|
markerAnimator.setDuration(2000);
|
||||||
markerAnimator.setInterpolator(new LinearInterpolator());
|
|
||||||
markerAnimator.start();
|
markerAnimator.start();
|
||||||
|
|
||||||
|
|
||||||
|
// coordsMap.replace(id,element);
|
||||||
|
coordsMap.remove(id);
|
||||||
|
coordsMap.put(id,element);
|
||||||
|
} else if (!cord.getTimeStamp().equals(element.getTimeStamp())){
|
||||||
|
Log.d("mapper", "update");
|
||||||
|
Log.d("mapper", " "+cord.getTimeStamp());
|
||||||
|
Log.d("mapper", " " + element.getTimeStamp());
|
||||||
|
// coordsMap.replace(id,element);
|
||||||
|
coordsMap.remove(id);
|
||||||
coordsMap.put(id,element);
|
coordsMap.put(id,element);
|
||||||
marker.setPosition(toDestination);
|
|
||||||
|
|
||||||
|
|
||||||
if (showModalAfterAnimation) {
|
|
||||||
mapboxMap.selectMarker(marker);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mapboxMap.getMarkerViewManager().update();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
//Add new marker
|
|
||||||
coordsMap.put(id,element);
|
coordsMap.put(id,element);
|
||||||
|
mapboxMap.addMarker(new MarkerOptions().position(new LatLng(element.getLatitude(), element.getLongitude())));
|
||||||
String sharingLevel = coordsMap.get(id).getDisplayMode();
|
|
||||||
Icon defaultIcon = getMapIcon(sharingLevel, id);
|
|
||||||
|
|
||||||
MarkerOptions markerOptions = new MarkerOptions()
|
|
||||||
.setIcon(defaultIcon)
|
|
||||||
.position(new LatLng(element.getLatitude(), element.getLongitude()));
|
|
||||||
|
|
||||||
Marker markerMapbox = mapboxMap.addMarker(markerOptions);
|
|
||||||
MapMarker marker = new MapMarker(markerMapbox, markerOptions, defaultIcon, sharingLevel);
|
|
||||||
|
|
||||||
markerHash.put(id, marker);
|
|
||||||
updateUserHashMap(id, marker.getMarker().getId());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Change marker if sharing mode has been changed
|
|
||||||
Boolean newLocalizationMode = markerHash.get(id).getMarkerType().equals(newSharingLevel);
|
|
||||||
|
|
||||||
if (!newLocalizationMode) {
|
|
||||||
Icon defaultIcon = getMapIcon(newSharingLevel, id);
|
|
||||||
MapMarker marker = markerHash.get(id);
|
|
||||||
coordsMap.get(id).setDisplayMode(newSharingLevel);
|
|
||||||
|
|
||||||
marker.setDefaultIcon(defaultIcon);
|
|
||||||
marker.restoreDefaultIcon();
|
|
||||||
markerHash.get(id).setMarkerType(newSharingLevel);
|
|
||||||
mapboxMap.getMarkerViewManager().update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
coordsMap.get(id).setLabel(newLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
// For next fetch
|
|
||||||
previousCoordsIds.clear();
|
|
||||||
previousCoordsIds.addAll(currentCoordsIds);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e) {
|
public void onError(Throwable e) {
|
||||||
showError(e);
|
Log.e("Error",e.toString());
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
private Icon getMapIcon(String sharingLevel, String id) {
|
|
||||||
Icon defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.exact_localization_marker);
|
|
||||||
|
|
||||||
if (sharingLevel.equals(SharingLevel.APPROXIMATED.toString())) {
|
|
||||||
defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.approximate_localization_marker);
|
|
||||||
} else if (sharingLevel.equals(SharingLevel.MANUAL.toString()) ||
|
|
||||||
sharingLevel.equals(SharingLevel.PREDEFINED.toString())) {
|
|
||||||
defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.manual_localization_marker);
|
|
||||||
} else if (id.equals(myId)) {
|
|
||||||
defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.my_marker);
|
|
||||||
}
|
|
||||||
|
|
||||||
return defaultIcon;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings({"MissingPermission"})
|
|
||||||
private void enableLocationPlugin() {
|
|
||||||
Log.e(tag, "enableLocationPlugin");
|
|
||||||
|
|
||||||
// Check if permissions are enabled and if not request
|
|
||||||
if (PermissionsManager.areLocationPermissionsGranted(this)) {
|
|
||||||
Log.e(tag, "enableLocationPlugin true");
|
|
||||||
|
|
||||||
|
|
||||||
LocationComponentOptions options = LocationComponentOptions.builder(this)
|
|
||||||
.trackingGesturesManagement(false)
|
|
||||||
.accuracyColor(ContextCompat.getColor(this, R.color.mapboxGray))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
// Get an instance of the component
|
|
||||||
locationComponent = mapboxMap.getLocationComponent();
|
|
||||||
|
|
||||||
Log.e(tag + "Last", locationComponent.getLastKnownLocation() + "");
|
|
||||||
|
|
||||||
// Activate with options
|
|
||||||
locationComponent.activateLocationComponent(this, options);
|
|
||||||
|
|
||||||
// Enable to make component visible + camera animation
|
|
||||||
// https://www.mapbox.com/android-docs/maps/overview/location-component/
|
|
||||||
locationComponent.setLocationComponentEnabled(true);
|
|
||||||
|
|
||||||
// Set the component's camera mode
|
|
||||||
locationComponent.setCameraMode(CameraMode.NONE);
|
|
||||||
locationComponent.setRenderMode(RenderMode.COMPASS);
|
|
||||||
|
|
||||||
// Button 4 centring
|
|
||||||
FloatingActionButton myLocFAB = findViewById(R.id.myLocationButton);
|
|
||||||
myLocFAB.setVisibility(View.VISIBLE);
|
|
||||||
myLocFAB.setOnClickListener(v -> {
|
|
||||||
|
|
||||||
Location lastKnownLocation = locationComponent.getLastKnownLocation();
|
|
||||||
if (lastKnownLocation != null) {
|
|
||||||
MapUtils.makeNewCamera(mapboxMap,
|
|
||||||
lastKnownLocation.getLatitude(),
|
|
||||||
lastKnownLocation.getLongitude(),
|
|
||||||
zoomParam,
|
|
||||||
bearingParam,
|
|
||||||
tiltParam,
|
|
||||||
4000);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Camera aniamtion
|
|
||||||
zoomParam = (zoomParam == 17) ? 19 : 17;
|
|
||||||
bearingParam += 90;
|
|
||||||
tiltParam = (tiltParam == 30) ? 0 : 30;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
Log.e(tag, "enableLocationPlugin false");
|
|
||||||
|
|
||||||
permissionsManager = new PermissionsManager(this);
|
|
||||||
permissionsManager.requestLocationPermissions(this);
|
|
||||||
permissionsManager.onRequestPermissionsResult(0, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, new int[]{0});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onSaveInstanceState(Bundle outState) {
|
|
||||||
super.onSaveInstanceState(outState);
|
|
||||||
mapView.onSaveInstanceState(outState);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int getContentViewId() {
|
|
||||||
Mapbox.getInstance(this, getString(R.string.access_token));
|
|
||||||
return R.layout.activity_map;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int getNavigationMenuItemId() {
|
|
||||||
return R.id.nav_map;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRequestPermissionsResult(int requestCode, @android.support.annotation.NonNull String[] permissions, @android.support.annotation.NonNull int[] grantResults) {
|
|
||||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onExplanationNeeded(List<String> permissionsToExplain) {
|
|
||||||
Toast.makeText(this, R.string.user_location_permission_explanation, Toast.LENGTH_LONG).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPermissionResult(boolean granted) {
|
|
||||||
// if (granted) {
|
|
||||||
// enableLocationPlugin();
|
|
||||||
// } else {
|
|
||||||
// Toast.makeText(this, R.string.user_location_permission_not_granted, Toast.LENGTH_LONG).show();
|
|
||||||
// finish();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void searchUser(String textToSearch) {
|
|
||||||
getUserFromApi(textToSearch);
|
|
||||||
|
|
||||||
Log.e("LOCALE", LocaleUtils.getCurrentLocale());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void getUserFromApi(String userNameToSearch) {
|
|
||||||
disposable.add(
|
|
||||||
userService.getAllOnlineTutors()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.map(tutors -> Stream.of(tutors).filter(t ->
|
|
||||||
t.toSearchAbleUserName().toLowerCase().contains(userNameToSearch.toLowerCase())).toList())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(List<User> users) {
|
|
||||||
Log.e("USERS", String.valueOf(users));
|
|
||||||
filterMarkers(users);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
showError(e);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void filterMarkers(List<User> users) {
|
|
||||||
restoreMapMarkers();
|
|
||||||
|
|
||||||
Icon markedMarker = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.search_marker);
|
|
||||||
List<MapMarker> markersToSet = Stream.of(mapboxMap.getMarkers())
|
|
||||||
.filter(m -> Stream.of(users).anyMatch(u -> u.getId().equals(markerUserHash.get(m.getId()))))
|
|
||||||
.map(m -> markerUserHash.get(m.getId()))
|
|
||||||
.map(m -> markerHash.get(m))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
for (MapMarker marker : markersToSet) {
|
|
||||||
marker.getMarker().setIcon(markedMarker);
|
|
||||||
|
|
||||||
if (markersToSet.size() == 1)
|
|
||||||
mapboxMap.selectMarker(marker.getMarker());
|
|
||||||
}
|
|
||||||
|
|
||||||
mapboxMap.getMarkerViewManager().update();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void restoreMapMarkers() {
|
|
||||||
try {
|
|
||||||
for (Marker marker : mapboxMap.getMarkers()) {
|
|
||||||
MapMarker markerMap = markerHash.get(markerUserHash.get(marker.getId()));
|
|
||||||
|
|
||||||
markerMap.restoreDefaultIcon();
|
|
||||||
mapboxMap.deselectMarker(marker);
|
|
||||||
}
|
|
||||||
|
|
||||||
mapboxMap.getMarkerViewManager().update();
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.e("MAP", String.valueOf(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void adjustMapToSearch(Integer zoom) {
|
|
||||||
MapUtils.setZoom(mapboxMap, zoom);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
// Add the mapView lifecycle to the activity's lifecycle methods
|
||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
mapView.onResume();
|
mapView.onResume();
|
||||||
shouldFetchNewCoords = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
mapView.onStart();
|
mapView.onStart();
|
||||||
shouldFetchNewCoords = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStop() {
|
protected void onStop() {
|
||||||
super.onStop();
|
super.onStop();
|
||||||
mapView.onStop();
|
mapView.onStop();
|
||||||
shouldFetchNewCoords = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPause() {
|
public void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
mapView.onPause();
|
mapView.onPause();
|
||||||
shouldFetchNewCoords = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -794,4 +239,19 @@ Log.e("LOCALE",PrefUtils.getLocale(getApplicationContext()));
|
|||||||
disposable.dispose();
|
disposable.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onSaveInstanceState(Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
mapView.onSaveInstanceState(outState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getContentViewId() {
|
||||||
|
return R.layout.activity_map;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getNavigationMenuItemId() {
|
||||||
|
return R.id.nav_map;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,7 +1,6 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
@ -12,19 +11,15 @@ import android.preference.Preference;
|
|||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
|
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class SettingsActivity extends AppCompatPreferenceActivity {
|
public class SettingsActivity extends AppCompatPreferenceActivity {
|
||||||
private static final String TAG = SettingsActivity.class.getSimpleName();
|
private static final String TAG = SettingsActivity.class.getSimpleName();
|
||||||
|
|
||||||
@ -37,15 +32,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|||||||
getFragmentManager().beginTransaction().replace(android.R.id.content, new MainPreferenceFragment()).commit();
|
getFragmentManager().beginTransaction().replace(android.R.id.content, new MainPreferenceFragment()).commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLocale(String localeName) {
|
public void setLocale(String localeName) {
|
||||||
Context context = LocaleHelper.setLocale(this, localeName);
|
|
||||||
Resources res = context.getResources();
|
|
||||||
Locale myLocale = new Locale(localeName);
|
Locale myLocale = new Locale(localeName);
|
||||||
|
Resources res = getResources();
|
||||||
DisplayMetrics dm = res.getDisplayMetrics();
|
DisplayMetrics dm = res.getDisplayMetrics();
|
||||||
Configuration conf = res.getConfiguration();
|
Configuration conf = res.getConfiguration();
|
||||||
conf.locale = myLocale;
|
conf.locale = myLocale;
|
||||||
@ -63,21 +52,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|||||||
addPreferencesFromResource(R.layout.pref_main);
|
addPreferencesFromResource(R.layout.pref_main);
|
||||||
|
|
||||||
Preference languagesList = findPreference(getResources().getString(R.string.key_language));
|
Preference languagesList = findPreference(getResources().getString(R.string.key_language));
|
||||||
languagesList.setDefaultValue(0);
|
|
||||||
|
|
||||||
if(PrefUtils.getLocale(getActivity()).equals("1")){
|
|
||||||
languagesList.setDefaultValue(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
languagesList.setOnPreferenceChangeListener((preference, newValue) -> {
|
languagesList.setOnPreferenceChangeListener((preference, newValue) -> {
|
||||||
|
|
||||||
if (!newValue.toString().equals("0")){
|
if (!newValue.toString().equals("0")){
|
||||||
LocaleHelper.setLocale(getActivity(), "pl");
|
|
||||||
((SettingsActivity)getActivity()).setLocale("pl");
|
((SettingsActivity)getActivity()).setLocale("pl");
|
||||||
PrefUtils.storeLocale(getActivity(),"pl");
|
PrefUtils.storeLocale(getActivity(),"pl");
|
||||||
LocaleHelper.setLocale(getActivity(), "pl");
|
|
||||||
}else{
|
}else{
|
||||||
LocaleHelper.setLocale(getActivity(), "en");
|
|
||||||
((SettingsActivity)getActivity()).setLocale("en");
|
((SettingsActivity)getActivity()).setLocale("en");
|
||||||
PrefUtils.storeLocale(getActivity(),"en");
|
PrefUtils.storeLocale(getActivity(),"en");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,323 +1,60 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.app.AlertDialog;
|
import android.app.Activity;
|
||||||
import android.app.FragmentTransaction;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.ListPreference;
|
import android.preference.ListPreference;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.PreferenceCategory;
|
|
||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.SwitchPreference;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.annimon.stream.IntPair;
|
|
||||||
import com.annimon.stream.Stream;
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.PredefinedCoordinatesService;
|
|
||||||
import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.EnableSharingDialog;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RightButtonPreference;
|
|
||||||
import com.uam.wmi.findmytutor.utils.SharingLevel;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
||||||
|
|
||||||
|
|
||||||
public class SharingFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
|
public class SharingFragment extends PreferenceFragment {
|
||||||
protected SwitchPreference locationSharing;
|
|
||||||
protected SwitchPreference statusSwitch;
|
|
||||||
protected Preference locationMode;
|
|
||||||
protected ListPreference manualLocationList;
|
|
||||||
protected PreferenceCategory preferenceCategory;
|
|
||||||
protected RightButtonPreference manualLocationButton;
|
|
||||||
protected RightButtonPreference removeManualLocation;
|
|
||||||
protected RightButtonPreference removeManualStatus;
|
|
||||||
protected Preference manualStatus;
|
|
||||||
protected ListPreference statusList;
|
|
||||||
protected List<PredefinedCoordViewModel> predefinedCoordsList = new ArrayList<>();
|
|
||||||
private HashMap<String, String> locationMap;
|
|
||||||
private ArrayList<String> locationUUIDs;
|
|
||||||
private HashMap<Integer, String> locationLevelMapping;
|
|
||||||
private HashMap<Integer, String> statusMapping;
|
|
||||||
private PredefinedStatusesService statusesService;
|
|
||||||
private PredefinedCoordinatesService locationService;
|
|
||||||
private CompositeDisposable disposable;
|
|
||||||
private AlertDialog.Builder builder;
|
|
||||||
private String[] statusesArray;
|
|
||||||
private boolean statusSwitchFlag;
|
|
||||||
private ArrayList<String> predefinedLocationsList;
|
|
||||||
|
|
||||||
public static SharingFragment newInstance() {
|
|
||||||
return new SharingFragment();
|
|
||||||
}
|
|
||||||
|
|
||||||
void getStatuses(CompositeDisposable disposable) {
|
|
||||||
|
|
||||||
disposable.add(statusesService.getUserPredefinedStatuses(PrefUtils.getUserId(getApplicationContext()))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<List<String>>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(List<String> strings) {
|
|
||||||
statusesArray = strings.toArray(new String[strings.size()]);
|
|
||||||
if (strings.isEmpty()) {
|
|
||||||
disableStatusPreferences();
|
|
||||||
} else {
|
|
||||||
enableStatusPreferences();
|
|
||||||
}
|
|
||||||
// Log.d("STATUSES",Integer.toString(statusesArray.length ));
|
|
||||||
setListPreferenceData(statusList, statusesArray, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.error_status_fetch, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
void getLocations(CompositeDisposable disposable) {
|
|
||||||
disposable.add(locationService.getUserPredefinedCoords(PrefUtils.getUserId(getApplicationContext()))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<List<PredefinedCoordViewModel>>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSuccess(List<PredefinedCoordViewModel> coords) {
|
|
||||||
|
|
||||||
String currentCoordId = PrefUtils.getCurrentManualLocation(getApplicationContext());
|
|
||||||
locationMap = new HashMap<String, String>();
|
|
||||||
locationUUIDs = new ArrayList<String>();
|
|
||||||
for (PredefinedCoordViewModel i : coords)
|
|
||||||
locationMap.put(i.getPredefinedCoordinateId(), i.getName());
|
|
||||||
for (PredefinedCoordViewModel i : coords)
|
|
||||||
locationUUIDs.add(i.getPredefinedCoordinateId());
|
|
||||||
List<String> predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList();
|
|
||||||
List<String> predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList();
|
|
||||||
predefinedCoordsList.addAll(coords);
|
|
||||||
if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
|
|
||||||
preferenceCategory.removePreference(manualLocationList);
|
|
||||||
preferenceCategory.removePreference(removeManualLocation);
|
|
||||||
preferenceCategory.removePreference(manualLocationButton);
|
|
||||||
} else {
|
|
||||||
if (!predefinedCoordsList.isEmpty()) {
|
|
||||||
|
|
||||||
manualLocationList.setEnabled(true);
|
|
||||||
manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
|
|
||||||
removeManualLocation.setEnabled(true);
|
|
||||||
locationSharing.setEnabled(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String[] stringnames = predefinedLocationsNames.toArray(new String[0]);
|
|
||||||
predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames));
|
|
||||||
List<Integer> activesId = Stream.of(coords).indexed()
|
|
||||||
.filter(v -> v.getSecond().getPredefinedCoordinateId().equals(currentCoordId)).map(IntPair::getFirst).toList();
|
|
||||||
|
|
||||||
if (activesId.size() == 0) {
|
|
||||||
setListPreferenceData(manualLocationList, stringnames, null);
|
|
||||||
} else {
|
|
||||||
setListPreferenceData(manualLocationList, stringnames, activesId.get(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.error_location_fetch, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@SuppressLint("ResourceType")
|
@SuppressLint("ResourceType")
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(final Bundle savedInstanceState) {
|
public void onCreate(final Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
addPreferencesFromResource(R.xml.pref_sharing);
|
addPreferencesFromResource(R.layout.pref_sharing);
|
||||||
locationSharing = (SwitchPreference) findPreference("key_sharing_enabled");
|
Preference manualStatus = findPreference("key_manual_status");
|
||||||
statusSwitch = (SwitchPreference) findPreference("key_status_enabled");
|
Preference locationSharing = findPreference("key_sharing_enabled");
|
||||||
locationMode = findPreference("key_location_level");
|
|
||||||
preferenceCategory = (PreferenceCategory) findPreference("category_sharing");
|
|
||||||
manualLocationList = (ListPreference) findPreference("key_manual_location_value");
|
|
||||||
manualLocationButton = (RightButtonPreference) findPreference("manual_location_button");
|
|
||||||
removeManualLocation = (RightButtonPreference) findPreference("remove_manual_location");
|
|
||||||
builder = new AlertDialog.Builder(getActivity());
|
|
||||||
removeManualStatus = (RightButtonPreference) findPreference("remove_manual_status");
|
|
||||||
manualStatus = findPreference("key_manual_status");
|
|
||||||
statusList = (ListPreference) findPreference("key_status_value");
|
|
||||||
statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
|
|
||||||
locationService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class);
|
|
||||||
disposable = new CompositeDisposable();
|
|
||||||
statusesArray = new String[0];
|
|
||||||
predefinedLocationsList = new ArrayList<String>();
|
|
||||||
getStatuses(disposable);
|
|
||||||
getLocations(disposable);
|
|
||||||
locationLevelMapping = new HashMap<Integer, String>();
|
|
||||||
locationLevelMapping.put(0, SharingLevel.PRESENCE.toString());
|
|
||||||
locationLevelMapping.put(1, SharingLevel.APPROXIMATED.toString());
|
|
||||||
locationLevelMapping.put(2, SharingLevel.EXACT.toString());
|
|
||||||
locationLevelMapping.put(3, SharingLevel.MANUAL.toString());
|
|
||||||
|
|
||||||
statusMapping = new HashMap<Integer, String>();
|
|
||||||
statusMapping.put(0, "available");
|
|
||||||
statusMapping.put(1, "consultation");
|
|
||||||
statusMapping.put(2, "busy");
|
|
||||||
|
|
||||||
statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
|
|
||||||
manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
|
|
||||||
|
|
||||||
|
|
||||||
/** Main sharing switch**/
|
|
||||||
locationSharing.setOnPreferenceChangeListener((buttonView, newValue) -> {
|
|
||||||
PrefUtils.storeEnableSharingLocalization(getApplicationContext(), (Boolean) newValue);
|
|
||||||
((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Sharing level list **/
|
|
||||||
locationMode.setOnPreferenceChangeListener((preference, newValue) -> {
|
|
||||||
((MapActivity) getActivity()).stopBackgroundLocalizationTask();
|
|
||||||
((MapActivity) getActivity()).startBackgroundLocalizationTask();
|
|
||||||
PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue)));
|
|
||||||
|
|
||||||
if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
|
|
||||||
if (!predefinedCoordsList.isEmpty()) {
|
|
||||||
preferenceCategory.addPreference(manualLocationList);
|
|
||||||
preferenceCategory.addPreference(removeManualLocation);
|
|
||||||
}
|
|
||||||
preferenceCategory.addPreference(manualLocationButton);
|
|
||||||
} else {
|
|
||||||
locationSharing.setEnabled(true);
|
|
||||||
preferenceCategory.removePreference(manualLocationList);
|
|
||||||
preferenceCategory.removePreference(manualLocationButton);
|
|
||||||
preferenceCategory.removePreference(removeManualLocation);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Manual location category hiding when location level is != manual **/
|
|
||||||
|
|
||||||
|
|
||||||
/** Custom manual location list change listener **/
|
|
||||||
manualLocationList.setOnPreferenceChangeListener((preference, newValue) -> {
|
|
||||||
ListPreference lp = (ListPreference) preference;
|
|
||||||
CharSequence[] entries = lp.getEntries();
|
|
||||||
PredefinedCoordViewModel temp = Stream.of(predefinedCoordsList).filter(p -> p.getName().equals(lp.getEntries()[Integer.parseInt((String) newValue)].toString())).toList().get(0);
|
|
||||||
|
|
||||||
//sharing dialog -> ask for start BG
|
|
||||||
if (!PrefUtils.isEnableSharingLocalization(getApplicationContext())) {
|
|
||||||
EnableSharingDialog sharingDialog = new EnableSharingDialog();
|
|
||||||
sharingDialog.show(getFragmentManager(), "Sharing");
|
|
||||||
}
|
|
||||||
|
|
||||||
PrefUtils.putManualLocation(getApplicationContext(), temp.getGeoData(), temp.getApproximatedLocation());
|
|
||||||
PrefUtils.putCurrentManualLocation(getApplicationContext(), temp.getPredefinedCoordinateId());
|
|
||||||
PrefUtils.putCurrentManualLocationName(getApplicationContext(), (String) lp.getEntries()[Integer.parseInt((String) newValue)]);
|
|
||||||
lp.setSummary(lp.getEntries()[Integer.parseInt((String) newValue)]);
|
|
||||||
((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
/** Button 'choose from map' button listener **/
|
|
||||||
manualLocationButton.setOnPreferenceChangeListener((preference, o) -> {
|
|
||||||
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
|
|
||||||
fragmentTransaction.hide(SharingFragment.this);
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
((MapActivity) getActivity()).updateNavigationBarState();
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
statusSwitch.setOnPreferenceChangeListener((preference, newValue) -> true);
|
|
||||||
/** Status list change listener **/
|
|
||||||
statusList.setOnPreferenceChangeListener((preference, newValue) -> {
|
|
||||||
ListPreference lp = (ListPreference) preference;
|
|
||||||
CharSequence[] entries = lp.getEntries();
|
|
||||||
PrefUtils.storeStatus(getApplicationContext(), (String) entries[Integer.parseInt((String) newValue)]);
|
|
||||||
lp.setSummary(entries[Integer.parseInt((String) newValue)]);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
statusList.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceClick(Preference preference) {
|
|
||||||
|
|
||||||
if (statusesArray.length == 0) {
|
|
||||||
builder.setTitle("nie ma wody na pustyni");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
/** Custom status edittext change listener **/
|
|
||||||
manualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
|
manualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
|
||||||
|
ListPreference lp = (ListPreference) findPreference("key_status_value");
|
||||||
disposable.add(statusesService.postUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), (String) newValue)
|
updateListPreference(lp, newValue, "manual_statuses");
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleResponse, this::handleError));
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
removeManualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
|
|
||||||
showRemoveDialog(statusList.getEntries(), "status");
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
removeManualLocation.setOnPreferenceChangeListener(((preference, newValue) -> {
|
locationSharing.setOnPreferenceChangeListener((buttonView, isChecked) -> {
|
||||||
showRemoveDialog(manualLocationList.getEntries(), "location");
|
PrefUtils.storeEnableSharingLocalization(getApplicationContext(), (Boolean) isChecked);
|
||||||
|
((MapActivity)getActivity()).handleBackgroundTaskLifeCycle();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void showRemoveDialog(CharSequence[] entries, String service) {
|
|
||||||
boolean[] checked = new boolean[entries.length];
|
|
||||||
ArrayList<String> tobeDeleted = new ArrayList<String>();
|
|
||||||
// Log.d("sharingDialog", "no to siup");
|
|
||||||
builder.setPositiveButton("DELETE", new DialogInterface.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
|
||||||
for (int i = 0; i < entries.length; i++) {
|
|
||||||
if (checked[i] == true) {
|
|
||||||
tobeDeleted.add((String) entries[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
removeEntries(service, tobeDeleted);
|
|
||||||
// Log.d("MANAGE-PREF",tobeDeleted.toString());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
builder.setMultiChoiceItems(entries, checked, new DialogInterface.OnMultiChoiceClickListener() {
|
}
|
||||||
@Override
|
|
||||||
public void onClick(DialogInterface dialog, int which, boolean isChecked) {
|
|
||||||
|
|
||||||
|
public static SharingFragment newInstance() {
|
||||||
|
return new SharingFragment();
|
||||||
}
|
}
|
||||||
});
|
|
||||||
builder.create().show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
@ -327,182 +64,30 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
|
|||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void removeEntries(String service, ArrayList<String> toBeDeleted) {
|
protected void updateListPreference(ListPreference lp,Object newValue,String storageKey){
|
||||||
|
CharSequence [] entries = lp.getEntries();
|
||||||
// Log.d("MANAGE-PREF", toBeDeleted.toString());
|
Set<String> defaultEntries = new HashSet(Arrays.asList(entries));
|
||||||
if (service.equals("status")) {
|
SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE);
|
||||||
for (String uuid : toBeDeleted) {
|
Set <String> manualStatusSet = sharedPref.getStringSet(storageKey,defaultEntries);
|
||||||
disposable.add(statusesService.deleteUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), uuid)
|
manualStatusSet.add((String) newValue);
|
||||||
.subscribeOn(Schedulers.io())
|
String [] manualStatusArr = manualStatusSet.toArray(new String[0]);
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
Arrays.sort(manualStatusArr);
|
||||||
.subscribe(this::handleDeleteStatuses, this::handleError));
|
setListPreferenceData(lp.getKey(),manualStatusArr);
|
||||||
}
|
SharedPreferences.Editor editor = sharedPref.edit();
|
||||||
} else {
|
editor.putStringSet(storageKey,manualStatusSet);
|
||||||
ArrayList<String> uuidsToBeDeleted = new ArrayList<String>();
|
editor.apply();
|
||||||
for (String name : toBeDeleted) {
|
|
||||||
for (String uuid : locationUUIDs) {
|
|
||||||
if (locationMap.get(uuid).equals(name)) {
|
|
||||||
uuidsToBeDeleted.add(uuid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (String uuid : uuidsToBeDeleted) {
|
|
||||||
// predefinedCoordsList.removeIf(x -> x.getPredefinedCoordinateId().equals(uuid));
|
|
||||||
predefinedCoordsList.removeAll(Stream.of(predefinedCoordsList).filter(x -> x.getPredefinedCoordinateId().equals(uuid)).toList());
|
|
||||||
disposable.add(locationService.deleteUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), uuid)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleDeleteLocations, this::handleError));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setListPreferenceData(ListPreference lp, String[] entries, Integer activeId) {
|
protected void setListPreferenceData(String lp_name, String [] entries) {
|
||||||
|
ListPreference lp = (ListPreference) findPreference(lp_name);
|
||||||
try {
|
|
||||||
lp.setEntries(entries);
|
lp.setEntries(entries);
|
||||||
CharSequence[] entryValues = new CharSequence [entries.length];
|
CharSequence[] entryValues = new CharSequence [entries.length];
|
||||||
|
|
||||||
for (int i = 0; i < entries.length; i++){
|
for (int i = 0; i < entries.length; i++){
|
||||||
entryValues[i] = Integer.toString(i);
|
entryValues[i] = Integer.toString(i+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
lp.setDefaultValue(0);
|
lp.setDefaultValue("1");
|
||||||
lp.setEntryValues(entryValues);
|
lp.setEntryValues(entryValues);
|
||||||
|
|
||||||
if (entries.length > 0 && activeId != null)
|
|
||||||
lp.setValueIndex(activeId);
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.e("Failed to set listPref", e.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
private void handleResponse(List<String> resp) {
|
|
||||||
if (resp.size() == 1) {
|
|
||||||
enableStatusPreferences();
|
|
||||||
if (PrefUtils.isStatusEnabled(getApplicationContext()) == false) {
|
|
||||||
PrefUtils.enableStatus(getApplicationContext());
|
|
||||||
statusSwitch.setChecked(true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String[] statusesArray = resp.toArray(new String[resp.size()]);
|
|
||||||
setListPreferenceData(statusList, statusesArray, resp.size() - 1);
|
|
||||||
statusList.setValueIndex(resp.size() - 1);
|
|
||||||
PrefUtils.storeStatus(getApplicationContext(), resp.get(resp.size() - 1));
|
|
||||||
statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleError(Throwable error) {
|
|
||||||
if (error instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) error).response().errorBody();
|
|
||||||
Toast.makeText(getApplicationContext(),
|
|
||||||
RestApiHelper.getErrorMessage(responseBody), Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Toast.makeText(getApplicationContext(),
|
|
||||||
"Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDeleteStatuses(List<String> resp) {
|
|
||||||
if (resp.isEmpty()) {
|
|
||||||
disableStatusPreferences();
|
|
||||||
} else {
|
|
||||||
String[] statusesArray = resp.toArray(new String[resp.size()]);
|
|
||||||
setListPreferenceData(statusList, statusesArray, null);
|
|
||||||
String currentEntry = PrefUtils.getUserStatus(getApplicationContext());
|
|
||||||
if (resp.contains(currentEntry)) {
|
|
||||||
statusList.setValueIndex(resp.indexOf(currentEntry));
|
|
||||||
} else {
|
|
||||||
statusList.setValueIndex(0);
|
|
||||||
statusList.setSummary(resp.get(0));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDeleteLocations(List<PredefinedCoordViewModel> resp) {
|
|
||||||
getLocations(disposable);
|
|
||||||
String currentEntry = PrefUtils.getCurrentManualLocation(getApplicationContext());
|
|
||||||
if (resp.isEmpty()) {
|
|
||||||
disableManualLocationPreferences();
|
|
||||||
} else {
|
|
||||||
if (!Stream.of(resp).filter(x -> x.getName().equals(currentEntry)).toList().isEmpty()) {
|
|
||||||
for (PredefinedCoordViewModel location : resp) {
|
|
||||||
if (location.getName().equals(currentEntry)) {
|
|
||||||
manualLocationList.setValueIndex(resp.indexOf(location));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
manualLocationList.setValueIndex(0);
|
|
||||||
manualLocationList.setSummary(resp.get(0).getName());
|
|
||||||
//todo czy na pewno w shared pref sa dobre wartosci
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void disableStatusPreferences() {
|
|
||||||
removeManualStatus.setEnabled(false);
|
|
||||||
statusList.setEnabled(false);
|
|
||||||
statusSwitch.setEnabled(false);
|
|
||||||
statusList.setSummary("");
|
|
||||||
PrefUtils.disableStatus(getApplicationContext());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void enableStatusPreferences() {
|
|
||||||
removeManualStatus.setEnabled(true);
|
|
||||||
statusList.setEnabled(true);
|
|
||||||
statusSwitch.setEnabled(true);
|
|
||||||
statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void disableManualLocationPreferences() {
|
|
||||||
removeManualLocation.setEnabled(false);
|
|
||||||
manualLocationList.setEnabled(false);
|
|
||||||
manualLocationList.setSummary("");
|
|
||||||
locationSharing.setChecked(false);
|
|
||||||
locationSharing.setEnabled(false);
|
|
||||||
PrefUtils.disableSharing(getApplicationContext());
|
|
||||||
((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void enableManualLocationPreferences() {
|
|
||||||
removeManualLocation.setEnabled(true);
|
|
||||||
manualLocationList.setEnabled(true);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
|
||||||
locationSharing.setChecked(PrefUtils.isEnableSharingLocalization(getApplicationContext()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
|
|
||||||
super.onPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
disposable.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
|
|
||||||
public abstract class SpecialList extends AppCompatActivity {
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState){
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(getContentViewId());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract int getContentViewId();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,29 +1,15 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.PowerManager;
|
|
||||||
import android.provider.Settings;
|
|
||||||
import android.support.v4.app.DialogFragment;
|
|
||||||
import android.support.v4.app.FragmentManager;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.widget.ScrollView;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@ -32,17 +18,11 @@ public class StartupActivity extends AppCompatActivity {
|
|||||||
private static final int AUTHENTICATION_REQUEST_CODE = 666;
|
private static final int AUTHENTICATION_REQUEST_CODE = 666;
|
||||||
String currentLang;
|
String currentLang;
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
if (PrefUtils.isLoggedIn(getApplicationContext())){
|
if (PrefUtils.isLoggedIn(getApplicationContext())){
|
||||||
Intent startupIntent = new Intent(this, MapActivity.class);
|
Intent startupIntent = new Intent(this, MapActivity.class);
|
||||||
PrefUtils.storeLocale(getApplicationContext(),PrefUtils.getLocale(getApplicationContext()));
|
|
||||||
startupIntent.putExtra(currentLang, PrefUtils.getLocale(getApplicationContext()));
|
startupIntent.putExtra(currentLang, PrefUtils.getLocale(getApplicationContext()));
|
||||||
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
startupIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
startActivity(startupIntent);
|
startActivity(startupIntent);
|
||||||
@ -50,10 +30,10 @@ public class StartupActivity extends AppCompatActivity {
|
|||||||
} else {
|
} else {
|
||||||
Intent loginIntent = new Intent(this, LoginActivity.class);
|
Intent loginIntent = new Intent(this, LoginActivity.class);
|
||||||
startActivityForResult(loginIntent, AUTHENTICATION_REQUEST_CODE);
|
startActivityForResult(loginIntent, AUTHENTICATION_REQUEST_CODE);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -68,6 +48,6 @@ public class StartupActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.app.DialogFragment;
|
|
||||||
import android.app.TimePickerDialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.text.format.DateFormat;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.TimePicker;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
|
||||||
|
|
||||||
import java.util.Calendar;
|
|
||||||
|
|
||||||
@SuppressLint("ValidFragment")
|
|
||||||
public class TimePickerFragment extends DialogFragment
|
|
||||||
implements TimePickerDialog.OnTimeSetListener {
|
|
||||||
private TextView textView;
|
|
||||||
private String field;
|
|
||||||
private DutyHourViewModel duty;
|
|
||||||
@SuppressLint("ValidFragment")
|
|
||||||
public TimePickerFragment(TextView view, DutyHourViewModel duty, String field){
|
|
||||||
this.textView = view;
|
|
||||||
this.duty=duty;
|
|
||||||
this.field=field;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
// Use the current time as the default values for the picker
|
|
||||||
final Calendar c = Calendar.getInstance();
|
|
||||||
int hour = c.get(Calendar.HOUR_OF_DAY);
|
|
||||||
int minute = c.get(Calendar.MINUTE);
|
|
||||||
|
|
||||||
// Create a new instance of TimePickerDialog and return it
|
|
||||||
return new TimePickerDialog(getActivity(), this, hour, minute,
|
|
||||||
DateFormat.is24HourFormat(getActivity()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
|
|
||||||
String time = String.format("%d:%02d",hourOfDay,minute);
|
|
||||||
textView.setText(time);
|
|
||||||
if(field.equals("start")){
|
|
||||||
duty.setStart(time);
|
|
||||||
}else{
|
|
||||||
duty.setEnd(time);
|
|
||||||
}
|
|
||||||
// Do something with the time chosen by the user
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,303 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.design.widget.TextInputEditText;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.support.v7.widget.Toolbar;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.adapters.DutyHoursAdapter;
|
|
||||||
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.TutorTabApi;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
import retrofit2.Response;
|
|
||||||
import static java.lang.String.valueOf;
|
|
||||||
|
|
||||||
public class TutorTab extends AppCompatActivity {
|
|
||||||
private TutorTabApi tutorTabService;
|
|
||||||
private UserService userService;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private TextView userName;
|
|
||||||
private TextView userDutyHours;
|
|
||||||
private TextInputEditText userNote;
|
|
||||||
private TextView userRoom;
|
|
||||||
private TextView userEmail;
|
|
||||||
private TextView department;
|
|
||||||
private Button addDutyButton;
|
|
||||||
private Button saveButon;
|
|
||||||
private Button scrapButton;
|
|
||||||
private Boolean ifTutorTabExists = true;
|
|
||||||
private List<DutyHourViewModel> dutyHourList;
|
|
||||||
private RecyclerView dutyHoursRecycller;
|
|
||||||
private DutyHoursAdapter dutyHoursAdapter;
|
|
||||||
private RecyclerView.LayoutManager dutyHoursLayoutManager;
|
|
||||||
private TutorTabViewModel newTab;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
|
|
||||||
setContentView(R.layout.content_tutor_tab);
|
|
||||||
ButterKnife.bind(this);
|
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
|
||||||
toolbar.setTitle(R.string.profile_activity_title);
|
|
||||||
setSupportActionBar(toolbar);
|
|
||||||
|
|
||||||
userName = findViewById(R.id.userName);
|
|
||||||
userNote = findViewById(R.id.userNote);
|
|
||||||
userRoom = findViewById(R.id.userRoom);
|
|
||||||
userEmail = findViewById(R.id.userEmail);
|
|
||||||
department = findViewById(R.id.userDepartment);
|
|
||||||
saveButon = findViewById(R.id.saveButton);
|
|
||||||
scrapButton = findViewById(R.id.scrapTutorTab);
|
|
||||||
addDutyButton = findViewById(R.id.addDuty);
|
|
||||||
dutyHoursRecycller = findViewById(R.id.dutyHourView);
|
|
||||||
dutyHoursLayoutManager = new LinearLayoutManager(this);
|
|
||||||
dutyHoursRecycller.setLayoutManager(dutyHoursLayoutManager);
|
|
||||||
|
|
||||||
tutorTabService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(TutorTabApi.class);
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
|
|
||||||
getTutorTab();
|
|
||||||
|
|
||||||
userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext())));
|
|
||||||
|
|
||||||
disposable.add(
|
|
||||||
userService.getUserById(PrefUtils.getUserId(getApplicationContext()))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<User>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(User user) {
|
|
||||||
department.setText(user.getDepartment());
|
|
||||||
Log.d("TUTORTAB", (user.getDepartment()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
|
|
||||||
showError(e);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
setUpSaveListener(saveButon);
|
|
||||||
scrapButton.setOnClickListener(view -> scrapTutorTab());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
getMenuInflater().inflate(R.menu.menu_profile, menu);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
|
|
||||||
if (item.getItemId()==R.id.action_profile_info_popup){
|
|
||||||
int layoutID = R.layout.info_popup_tutor_tab;
|
|
||||||
|
|
||||||
View popupView = getLayoutInflater().inflate(layoutID,null);
|
|
||||||
|
|
||||||
PopupWindow popupWindow = new PopupWindow(popupView,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
||||||
// If the PopupWindow should be focusable
|
|
||||||
popupWindow.setFocusable(true);
|
|
||||||
// If you need the PopupWindow to dismiss when when touched outside
|
|
||||||
popupWindow.setBackgroundDrawable(new ColorDrawable());
|
|
||||||
// Get the View's(the one that was clicked in the Fragment) location
|
|
||||||
View anchorView= getWindow().getDecorView().findViewById(android.R.id.content);
|
|
||||||
popupWindow.showAtLocation(anchorView,Gravity.TOP|Gravity.END, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void getTutorTab(){
|
|
||||||
disposable.add(
|
|
||||||
tutorTabService.apiUsersTutorTabByTutorIdGet(PrefUtils.getUserId(getApplicationContext()))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<TutorTabViewModel>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(TutorTabViewModel tutorTabViewModel) {
|
|
||||||
|
|
||||||
dutyHourList = tutorTabViewModel.getDutyHours();
|
|
||||||
if(dutyHourList != null){
|
|
||||||
dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList, getFragmentManager());
|
|
||||||
dutyHoursRecycller.setAdapter(dutyHoursAdapter);
|
|
||||||
addDutyButton.setOnClickListener(v -> addEmptyDuty(dutyHoursAdapter));
|
|
||||||
}
|
|
||||||
userRoom.setText(String.format("%s", tutorTabViewModel.getRoom()));
|
|
||||||
userEmail.setText(String.format("%s", tutorTabViewModel.getEmailTutorTab()));
|
|
||||||
if (!tutorTabViewModel.getNote().equals("")) {
|
|
||||||
userNote.setText(String.format("%s", tutorTabViewModel.getNote()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
int code = 0;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
code = ((HttpException) e).response().code();
|
|
||||||
}
|
|
||||||
|
|
||||||
if( code == 404){
|
|
||||||
ifTutorTabExists = false;
|
|
||||||
dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),new ArrayList<DutyHourViewModel>(), getFragmentManager());
|
|
||||||
dutyHoursRecycller.setAdapter(dutyHoursAdapter);
|
|
||||||
addDutyButton.setOnClickListener(v -> addEmptyDuty(dutyHoursAdapter));
|
|
||||||
}
|
|
||||||
showError(e);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addEmptyDuty(DutyHoursAdapter adapter){
|
|
||||||
adapter.addDuty(new DutyHourViewModel());
|
|
||||||
adapter.notifyItemInserted(adapter.getItemCount());
|
|
||||||
dutyHoursRecycller.scrollToPosition(adapter.getItemCount()-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setUpSaveListener(Button button) {
|
|
||||||
button.setOnClickListener(view -> {
|
|
||||||
if( isEmailValid(userEmail.getText().toString())){
|
|
||||||
newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),
|
|
||||||
userRoom.getText().toString(),
|
|
||||||
userEmail.getText().toString(),
|
|
||||||
userNote.getText().toString(),
|
|
||||||
dutyHoursAdapter.getDutyList());
|
|
||||||
if(ifTutorTabExists){
|
|
||||||
putUserTab(newTab);
|
|
||||||
}else{
|
|
||||||
postUserTab(newTab);
|
|
||||||
ifTutorTabExists=true;
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
userEmail.setError(getString(R.string.error_invalid_email));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void putUserTab(TutorTabViewModel tutorTabViewModel) {
|
|
||||||
disposable.add(tutorTabService.apiUsersTutorTabByTutorIdPut(PrefUtils.getUserId(getApplicationContext()), tutorTabViewModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleResponsePut, this::handleError));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void postUserTab(TutorTabViewModel tutorTabViewModel) {
|
|
||||||
disposable.add(tutorTabService.apiUsersTutorTabByTutorIdPost(PrefUtils.getUserId(getApplicationContext()), tutorTabViewModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleResponsePost, this::handleError));
|
|
||||||
}
|
|
||||||
private void scrapTutorTab() {
|
|
||||||
|
|
||||||
disposable.add(tutorTabService.apiUsersScrapTutorTabByTutorIdPost(PrefUtils.getUserId(getApplicationContext()))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleResponseScrap, this::handleError));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleResponseScrap() {
|
|
||||||
Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.scrap_tutor_msg), Toast.LENGTH_SHORT).show();
|
|
||||||
getTutorTab();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleResponsePut(Response<Void> resp) {
|
|
||||||
Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.updateToast), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleResponsePost(TutorTabViewModel tutorTabViewModel ) {
|
|
||||||
Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.updateToast), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleError(Throwable error) {
|
|
||||||
if (error instanceof HttpException) {
|
|
||||||
|
|
||||||
ResponseBody responseBody = ((HttpException) error).response().errorBody();
|
|
||||||
Toast.makeText(getApplicationContext(),
|
|
||||||
RestApiHelper.getErrorMessage(responseBody), Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Toast.makeText(getApplicationContext(),
|
|
||||||
"Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
Log.e("WMI SUCC", String.valueOf(error));
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
} else {
|
|
||||||
message = "Network Error!";
|
|
||||||
}
|
|
||||||
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEmailValid(String email)
|
|
||||||
{
|
|
||||||
String regExpn =
|
|
||||||
"^(([\\w-]+\\.)+[\\w-]+|([a-zA-Z]{1}|[\\w-]{2,}))@"
|
|
||||||
+"((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\.([0-1]?"
|
|
||||||
+"[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\."
|
|
||||||
+"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\.([0-1]?"
|
|
||||||
+"[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|"
|
|
||||||
+"([a-zA-Z]+[\\w-]+\\.)+[a-zA-Z]{2,4})$";
|
|
||||||
|
|
||||||
CharSequence inputStr = email;
|
|
||||||
|
|
||||||
Pattern pattern = Pattern.compile(regExpn,Pattern.CASE_INSENSITIVE);
|
|
||||||
Matcher matcher = pattern.matcher(inputStr);
|
|
||||||
|
|
||||||
return matcher.matches();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
|
|
||||||
//import android.app.Fragment;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.FragmentTabHost;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
|
|
||||||
public class TutorsListTab extends Fragment {
|
|
||||||
private FragmentTabHost mTabHost;
|
|
||||||
|
|
||||||
public TutorsListTab() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TutorsListTab newInstance() {
|
|
||||||
return new TutorsListTab();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
View rootView = inflater.inflate(R.layout.tutors_list_tabs, container, false);
|
|
||||||
|
|
||||||
mTabHost = rootView.findViewById(android.R.id.tabhost);
|
|
||||||
mTabHost.setup(getActivity(), getFragmentManager(), R.id.realtabcontent);
|
|
||||||
|
|
||||||
mTabHost.addTab(mTabHost.newTabSpec("fragmentb").setIndicator("Fragment B"),
|
|
||||||
UsersListFragment.class, null);
|
|
||||||
mTabHost.addTab(mTabHost.newTabSpec("fragmentc").setIndicator("Fragment C"),
|
|
||||||
UsersListFragment.class, null);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return rootView;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,10 +1,7 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
package com.uam.wmi.findmytutor.activity;
|
||||||
|
|
||||||
import android.app.Fragment;
|
import android.app.Fragment;
|
||||||
import android.app.FragmentTransaction;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.SystemClock;
|
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.design.widget.CoordinatorLayout;
|
import android.support.design.widget.CoordinatorLayout;
|
||||||
import android.support.design.widget.Snackbar;
|
import android.support.design.widget.Snackbar;
|
||||||
@ -12,60 +9,36 @@ import android.support.v7.app.AlertDialog;
|
|||||||
import android.support.v7.widget.DefaultItemAnimator;
|
import android.support.v7.widget.DefaultItemAnimator;
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
import android.support.v7.widget.SearchView;
|
|
||||||
import android.text.Spannable;
|
|
||||||
import android.text.SpannableString;
|
|
||||||
import android.text.format.DateFormat;
|
|
||||||
import android.text.style.ImageSpan;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.annimon.stream.Stream;
|
import com.annimon.stream.Stream;
|
||||||
import com.github.ybq.android.spinkit.SpinKitView;
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.adapters.TutorsListAdapter;
|
import com.uam.wmi.findmytutor.adapters.TutorsListAdapter;
|
||||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
|
||||||
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
||||||
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
import com.uam.wmi.findmytutor.model.User;
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
import com.uam.wmi.findmytutor.network.ApiClient;
|
||||||
import com.uam.wmi.findmytutor.service.CoordinateService;
|
|
||||||
import com.uam.wmi.findmytutor.service.TutorTabApi;
|
import com.uam.wmi.findmytutor.service.TutorTabApi;
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
import com.uam.wmi.findmytutor.service.UserService;
|
||||||
import com.uam.wmi.findmytutor.utils.ActiveFragment;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
|
import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
|
import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
||||||
|
|
||||||
import java.text.Collator;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.ObservableSource;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
import io.reactivex.disposables.CompositeDisposable;
|
||||||
import io.reactivex.disposables.Disposable;
|
|
||||||
import io.reactivex.functions.Function;
|
|
||||||
import io.reactivex.observers.DisposableObserver;
|
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
import io.reactivex.observers.DisposableSingleObserver;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
import okhttp3.ResponseBody;
|
import okhttp3.ResponseBody;
|
||||||
@ -81,20 +54,13 @@ public class UsersListFragment extends Fragment {
|
|||||||
RecyclerView recyclerView;
|
RecyclerView recyclerView;
|
||||||
@BindView(R.id.txt_empty_notes_view)
|
@BindView(R.id.txt_empty_notes_view)
|
||||||
TextView noNotesView;
|
TextView noNotesView;
|
||||||
@BindView(R.id.loader)
|
|
||||||
SpinKitView loader;
|
|
||||||
|
|
||||||
private SearchView searchView;
|
|
||||||
private UserService userService;
|
private UserService userService;
|
||||||
private TutorTabApi tutorTabService;
|
private TutorTabApi tutorTabService;
|
||||||
private CoordinateService coordinateService;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
private CompositeDisposable disposable = new CompositeDisposable();
|
||||||
private TutorsListAdapter mAdapter;
|
private TutorsListAdapter mAdapter;
|
||||||
private List<User> tutorsList = new ArrayList<>();
|
private List<User> tutorsList = new ArrayList<>();
|
||||||
private HashMap<String, String> tutorsTimeStamps = new HashMap<>();
|
private List<User> tutorsFiltered = new ArrayList<>();
|
||||||
|
|
||||||
private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));
|
|
||||||
private Boolean fetchOnlyOnlineUsers = PrefUtils.getShowOnlyOnlineUsers(getApplicationContext());
|
|
||||||
|
|
||||||
public UsersListFragment() {
|
public UsersListFragment() {
|
||||||
}
|
}
|
||||||
@ -104,10 +70,9 @@ public class UsersListFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
mAdapter = new TutorsListAdapter(getActivity().getApplicationContext(), tutorsList, tutorsTimeStamps);
|
mAdapter = new TutorsListAdapter(getActivity().getApplicationContext(), tutorsFiltered);
|
||||||
View view = inflater.inflate(R.layout.users_list, container, false);
|
View view = inflater.inflate(R.layout.users_list, container, false);
|
||||||
view.setBackgroundColor(getResources().getColor(android.R.color.white));
|
view.setBackgroundColor(getResources().getColor(android.R.color.white));
|
||||||
setHasOptionsMenu(true);
|
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,27 +81,23 @@ public class UsersListFragment extends Fragment {
|
|||||||
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
userService = ApiClient.getClient(getApplicationContext())
|
||||||
.create(UserService.class);
|
.create(UserService.class);
|
||||||
|
|
||||||
tutorTabService = ApiClient.getClient(getActivity().getApplicationContext())
|
tutorTabService = ApiClient.getClient(getActivity().getApplicationContext())
|
||||||
.create(TutorTabApi.class);
|
.create(TutorTabApi.class);
|
||||||
coordinateService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(CoordinateService.class);
|
|
||||||
|
|
||||||
RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
|
RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
|
||||||
recyclerView.setLayoutManager(mLayoutManager);
|
recyclerView.setLayoutManager(mLayoutManager);
|
||||||
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
||||||
recyclerView.setVerticalScrollBarEnabled(true);
|
|
||||||
recyclerView.addItemDecoration(new MyDividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL, 16));
|
recyclerView.addItemDecoration(new MyDividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL, 16));
|
||||||
recyclerView.setAdapter(mAdapter);
|
recyclerView.setAdapter(mAdapter);
|
||||||
noNotesView.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
fetchAllTutors();
|
fetchAllTutors();
|
||||||
fetchTopCords();
|
|
||||||
|
|
||||||
recyclerView.addOnItemTouchListener(new RecyclerTouchListener(getActivity().getApplicationContext(),
|
recyclerView.addOnItemTouchListener(new RecyclerTouchListener(getActivity().getApplicationContext(),
|
||||||
recyclerView, new RecyclerTouchListener.ClickListener() {
|
recyclerView, new RecyclerTouchListener.ClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view, final int position) {
|
public void onClick(View view, final int position) {
|
||||||
showNoteDialog(tutorsList.get(position));
|
showNoteDialog(tutorsFiltered.get(position));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -144,54 +105,14 @@ public class UsersListFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPrepareOptionsMenu(Menu menu) {
|
|
||||||
super.onPrepareOptionsMenu(menu);
|
|
||||||
try {
|
|
||||||
menu.findItem(R.id.showOnlineUsersOnly).setChecked(fetchOnlyOnlineUsers);
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.e(TAG, "onPrepareOptionsMenu error");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
//item.setChecked(fetchOnlyOnlineUsers);
|
|
||||||
switch (item.getItemId()) {
|
|
||||||
case R.id.showOnlineUsersOnly:
|
|
||||||
|
|
||||||
if (item.isChecked()) {
|
|
||||||
fetchOnlyOnlineUsers = false;
|
|
||||||
item.setChecked(false);
|
|
||||||
} else {
|
|
||||||
item.setChecked(true);
|
|
||||||
fetchOnlyOnlineUsers = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
PrefUtils.putShowOnlyOnlineUsers(getApplicationContext(), fetchOnlyOnlineUsers);
|
|
||||||
fetchAllTutors();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
|
||||||
inflater.inflate(R.menu.users_list_menu, menu);
|
|
||||||
menu.getItem(0).setChecked(fetchOnlyOnlineUsers);
|
|
||||||
|
|
||||||
MenuItem myActionMenuItem = menu.findItem(R.id.action_search);
|
|
||||||
searchView = (SearchView) myActionMenuItem.getActionView();
|
|
||||||
|
|
||||||
super.onCreateOptionsMenu(menu, inflater);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void searchUser(String textToSearch) {
|
public void searchUser(String textToSearch) {
|
||||||
searchTutorInBackend(textToSearch);
|
tutorsFiltered.clear();
|
||||||
|
tutorsFiltered.addAll(Stream.of(tutorsList).filter(t ->
|
||||||
|
t.toSearchAbleString().toLowerCase().contains(textToSearch.toLowerCase())).toList());
|
||||||
|
mAdapter.notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showNoteDialog(final User user) {
|
private void showNoteDialog(final User user) {
|
||||||
@ -205,7 +126,6 @@ public class UsersListFragment extends Fragment {
|
|||||||
// User cancelled the dialog
|
// User cancelled the dialog
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
TextView userName = view.findViewById(R.id.userName);
|
TextView userName = view.findViewById(R.id.userName);
|
||||||
ListView userDutyHours = view.findViewById(R.id.userDutyHours);
|
ListView userDutyHours = view.findViewById(R.id.userDutyHours);
|
||||||
TextView userDutyHoursTitle = view.findViewById(R.id.userDutyHoursTitle);
|
TextView userDutyHoursTitle = view.findViewById(R.id.userDutyHoursTitle);
|
||||||
@ -213,30 +133,9 @@ public class UsersListFragment extends Fragment {
|
|||||||
TextView userRoom = view.findViewById(R.id.userRoom);
|
TextView userRoom = view.findViewById(R.id.userRoom);
|
||||||
TextView userEmail = view.findViewById(R.id.userEmail);
|
TextView userEmail = view.findViewById(R.id.userEmail);
|
||||||
TextView department = view.findViewById(R.id.userDepartment);
|
TextView department = view.findViewById(R.id.userDepartment);
|
||||||
TextView userStatusLabel = view.findViewById(R.id.user_status_label);
|
|
||||||
LinearLayout userStatusLabelLL = view.findViewById(R.id.user_status_label_linearLayout);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));
|
userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));
|
||||||
Drawable image;
|
|
||||||
if (user.isIsOnline()) {
|
|
||||||
image = this.getResources().getDrawable(R.drawable.user_list_online);
|
|
||||||
} else {
|
|
||||||
image = this.getResources().getDrawable(R.drawable.user_list_offline);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!user.isIsActive()) {
|
|
||||||
image = this.getResources().getDrawable(R.drawable.user_list_off);
|
|
||||||
}
|
|
||||||
|
|
||||||
Spannable span = new SpannableString(" " + userName.getText()); // or set your text manually
|
|
||||||
image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
|
|
||||||
ImageSpan imageSpan = new ImageSpan(image);
|
|
||||||
span.setSpan(imageSpan, 0, 1, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
|
|
||||||
userName.setText(span);
|
|
||||||
|
|
||||||
UsersListFragment usersListFragment = this;
|
|
||||||
disposable.add(
|
disposable.add(
|
||||||
tutorTabService.apiUsersTutorTabByTutorIdGet(user.getId())
|
tutorTabService.apiUsersTutorTabByTutorIdGet(user.getId())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
@ -244,51 +143,18 @@ public class UsersListFragment extends Fragment {
|
|||||||
.subscribeWith(new DisposableSingleObserver<TutorTabViewModel>() {
|
.subscribeWith(new DisposableSingleObserver<TutorTabViewModel>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(TutorTabViewModel tutorTabViewModel) {
|
public void onSuccess(TutorTabViewModel tutorTabViewModel) {
|
||||||
final AlertDialog alertDialog;
|
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
||||||
if (((MapActivity) getActivity()).coordsMap.containsKey(user.getId())) {
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput.setPositiveButton(R.string.show_on_map, (dialog, id) -> {
|
|
||||||
// User cancelled the dialog
|
|
||||||
((MapActivity) getActivity()).activeFragment = ActiveFragment.NONE;
|
|
||||||
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
|
|
||||||
fragmentTransaction.hide(usersListFragment);
|
|
||||||
fragmentTransaction.commit();
|
|
||||||
((MapActivity) getActivity()).searchUser(user.getFirstName());
|
|
||||||
((MapActivity) getActivity()).updateNavigationBarState();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
|
|
||||||
String userNoteText = tutorTabViewModel.getNote();
|
|
||||||
List<String> dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
|
List<String> dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
|
||||||
.map(DutyHourViewModel::getSummary).toList();
|
.map(DutyHourViewModel::getSummary).toList();
|
||||||
|
|
||||||
if (dutyHoursList.isEmpty()) {
|
|
||||||
dutyHoursList.add(getString(R.string.lack_duty_hours));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tutorTabViewModel.getNote().isEmpty()) {
|
|
||||||
userNoteText = getString(R.string.lack_note);
|
|
||||||
}
|
|
||||||
|
|
||||||
userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom()));
|
userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom()));
|
||||||
userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab()));
|
userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab()));
|
||||||
userNote.setText(String.format("%s: %s", getString(R.string.userNote), userNoteText));
|
userNote.setText(String.format("%s: %s", getString(R.string.userNote), tutorTabViewModel.getNote()));
|
||||||
department.setText(String.format("%s: %s", getString(R.string.userDepartment), user.getDepartment()));
|
department.setText(String.format("%s: %s", getString(R.string.userDepartment), user.getDepartment()));
|
||||||
userDutyHoursTitle.setText(String.format("%s:", getString(R.string.userDutyHoursHeader)));
|
userDutyHoursTitle.setText(String.format("%s:", getString(R.string.userDutyHoursHeader)));
|
||||||
|
|
||||||
Coordinate coordinate = ((MapActivity) getActivity()).coordsMap.get(user.getId());
|
|
||||||
if (coordinate != null){
|
|
||||||
String label = coordinate.getLabel();
|
|
||||||
if (!label.isEmpty()) {
|
|
||||||
userStatusLabelLL.setVisibility(View.VISIBLE);
|
|
||||||
userStatusLabel.setText(String.format("%s: %s", getString(R.string.user_status_label),label));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),
|
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),
|
||||||
R.layout.duty_hours_item, dutyHoursList);
|
android.R.layout.test_list_item, dutyHoursList);
|
||||||
|
|
||||||
userDutyHours.setAdapter(arrayAdapter);
|
userDutyHours.setAdapter(arrayAdapter);
|
||||||
alertDialog.show();
|
alertDialog.show();
|
||||||
@ -304,34 +170,17 @@ public class UsersListFragment extends Fragment {
|
|||||||
|
|
||||||
private void fetchAllTutors() {
|
private void fetchAllTutors() {
|
||||||
disposable.add(
|
disposable.add(
|
||||||
(fetchOnlyOnlineUsers ?
|
userService.apiUsersGet()
|
||||||
userService.getAllActiveTutors() :
|
|
||||||
userService.getAllTutors())
|
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.map(this::mapUsersToSortedList)
|
.map(tutors -> {
|
||||||
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(List<User> users) {
|
|
||||||
tutorsList.clear();
|
|
||||||
tutorsList.addAll(users);
|
|
||||||
mAdapter.notifyDataSetChanged();
|
|
||||||
toggleEmptyNotes();
|
|
||||||
fetchTopCords();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
showError(e);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<User> mapUsersToSortedList(List<User> tutors) {
|
|
||||||
List<User> tutorsList = new ArrayList<>(tutors);
|
List<User> tutorsList = new ArrayList<>(tutors);
|
||||||
|
|
||||||
List<User> onlineTutors = Stream.of(tutorsList).filter(User::isIsOnline).toList();
|
List<User> onlineTutors = Stream.of(tutorsList).filter(User::isIsOnline).toList();
|
||||||
|
|
||||||
List<User> activeNotOnlineTutors = Stream.of(tutorsList)
|
List<User> activeNotOnlineTutors = Stream.of(tutorsList)
|
||||||
.filter(t -> t.isIsActive() && !onlineTutors.contains(t)).toList();
|
.filter(t -> t.isIsActive() && !onlineTutors.contains(t)).toList();
|
||||||
|
|
||||||
List<User> notActiveTutors = Stream.of(tutorsList)
|
List<User> notActiveTutors = Stream.of(tutorsList)
|
||||||
.filterNot(User::isIsActive).toList();
|
.filterNot(User::isIsActive).toList();
|
||||||
|
|
||||||
@ -344,117 +193,48 @@ public class UsersListFragment extends Fragment {
|
|||||||
sortedUserList.addAll(notActiveTutors);
|
sortedUserList.addAll(notActiveTutors);
|
||||||
|
|
||||||
return sortedUserList;
|
return sortedUserList;
|
||||||
}
|
})
|
||||||
|
|
||||||
private void searchTutorInBackend(String searchString) {
|
|
||||||
disposable.add(
|
|
||||||
userService.searchUser(searchString)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<User> users) {
|
public void onSuccess(List<User> users) {
|
||||||
tutorsList.clear();
|
tutorsList.clear();
|
||||||
tutorsList.addAll(users);
|
tutorsList.addAll(users);
|
||||||
|
tutorsFiltered.addAll(users);
|
||||||
mAdapter.notifyDataSetChanged();
|
mAdapter.notifyDataSetChanged();
|
||||||
|
toggleEmptyNotes();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e) {
|
public void onError(Throwable e) {
|
||||||
showSearchError(e);
|
showError(e);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void restoreUsersList() {
|
|
||||||
fetchAllTutors();
|
|
||||||
fetchTopCords();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int sortByUserName(User t1, User t2) {
|
private int sortByUserName(User t1, User t2) {
|
||||||
return plCollator.compare(t1.getLastName(), t2.getLastName());
|
return t1.getFirstName().compareTo(t2.getFirstName());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
private void showError(Throwable e) {
|
||||||
String message;
|
String message = e.toString();
|
||||||
Log.e(TAG, String.valueOf(e));
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
if (e instanceof HttpException) {
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
message = RestApiHelper.getErrorMessage(responseBody);
|
||||||
} else {
|
|
||||||
message = getString(R.string.network_err);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
createSnackbar(message);
|
Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG)
|
||||||
}
|
.show();
|
||||||
|
|
||||||
private void showSearchError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
Log.e(TAG, String.valueOf(e));
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
} else {
|
|
||||||
message = getString(R.string.search_null);
|
|
||||||
}
|
|
||||||
|
|
||||||
createSnackbar(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void createSnackbar(String msg) {
|
|
||||||
Snackbar snackbar = Snackbar.make(coordinatorLayout, msg, Snackbar.LENGTH_LONG);
|
|
||||||
View view = snackbar.getView();
|
|
||||||
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) view.getLayoutParams();
|
|
||||||
params.gravity = Gravity.TOP;
|
|
||||||
view.setLayoutParams(params);
|
|
||||||
snackbar.show();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void toggleEmptyNotes() {
|
private void toggleEmptyNotes() {
|
||||||
loader.setVisibility(View.GONE);
|
if (tutorsList.size() > 0) {
|
||||||
noNotesView.setVisibility(View.GONE);
|
noNotesView.setVisibility(View.GONE);
|
||||||
|
} else {
|
||||||
if (tutorsList.size() == 0) {
|
|
||||||
noNotesView.setVisibility(View.VISIBLE);
|
noNotesView.setVisibility(View.VISIBLE);
|
||||||
if (fetchOnlyOnlineUsers)
|
|
||||||
noNotesView.setText(R.string.no_online_users);
|
|
||||||
else {
|
|
||||||
noNotesView.setText(R.string.no_offline_users);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void onSaveInstanceState(Bundle outState) {
|
|
||||||
super.onSaveInstanceState(outState);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void fetchTopCords(){
|
|
||||||
disposable.add(
|
|
||||||
coordinateService.getTopCoordinates()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::addTimestamps,this::showError));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addTimestamps(List<Coordinate> coordinates) {
|
|
||||||
for (Coordinate crd :
|
|
||||||
coordinates) {
|
|
||||||
Long ts = crd.getTimeStamp();
|
|
||||||
tutorsTimeStamps.put(crd.getUserId(), getDate(ts));
|
|
||||||
}
|
|
||||||
|
|
||||||
mAdapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getDate(long time) {
|
|
||||||
Calendar cal = Calendar.getInstance(Locale.ENGLISH);
|
|
||||||
cal.setTimeInMillis(time);
|
|
||||||
return DateFormat.format("HH:mm dd/MM", cal).toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
@ -478,4 +258,7 @@ public class UsersListFragment extends Fragment {
|
|||||||
super.onStop();
|
super.onStop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,363 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.activity;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.annotation.RequiresApi;
|
|
||||||
import android.support.design.widget.FloatingActionButton;
|
|
||||||
import android.support.design.widget.Snackbar;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.support.v7.widget.DefaultItemAnimator;
|
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.support.v7.widget.Toolbar;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
import android.widget.Switch;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.github.ybq.android.spinkit.SpinKitView;
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.adapters.WhiteListAdapter;
|
|
||||||
import com.uam.wmi.findmytutor.model.IsUsingListBool;
|
|
||||||
import com.uam.wmi.findmytutor.model.StudentIdModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.LocaleHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
import com.uam.wmi.findmytutor.utils.WrapContentLinearLayoutManager;
|
|
||||||
|
|
||||||
import java.text.Collator;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.ObservableSource;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.disposables.Disposable;
|
|
||||||
import io.reactivex.functions.Function;
|
|
||||||
import io.reactivex.observers.DisposableObserver;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
public class WhiteList extends AppCompatActivity {
|
|
||||||
|
|
||||||
@BindView(R.id.recycler_view_whitelist)
|
|
||||||
RecyclerView recyclerView;
|
|
||||||
@BindView(R.id.white_list_empty_text_view)
|
|
||||||
TextView noNotesView;
|
|
||||||
@BindView(R.id.switch_whitelist_toggle)
|
|
||||||
Switch aSwitch;
|
|
||||||
@BindView(R.id.add_to_white_list_fab)
|
|
||||||
FloatingActionButton addToWhiteListFab;
|
|
||||||
|
|
||||||
@BindView(R.id.loader)
|
|
||||||
SpinKitView loader;
|
|
||||||
|
|
||||||
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private UserService userService;
|
|
||||||
private boolean didFetched = false;
|
|
||||||
private String tutorId;
|
|
||||||
private WhiteListAdapter mAdapter;
|
|
||||||
private Integer prevSize;
|
|
||||||
private List<User> whitelistedUsers = new ArrayList<>();
|
|
||||||
private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void attachBaseContext(Context base) {
|
|
||||||
super.attachBaseContext(LocaleHelper.onAttach(base));
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresApi(api = Build.VERSION_CODES.M)
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
|
|
||||||
setContentView(R.layout.activity_white_list);
|
|
||||||
ButterKnife.bind(this);
|
|
||||||
|
|
||||||
tutorId = PrefUtils.getUserId(getApplicationContext());
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
|
|
||||||
if (PrefUtils.isWhiteListing(this)) {
|
|
||||||
aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.on) );
|
|
||||||
aSwitch.setChecked(true);
|
|
||||||
handleChangeRequest(true);
|
|
||||||
} else {
|
|
||||||
aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.off) );
|
|
||||||
aSwitch.setChecked(false);
|
|
||||||
handleChangeRequest(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
|
||||||
toolbar.setTitle(getString(R.string.activity_title_whitelist));
|
|
||||||
setSupportActionBar(toolbar);
|
|
||||||
|
|
||||||
mAdapter = new WhiteListAdapter(this, whitelistedUsers);
|
|
||||||
recyclerView.setLayoutManager(new WrapContentLinearLayoutManager(getApplicationContext()));
|
|
||||||
recyclerView.setItemAnimator(new DefaultItemAnimator());
|
|
||||||
recyclerView.addItemDecoration(new MyDividerItemDecoration(this, LinearLayoutManager.VERTICAL, 16));
|
|
||||||
recyclerView.setAdapter(mAdapter);
|
|
||||||
noNotesView.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* On long press on RecyclerView item, open alert dialog
|
|
||||||
* with options to choose
|
|
||||||
* Edit and Delete
|
|
||||||
* */
|
|
||||||
recyclerView.addOnItemTouchListener(new RecyclerTouchListener(this,
|
|
||||||
recyclerView, new RecyclerTouchListener.ClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view, final int position) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLongClick(View view, int position) {
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
addToWhiteListFab.setOnClickListener(this::showFabDialog);
|
|
||||||
fetchWhiteListedUsers();
|
|
||||||
handleSwitch();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Observable<List<String>> getListOfWhitelistedUsers(String userId) {
|
|
||||||
return userService.getTutorWhitelistedByID(userId)
|
|
||||||
.toObservable()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Observable<User> getUserObservable(String userId) {
|
|
||||||
return userService
|
|
||||||
.getUserById(userId)
|
|
||||||
.toObservable()
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void fetchWhiteListedUsers() {
|
|
||||||
disposable.add(getListOfWhitelistedUsers(tutorId)
|
|
||||||
.doOnSubscribe(this::handleDoOnSubscribe)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.flatMap(Observable::fromIterable)
|
|
||||||
.flatMap(this::getUserObservable)
|
|
||||||
.subscribe(user -> whitelistedUsers.add(user), this::handleError,this::handleComplete));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDoOnSubscribe(Disposable disposable) {
|
|
||||||
prevSize = whitelistedUsers.size();
|
|
||||||
whitelistedUsers.clear();
|
|
||||||
didFetched = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleComplete() {
|
|
||||||
Collections.sort(whitelistedUsers, this::sortByUserName);
|
|
||||||
didFetched = true;
|
|
||||||
refreshUI();
|
|
||||||
}
|
|
||||||
private void handleError(Throwable e){
|
|
||||||
showError(e);
|
|
||||||
didFetched = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void refreshUI() {
|
|
||||||
toggleEmptyNotes();
|
|
||||||
mAdapter.notifyItemRangeInserted(prevSize, whitelistedUsers.size() - prevSize);
|
|
||||||
mAdapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int sortByUserName(User t1, User t2) {
|
|
||||||
return plCollator.compare(t1.getLastName(), t2.getLastName());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showFabDialog(View v) {
|
|
||||||
LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
|
|
||||||
@SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.white_list_fab_modal, null);
|
|
||||||
AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(this);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput.setView(view).setPositiveButton(getApplicationContext().getString(R.string.modal_location_send), null);
|
|
||||||
|
|
||||||
alertDialogBuilderUserInput
|
|
||||||
.setPositiveButton(R.string.add, null)
|
|
||||||
.setNegativeButton(R.string.cancel, null);
|
|
||||||
|
|
||||||
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
|
|
||||||
|
|
||||||
EditText modalUserInput = view.findViewById(R.id.white_list_modal_input);
|
|
||||||
|
|
||||||
alertDialog.setOnShowListener(dialogInterface -> {
|
|
||||||
Button sendButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
|
|
||||||
|
|
||||||
Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
|
|
||||||
|
|
||||||
dismissButton.setOnClickListener(view1 -> alertDialog.dismiss());
|
|
||||||
|
|
||||||
sendButton.setOnClickListener(view1 -> {
|
|
||||||
String body = modalUserInput.getText().toString();
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(body)) {
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.can_not_be_empty, Toast.LENGTH_SHORT).show();
|
|
||||||
modalUserInput.requestFocus();
|
|
||||||
} else {
|
|
||||||
sendUserToWhitelist(body);
|
|
||||||
alertDialog.dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
alertDialog.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendUserToWhitelist(String body) {
|
|
||||||
StudentIdModel studentIdModel = new StudentIdModel(body);
|
|
||||||
|
|
||||||
disposable.add(
|
|
||||||
userService.addStudentToWhitelist(tutorId, studentIdModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleAddUser, this::showError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleAddUser(User user) {
|
|
||||||
Toast.makeText(this, R.string.add_user_to_list, Snackbar.LENGTH_LONG).show();
|
|
||||||
fetchWhiteListedUsers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
if (((HttpException) e).response().code() == 404) {
|
|
||||||
message = getString(R.string.no_such_a_user);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
message = "Network Error !";
|
|
||||||
}
|
|
||||||
Log.e("ERR", message);
|
|
||||||
Toast.makeText(this, message, Snackbar.LENGTH_LONG).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void toggleEmptyNotes() {
|
|
||||||
|
|
||||||
if (didFetched && whitelistedUsers.size() == 0) {
|
|
||||||
noNotesView.setVisibility(View.VISIBLE);
|
|
||||||
noNotesView.setText(R.string.list_is_empty);
|
|
||||||
loader.setVisibility(View.GONE);
|
|
||||||
} else if (whitelistedUsers.size() > 0) {
|
|
||||||
noNotesView.setVisibility(View.GONE);
|
|
||||||
loader.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
loader.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
|
|
||||||
if (item.getItemId() == R.id.action_whitelist_info_popup) {
|
|
||||||
int layoutID = R.layout.info_popup_whitelist;
|
|
||||||
|
|
||||||
View popupView = getLayoutInflater().inflate(layoutID, null);
|
|
||||||
|
|
||||||
PopupWindow popupWindow = new PopupWindow(popupView,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
||||||
// If the PopupWindow should be focusable
|
|
||||||
popupWindow.setFocusable(true);
|
|
||||||
// If you need the PopupWindow to dismiss when when touched outside
|
|
||||||
popupWindow.setBackgroundDrawable(new ColorDrawable());
|
|
||||||
// Get the View's(the one that was clicked in the Fragment) location
|
|
||||||
View anchorView = getWindow().getDecorView().findViewById(android.R.id.content);
|
|
||||||
popupWindow.showAtLocation(anchorView, Gravity.TOP | Gravity.END, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleSwitch() {
|
|
||||||
aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
|
||||||
if (isChecked) {
|
|
||||||
aSwitch.setText(getString(R.string.action_white_list) + " " + getString(R.string.on));
|
|
||||||
handleChangeRequest(true);
|
|
||||||
PrefUtils.useWhitelist(this, true);
|
|
||||||
} else {
|
|
||||||
aSwitch.setText(getString(R.string.action_white_list) + " " + getString(R.string.off));
|
|
||||||
handleChangeRequest(false);
|
|
||||||
PrefUtils.useWhitelist(this, false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleChangeRequest(boolean value) {
|
|
||||||
IsUsingListBool isUsingListBool = new IsUsingListBool();
|
|
||||||
isUsingListBool.setIsUsing(value);
|
|
||||||
disposable.add(
|
|
||||||
userService.setTutorWhitelist(tutorId, isUsingListBool)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(() -> {
|
|
||||||
}, this::showError)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
super.onPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop() {
|
|
||||||
super.onStop();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
disposable.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
getMenuInflater().inflate(R.menu.menu_white_list, menu);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,119 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.adapters;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.design.widget.Snackbar;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.model.StudentIdModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
|
|
||||||
|
|
||||||
public class BlackListAdapter extends RecyclerView.Adapter<BlackListAdapter.MyViewHolder> {
|
|
||||||
|
|
||||||
private Context context;
|
|
||||||
private List<User> tutorsList;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private UserService userService;
|
|
||||||
|
|
||||||
public BlackListAdapter(Context context, List<User> tutors) {
|
|
||||||
this.context = context;
|
|
||||||
this.tutorsList = tutors;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
View itemView = LayoutInflater.from(parent.getContext())
|
|
||||||
.inflate(R.layout.black_list_row, parent, false);
|
|
||||||
|
|
||||||
return new MyViewHolder(itemView);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
|
|
||||||
Drawable image = null;
|
|
||||||
User tutor = tutorsList.get(position);
|
|
||||||
|
|
||||||
holder.firstName.setText(tutor.getFirstName() + " " + tutor.getLastName());
|
|
||||||
holder.lastName.setText("Index: " + tutor.getLdapLogin() + " Email: " + tutor.getEmail());
|
|
||||||
//"s416196"
|
|
||||||
holder.imageButton.setOnClickListener(l ->{
|
|
||||||
StudentIdModel studentIdModel = new StudentIdModel(tutor.getLdapLogin());
|
|
||||||
String tutorId = PrefUtils.getUserId(getApplicationContext());
|
|
||||||
disposable.add(
|
|
||||||
userService.removeStudentFromBlacklist(tutorId, studentIdModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(()->{
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.user_removed, Toast.LENGTH_SHORT).show();
|
|
||||||
tutorsList.remove(position);
|
|
||||||
notifyDataSetChanged();
|
|
||||||
},this::showError)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return tutorsList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
class MyViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
@BindView(R.id.firstName)
|
|
||||||
TextView firstName;
|
|
||||||
|
|
||||||
@BindView(R.id.lastName)
|
|
||||||
TextView lastName;
|
|
||||||
|
|
||||||
@BindView(R.id.removeUserImageButton)
|
|
||||||
ImageButton imageButton;
|
|
||||||
|
|
||||||
MyViewHolder(View view) {
|
|
||||||
super(view);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
} else {
|
|
||||||
message = "Network Error !";
|
|
||||||
}
|
|
||||||
|
|
||||||
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,181 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.adapters;
|
|
||||||
|
|
||||||
import android.app.DialogFragment;
|
|
||||||
import android.app.FragmentManager;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.text.Editable;
|
|
||||||
import android.text.TextWatcher;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.annimon.stream.Collectors;
|
|
||||||
import com.annimon.stream.Stream;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.activity.TimePickerFragment;
|
|
||||||
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
|
|
||||||
|
|
||||||
public class DutyHoursAdapter extends RecyclerView.Adapter<DutyHoursAdapter.MyViewHolder> {
|
|
||||||
private Context context;
|
|
||||||
private List<DutyHourViewModel> hours;
|
|
||||||
private FragmentManager fragmentManager;
|
|
||||||
|
|
||||||
public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours, FragmentManager fragmentManager) {
|
|
||||||
this.context = context;
|
|
||||||
this.hours = new ArrayList<DutyHourViewModel>(hours);
|
|
||||||
this.fragmentManager = fragmentManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public List<DutyHourViewModel> getDutyList(){
|
|
||||||
ArrayList<DutyHourViewModel> notEmpty = Stream.of(hours).filter(DutyHourViewModel::isValid).collect(Collectors.toCollection(ArrayList::new));
|
|
||||||
return notEmpty;
|
|
||||||
}
|
|
||||||
public void addDuty(DutyHourViewModel duty){
|
|
||||||
hours.add(duty);
|
|
||||||
}
|
|
||||||
private void removeDuty(int pos){
|
|
||||||
hours.remove(pos);
|
|
||||||
this.notifyItemRemoved(pos);
|
|
||||||
Log.d("DutyIndex af rm size",Integer.toString(getItemCount()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
View itemView = LayoutInflater.from(parent.getContext())
|
|
||||||
.inflate(R.layout.duty_hour_row, parent, false);
|
|
||||||
|
|
||||||
return new MyViewHolder(itemView);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
|
|
||||||
DutyHourViewModel duty = hours.get(position);
|
|
||||||
holder.dutyDay.setText(duty.getDay());
|
|
||||||
holder.dutyDay.addTextChangedListener(new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
duty.setDay(holder.dutyDay.getText().toString());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
holder.dutyStart.setText(duty.getStart());
|
|
||||||
/* holder.dutyStart.addTextChangedListener(new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
duty.setStart(holder.dutyStart.getText().toString());
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
holder.dutyStart.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
DialogFragment picker = new TimePickerFragment(holder.dutyStart,duty,"start");
|
|
||||||
picker.show(fragmentManager,"time picker");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
holder.dutyStop.setText(duty.getEnd());
|
|
||||||
holder.dutyStop.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
DialogFragment picker = new TimePickerFragment(holder.dutyStop,duty,"stop");
|
|
||||||
picker.show(fragmentManager,"time picker");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
/* holder.dutyStop.addTextChangedListener(new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
duty.setEnd(holder.dutyStop.getText().toString());
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
holder.deleteRow.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
try{
|
|
||||||
// Log.d("DutyIndex bf rm size",Integer.toString(getItemCount()));
|
|
||||||
// Log.d("DutyIndex bf rm pos",Integer.toString(holder.getLayoutPosition()));
|
|
||||||
removeDuty(holder.getLayoutPosition());
|
|
||||||
// Log.d("DutyIndex af rm pos",Integer.toString(holder.getLayoutPosition()));
|
|
||||||
|
|
||||||
|
|
||||||
}catch(Error e){
|
|
||||||
// Log.e("DutyIndex error",e.getMessage());
|
|
||||||
// Log.e("DutyIndex size",Integer.toString(getItemCount()));
|
|
||||||
// Log.e("DutyIndex pos",Integer.toString(holder.getAdapterPosition()));
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return hours.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
class MyViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
@BindView(R.id.duty_day_value)
|
|
||||||
TextView dutyDay;
|
|
||||||
|
|
||||||
@BindView(R.id.duty_start_value)
|
|
||||||
TextView dutyStart;
|
|
||||||
|
|
||||||
@BindView(R.id.duty_stop_value)
|
|
||||||
TextView dutyStop;
|
|
||||||
|
|
||||||
@BindView(R.id.deleteRow)
|
|
||||||
ImageButton deleteRow;
|
|
||||||
|
|
||||||
MyViewHolder(View view) {
|
|
||||||
super(view);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,20 +1,18 @@
|
|||||||
/*
|
|
||||||
package com.uam.wmi.findmytutor.adapters;
|
package com.uam.wmi.findmytutor.adapters;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.github.ybq.android.spinkit.SpinKitView;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
import com.uam.wmi.findmytutor.R;
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
import com.uam.wmi.findmytutor.model.User;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
@ -25,13 +23,30 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
|
|||||||
|
|
||||||
private Context context;
|
private Context context;
|
||||||
private List<User> tutorsList;
|
private List<User> tutorsList;
|
||||||
private HashMap<String, String> tutorsTimeStamps;
|
|
||||||
|
|
||||||
public TutorsListAdapter(Context context, List<User> tutors, HashMap<String,String> tutorsTimeStamps) {
|
public TutorsListAdapter(Context context, List<User> tutors) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.tutorsList = tutors;
|
this.tutorsList = tutors;
|
||||||
this.tutorsTimeStamps = tutorsTimeStamps;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class MyViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
|
@BindView(R.id.firstName)
|
||||||
|
TextView firstName;
|
||||||
|
|
||||||
|
@BindView(R.id.lastName)
|
||||||
|
TextView lastName;
|
||||||
|
|
||||||
|
@BindView(R.id.isOnline)
|
||||||
|
TextView isOnline;
|
||||||
|
|
||||||
|
MyViewHolder(View view) {
|
||||||
|
super(view);
|
||||||
|
ButterKnife.bind(this, view);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
@ -46,32 +61,17 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
|
|||||||
Drawable image = null;
|
Drawable image = null;
|
||||||
User tutor = tutorsList.get(position);
|
User tutor = tutorsList.get(position);
|
||||||
|
|
||||||
holder.firstName.setText(String.format("%s %s", tutor.getFirstName(), tutor.getLastName()));
|
holder.firstName.setText(tutor.getFirstName());
|
||||||
String ts = tutorsTimeStamps.get(tutor.getId());
|
holder.lastName.setText(tutor.getLastName());
|
||||||
|
|
||||||
if(tutor.isIsOnline()) {
|
if(tutor.isIsOnline()) {
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_online);
|
image = context.getResources().getDrawable(R.drawable.online_user);
|
||||||
holder.lastSeen.setText(R.string.available_now);
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
} else {
|
} else {
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_offline);
|
image = context.getResources().getDrawable(R.drawable.not_online);
|
||||||
|
|
||||||
if (ts != null){
|
|
||||||
holder.lastSeen.setText(R.string.last_sign);
|
|
||||||
holder.lastSeen.append(String.format(": %s", ts));
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!tutor.isIsActive()){
|
if(!tutor.isIsActive()){
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_off);
|
image = context.getResources().getDrawable(R.drawable.not_active_user);
|
||||||
if(ts != null){
|
|
||||||
holder.lastSeen.setText(R.string.last_sign);
|
|
||||||
holder.lastSeen.append(String.format(": %s", ts));
|
|
||||||
}else{
|
|
||||||
holder.lastSeen.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
|
image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
|
||||||
@ -83,137 +83,5 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
|
|||||||
return tutorsList.size();
|
return tutorsList.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
class MyViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
@BindView(R.id.firstName)
|
|
||||||
TextView firstName;
|
|
||||||
|
|
||||||
@BindView(R.id.lastSeen)
|
|
||||||
TextView lastSeen;
|
|
||||||
|
|
||||||
@BindView(R.id.isOnline)
|
|
||||||
TextView isOnline;
|
|
||||||
|
|
||||||
@BindView(R.id.loader)
|
|
||||||
SpinKitView loader;
|
|
||||||
|
|
||||||
MyViewHolder(View view) {
|
|
||||||
super(view);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package com.uam.wmi.findmytutor.adapters;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.github.ybq.android.spinkit.SpinKitView;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
|
|
||||||
|
|
||||||
public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.MyViewHolder> {
|
|
||||||
|
|
||||||
private Context context;
|
|
||||||
private List<User> tutorsList;
|
|
||||||
private HashMap<String, String> tutorsTimeStamps;
|
|
||||||
|
|
||||||
public TutorsListAdapter(Context context, List<User> tutors, HashMap<String,String> tutorsTimeStamps) {
|
|
||||||
this.context = context;
|
|
||||||
this.tutorsList = tutors;
|
|
||||||
this.tutorsTimeStamps = tutorsTimeStamps;
|
|
||||||
}
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
View itemView = LayoutInflater.from(parent.getContext())
|
|
||||||
.inflate(R.layout.tutor_list_row, parent, false);
|
|
||||||
|
|
||||||
return new MyViewHolder(itemView);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
|
|
||||||
Drawable image = null;
|
|
||||||
User tutor = tutorsList.get(position);
|
|
||||||
|
|
||||||
holder.firstName.setText(String.format("%s %s", tutor.getFirstName(), tutor.getLastName()));
|
|
||||||
String ts = tutorsTimeStamps.get(tutor.getId());
|
|
||||||
|
|
||||||
if (tutor.isIsOnline()) {
|
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_online);
|
|
||||||
holder.lastSeen.setText(R.string.available_now);
|
|
||||||
holder.lastSeen.setVisibility(View.VISIBLE);
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
} else if(tutor.isIsActive()){
|
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_offline);
|
|
||||||
|
|
||||||
if (ts != null){
|
|
||||||
holder.lastSeen.setText(R.string.last_sign);
|
|
||||||
holder.lastSeen.append(String.format(": %s", ts));
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
image = context.getResources().getDrawable(R.drawable.user_list_off);
|
|
||||||
|
|
||||||
if(ts == null){
|
|
||||||
holder.lastSeen.setText(R.string.never_logged_in);
|
|
||||||
}else{
|
|
||||||
holder.lastSeen.setText(R.string.last_sign);
|
|
||||||
holder.lastSeen.append(String.format(": %s", ts));
|
|
||||||
}
|
|
||||||
holder.loader.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
|
|
||||||
holder.isOnline.setCompoundDrawables(image, null, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return tutorsList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
class MyViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
@BindView(R.id.firstName)
|
|
||||||
TextView firstName;
|
|
||||||
|
|
||||||
@BindView(R.id.lastSeen)
|
|
||||||
TextView lastSeen;
|
|
||||||
|
|
||||||
@BindView(R.id.isOnline)
|
|
||||||
TextView isOnline;
|
|
||||||
|
|
||||||
@BindView(R.id.loader)
|
|
||||||
SpinKitView loader;
|
|
||||||
|
|
||||||
MyViewHolder(View view) {
|
|
||||||
super(view);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,117 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.adapters;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.model.StudentIdModel;
|
|
||||||
import com.uam.wmi.findmytutor.model.User;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.UserService;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
|
|
||||||
|
|
||||||
public class WhiteListAdapter extends RecyclerView.Adapter<WhiteListAdapter.MyViewHolder> {
|
|
||||||
|
|
||||||
private Context context;
|
|
||||||
private List<User> tutorsList;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private UserService userService;
|
|
||||||
|
|
||||||
public WhiteListAdapter(Context context, List<User> tutors) {
|
|
||||||
this.context = context;
|
|
||||||
this.tutorsList = tutors;
|
|
||||||
}
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
View itemView = LayoutInflater.from(parent.getContext())
|
|
||||||
.inflate(R.layout.white_list_row, parent, false);
|
|
||||||
|
|
||||||
return new MyViewHolder(itemView);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
|
|
||||||
Drawable image = null;
|
|
||||||
User tutor = tutorsList.get(position);
|
|
||||||
|
|
||||||
holder.firstName.setText(tutor.getFirstName() + " " + tutor.getLastName());
|
|
||||||
holder.lastName.setText("Index: " + tutor.getLdapLogin() + " Email: " + tutor.getEmail());
|
|
||||||
//""
|
|
||||||
holder.imageButton.setOnClickListener(l ->{
|
|
||||||
StudentIdModel studentIdModel = new StudentIdModel(tutor.getLdapLogin());
|
|
||||||
String tutorId = PrefUtils.getUserId(getApplicationContext());
|
|
||||||
disposable.add(
|
|
||||||
userService.removeStudentFromWhitelist(tutorId, studentIdModel)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(()->{
|
|
||||||
Toast.makeText(getApplicationContext(), R.string.user_removed, Toast.LENGTH_SHORT).show();
|
|
||||||
tutorsList.remove(position);
|
|
||||||
notifyDataSetChanged();
|
|
||||||
},this::showError)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return tutorsList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
class MyViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
@BindView(R.id.firstName)
|
|
||||||
TextView firstName;
|
|
||||||
|
|
||||||
@BindView(R.id.lastName)
|
|
||||||
TextView lastName;
|
|
||||||
|
|
||||||
@BindView(R.id.removeUserImageButton)
|
|
||||||
ImageButton imageButton;
|
|
||||||
|
|
||||||
MyViewHolder(View view) {
|
|
||||||
super(view);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showError(Throwable e) {
|
|
||||||
String message;
|
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
|
||||||
} else {
|
|
||||||
message = "Network Error !";
|
|
||||||
}
|
|
||||||
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -3,9 +3,7 @@ package com.uam.wmi.findmytutor.model;
|
|||||||
import android.util.Range;
|
import android.util.Range;
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
import com.google.gson.annotations.SerializedName;
|
||||||
import com.uam.wmi.findmytutor.utils.Const;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@ -16,9 +14,11 @@ import io.swagger.annotations.ApiModelProperty;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public class Coordinate extends BaseResponse {
|
public class Coordinate extends BaseResponse {
|
||||||
private Range<Double> latitudeRange = Const.buildingLatitudeRange;
|
Range<Double> latitudeRange = Range.create(52.466709, 52.467007);
|
||||||
private Range<Double> longtitudeRange = Const.buildingLongitudeRange;
|
Range<Double> longtitudeRange = Range.create(16.926159, 16.926976);
|
||||||
private List<String> allowedApproximatedLocations = Const.validApproximatedLocations;
|
|
||||||
|
@SerializedName("coordinateId")
|
||||||
|
private UUID coordinateId = null;
|
||||||
|
|
||||||
@SerializedName("latitude")
|
@SerializedName("latitude")
|
||||||
private Double latitude;
|
private Double latitude;
|
||||||
@ -44,18 +44,15 @@ public class Coordinate extends BaseResponse {
|
|||||||
@SerializedName("label")
|
@SerializedName("label")
|
||||||
private String label;
|
private String label;
|
||||||
|
|
||||||
public Coordinate (Double latitude, Double longitude, Double altitude, String approximatedLocation, String label, String userId, String displayMode) {
|
public Coordinate (Double latitude, Double longitude, Double altitude, String label, String userId) {
|
||||||
if (!latitudeRange.contains(latitude)) throw new IllegalArgumentException("Inappropriate latitude value" + latitude);
|
//if (!latitudeRange.contains(latitude)) throw new IllegalArgumentException("Inappropriate latitude value" + latitude);
|
||||||
if (!longtitudeRange.contains(longitude)) throw new IllegalArgumentException("Inappropriate longitude value" + longitude);
|
//if (!longtitudeRange.contains(longitude)) throw new IllegalArgumentException("Inappropriate longitude value" + longitude);
|
||||||
if (!allowedApproximatedLocations.contains(approximatedLocation)) throw new IllegalArgumentException("Inappropriate approximatedLocation");
|
|
||||||
|
|
||||||
this.latitude = latitude;
|
this.latitude = latitude;
|
||||||
this.longitude = longitude;
|
this.longitude = longitude;
|
||||||
this.altitude = altitude;
|
this.altitude = altitude;
|
||||||
this.label = label;
|
this.label = label;
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
this.approximatedLocation = approximatedLocation;
|
|
||||||
this.displayMode = displayMode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Coordinate (Double latitude) {
|
public Coordinate (Double latitude) {
|
||||||
@ -63,9 +60,23 @@ public class Coordinate extends BaseResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Coordinate coordinateId(UUID coordinateId) {
|
public Coordinate coordinateId(UUID coordinateId) {
|
||||||
|
this.coordinateId = coordinateId;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get coordinateId
|
||||||
|
* @return coordinateId
|
||||||
|
**/
|
||||||
|
@ApiModelProperty(required = true, value = "")
|
||||||
|
public UUID getCoordinateId() {
|
||||||
|
return coordinateId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCoordinateId(UUID coordinateId) {
|
||||||
|
this.coordinateId = coordinateId;
|
||||||
|
}
|
||||||
|
|
||||||
public Coordinate latitude(Double latitude) {
|
public Coordinate latitude(Double latitude) {
|
||||||
this.latitude = latitude;
|
this.latitude = latitude;
|
||||||
return this;
|
return this;
|
||||||
@ -219,7 +230,8 @@ public class Coordinate extends BaseResponse {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Coordinate coordinate = (Coordinate) o;
|
Coordinate coordinate = (Coordinate) o;
|
||||||
return Objects.equals(this.latitude, coordinate.latitude) &&
|
return Objects.equals(this.coordinateId, coordinate.coordinateId) &&
|
||||||
|
Objects.equals(this.latitude, coordinate.latitude) &&
|
||||||
Objects.equals(this.longitude, coordinate.longitude) &&
|
Objects.equals(this.longitude, coordinate.longitude) &&
|
||||||
Objects.equals(this.altitude, coordinate.altitude) &&
|
Objects.equals(this.altitude, coordinate.altitude) &&
|
||||||
Objects.equals(this.userId, coordinate.userId) &&
|
Objects.equals(this.userId, coordinate.userId) &&
|
||||||
@ -231,7 +243,7 @@ public class Coordinate extends BaseResponse {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash( latitude, longitude, altitude, userId, approximatedLocation, displayMode, timeStamp, label);
|
return Objects.hash(coordinateId, latitude, longitude, altitude, userId, approximatedLocation, displayMode, timeStamp, label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -240,6 +252,7 @@ public class Coordinate extends BaseResponse {
|
|||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("class Coordinate {\n");
|
sb.append("class Coordinate {\n");
|
||||||
|
|
||||||
|
sb.append(" coordinateId: ").append(toIndentedString(coordinateId)).append("\n");
|
||||||
sb.append(" latitude: ").append(toIndentedString(latitude)).append("\n");
|
sb.append(" latitude: ").append(toIndentedString(latitude)).append("\n");
|
||||||
sb.append(" longitude: ").append(toIndentedString(longitude)).append("\n");
|
sb.append(" longitude: ").append(toIndentedString(longitude)).append("\n");
|
||||||
sb.append(" altitude: ").append(toIndentedString(altitude)).append("\n");
|
sb.append(" altitude: ").append(toIndentedString(altitude)).append("\n");
|
||||||
|
|||||||
@ -24,20 +24,6 @@ public class DutyHourViewModel {
|
|||||||
this.day = day;
|
this.day = day;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
public Boolean isValid(){
|
|
||||||
if(this.day.isEmpty()){
|
|
||||||
return false;
|
|
||||||
}else if( !this.start.isEmpty() && this.end.isEmpty() ){
|
|
||||||
return false;
|
|
||||||
}else{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public DutyHourViewModel(){
|
|
||||||
day="";
|
|
||||||
start="";
|
|
||||||
end="";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get day
|
* Get day
|
||||||
@ -108,11 +94,12 @@ public class DutyHourViewModel {
|
|||||||
return Objects.hash(day, start, end);
|
return Objects.hash(day, start, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getSummary() {
|
public String getSummary() {
|
||||||
return this.getDay() + ": " + this.getStart() + " - " + this.getEnd();
|
return this.getDay() + " " + this.getStart() + " " + this.getEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|||||||
@ -1,178 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.model;
|
|
||||||
|
|
||||||
import com.google.gson.annotations.Expose;
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
|
||||||
|
|
||||||
public class Feedback {
|
|
||||||
|
|
||||||
@SerializedName("isAnonymous")
|
|
||||||
@Expose
|
|
||||||
private Boolean isAnonymous;
|
|
||||||
@SerializedName("type")
|
|
||||||
@Expose
|
|
||||||
private String type;
|
|
||||||
@SerializedName("user")
|
|
||||||
@Expose
|
|
||||||
private String user;
|
|
||||||
@SerializedName("deviceOS")
|
|
||||||
@Expose
|
|
||||||
private String deviceOS;
|
|
||||||
@SerializedName("appVersion")
|
|
||||||
@Expose
|
|
||||||
private String appVersion;
|
|
||||||
@SerializedName("deviceModel")
|
|
||||||
@Expose
|
|
||||||
private String deviceModel;
|
|
||||||
@SerializedName("body")
|
|
||||||
@Expose
|
|
||||||
private String body;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* No args constructor for use in serialization
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Feedback() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param body
|
|
||||||
* @param appVersion
|
|
||||||
* @param deviceModel
|
|
||||||
* @param type
|
|
||||||
* @param isAnonymous
|
|
||||||
* @param user
|
|
||||||
* @param deviceOS
|
|
||||||
*/
|
|
||||||
public Feedback(Boolean isAnonymous, String type, String user, String deviceOS, String appVersion, String deviceModel, String body) {
|
|
||||||
super();
|
|
||||||
this.isAnonymous = isAnonymous;
|
|
||||||
this.type = type;
|
|
||||||
this.user = user;
|
|
||||||
this.deviceOS = deviceOS;
|
|
||||||
this.appVersion = appVersion;
|
|
||||||
this.deviceModel = deviceModel;
|
|
||||||
this.body = body;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean getIsAnonymous() {
|
|
||||||
return isAnonymous;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIsAnonymous(Boolean isAnonymous) {
|
|
||||||
this.isAnonymous = isAnonymous;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withIsAnonymous(Boolean isAnonymous) {
|
|
||||||
this.isAnonymous = isAnonymous;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getType() {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setType(String type) {
|
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withType(String type) {
|
|
||||||
this.type = type;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUser() {
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUser(String user) {
|
|
||||||
this.user = user;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withUser(String user) {
|
|
||||||
this.user = user;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDeviceOS() {
|
|
||||||
return deviceOS;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDeviceOS(String deviceOS) {
|
|
||||||
this.deviceOS = deviceOS;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withDeviceOS(String deviceOS) {
|
|
||||||
this.deviceOS = deviceOS;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getAppVersion() {
|
|
||||||
return appVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAppVersion(String appVersion) {
|
|
||||||
this.appVersion = appVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withAppVersion(String appVersion) {
|
|
||||||
this.appVersion = appVersion;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDeviceModel() {
|
|
||||||
return deviceModel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDeviceModel(String deviceModel) {
|
|
||||||
this.deviceModel = deviceModel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withDeviceModel(String deviceModel) {
|
|
||||||
this.deviceModel = deviceModel;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getBody() {
|
|
||||||
return body;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setBody(String body) {
|
|
||||||
this.body = body;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Feedback withBody(String body) {
|
|
||||||
this.body = body;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return Boolean.toString(this.isAnonymous) + this.type + this.user+this.deviceOS+this.appVersion+this.deviceModel+this.body;
|
|
||||||
}
|
|
||||||
// @Override
|
|
||||||
// public String toString() {
|
|
||||||
// return new ToStringBuilder(this).append("isAnonymous", isAnonymous).append("type", type).append("user", user).append("deviceOS", deviceOS).append("appVersion", appVersion).append("deviceModel", deviceModel).append("body", body).toString();
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// private Boolean isAnonymous;
|
|
||||||
// @SerializedName("type")
|
|
||||||
// @Expose
|
|
||||||
// private String type;
|
|
||||||
// @SerializedName("user")
|
|
||||||
// @Expose
|
|
||||||
// private String user;
|
|
||||||
// @SerializedName("deviceOS")
|
|
||||||
// @Expose
|
|
||||||
// private String deviceOS;
|
|
||||||
// @SerializedName("appVersion")
|
|
||||||
// @Expose
|
|
||||||
// private String appVersion;
|
|
||||||
// @SerializedName("deviceModel")
|
|
||||||
// @Expose
|
|
||||||
// private String deviceModel;
|
|
||||||
// @SerializedName("body")
|
|
||||||
// @Expose
|
|
||||||
// private String body;
|
|
||||||
@ -1,203 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.model;
|
|
||||||
import java.util.UUID;
|
|
||||||
import com.google.gson.annotations.Expose;
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
|
|
||||||
public class PredefinedCoordViewModel {
|
|
||||||
|
|
||||||
@SerializedName("predefinedCoordinateId")
|
|
||||||
@Expose
|
|
||||||
private String predefinedCoordinateId;
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@SerializedName("latitude")
|
|
||||||
@Expose
|
|
||||||
private Double latitude;
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@SerializedName("longitude")
|
|
||||||
@Expose
|
|
||||||
private Double longitude;
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@SerializedName("altitude")
|
|
||||||
@Expose
|
|
||||||
private Double altitude;
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@SerializedName("userId")
|
|
||||||
@Expose
|
|
||||||
private String userId;
|
|
||||||
@SerializedName("approximatedLocation")
|
|
||||||
@Expose
|
|
||||||
private String approximatedLocation;
|
|
||||||
@SerializedName("displayMode")
|
|
||||||
@Expose
|
|
||||||
private String displayMode = "predefined";
|
|
||||||
@SerializedName("name")
|
|
||||||
@Expose
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* No args constructor for use in serialization
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public PredefinedCoordViewModel() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param altitude
|
|
||||||
* @param userId
|
|
||||||
* @param displayMode
|
|
||||||
* @param name
|
|
||||||
* @param longitude
|
|
||||||
* @param latitude
|
|
||||||
* @param approximatedLocation
|
|
||||||
*/
|
|
||||||
public PredefinedCoordViewModel(Double latitude, Double longitude, Double altitude, String userId, String approximatedLocation, String displayMode, String name) {
|
|
||||||
super();
|
|
||||||
this.latitude = latitude;
|
|
||||||
this.longitude = longitude;
|
|
||||||
this.altitude = altitude;
|
|
||||||
this.userId = userId;
|
|
||||||
this.approximatedLocation = approximatedLocation;
|
|
||||||
this.displayMode = displayMode;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPredefinedCoordinateId() {
|
|
||||||
return predefinedCoordinateId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPredefinedCoordinateId(String predefinedCoordinateId) {
|
|
||||||
this.predefinedCoordinateId = predefinedCoordinateId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Double getLatitude() {
|
|
||||||
return latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void setLatitude(Double latitude) {
|
|
||||||
this.latitude = latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Double getLongitude() {
|
|
||||||
return longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void setLongitude(Double longitude) {
|
|
||||||
this.longitude = longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public Double getAltitude() {
|
|
||||||
return altitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void setAltitude(Double altitude) {
|
|
||||||
this.altitude = altitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public String getUserId() {
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* (Required)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public void setUserId(String userId) {
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getApproximatedLocation() {
|
|
||||||
return approximatedLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setApproximatedLocation(String approximatedLocation) {
|
|
||||||
this.approximatedLocation = approximatedLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDisplayMode() {
|
|
||||||
return displayMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDisplayMode(String displayMode) {
|
|
||||||
this.displayMode = displayMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append("class PredefinedCoordinate {\n");
|
|
||||||
|
|
||||||
sb.append(" lat: ").append(latitude).append("\n");
|
|
||||||
sb.append(" long: ").append(longitude).append("\n");
|
|
||||||
sb.append(" att: ").append(altitude).append("\n");
|
|
||||||
sb.append(" userID: ").append(userId).append("\n");
|
|
||||||
sb.append(" approx: ").append(approximatedLocation).append("\n");
|
|
||||||
sb.append(" dispMode: ").append(displayMode).append("\n");
|
|
||||||
sb.append(" name: ").append(name).append("\n");
|
|
||||||
sb.append("}");
|
|
||||||
return sb.toString();
|
|
||||||
}
|
|
||||||
public LatLng getGeoData(){
|
|
||||||
return new LatLng(this.latitude,this.longitude,this.altitude);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -18,15 +18,6 @@ public class StudentIdModel extends BaseResponse{
|
|||||||
@SerializedName("ldapLogin")
|
@SerializedName("ldapLogin")
|
||||||
private String ldapLogin = null;
|
private String ldapLogin = null;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param str
|
|
||||||
*/
|
|
||||||
public StudentIdModel(String str){
|
|
||||||
// this.studentId = str;
|
|
||||||
this.ldapLogin = str;
|
|
||||||
}
|
|
||||||
|
|
||||||
public StudentIdModel studentId(String studentId) {
|
public StudentIdModel studentId(String studentId) {
|
||||||
this.studentId = studentId;
|
this.studentId = studentId;
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@ -33,20 +33,11 @@ public class TutorTabViewModel {
|
|||||||
@SerializedName("dutyHours")
|
@SerializedName("dutyHours")
|
||||||
private List<DutyHourViewModel> dutyHours = null;
|
private List<DutyHourViewModel> dutyHours = null;
|
||||||
|
|
||||||
public TutorTabViewModel(String userId, String room, String email, String note, List<DutyHourViewModel> dutyHours){
|
|
||||||
this.userId=userId;
|
|
||||||
this.room=room;
|
|
||||||
this.emailTutorTab=email;
|
|
||||||
this.note=note;
|
|
||||||
this.dutyHours = new ArrayList<DutyHourViewModel>(dutyHours);
|
|
||||||
}
|
|
||||||
|
|
||||||
public TutorTabViewModel tutorTabId(UUID tutorTabId) {
|
public TutorTabViewModel tutorTabId(UUID tutorTabId) {
|
||||||
this.tutorTabId = tutorTabId;
|
this.tutorTabId = tutorTabId;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get tutorTabId
|
* Get tutorTabId
|
||||||
* @return tutorTabId
|
* @return tutorTabId
|
||||||
|
|||||||
@ -701,21 +701,17 @@ public class User extends BaseResponse {
|
|||||||
return Objects.hash(isOnline, isUsingBlacklist, isUsingWhitelist, blacklist, whitelist, department, ldapLogin, title, firstName, lastName, isActive, tutorTab, coordinates, id, userName, normalizedUserName, email, normalizedEmail, emailConfirmed, passwordHash, securityStamp, concurrencyStamp, phoneNumber, phoneNumberConfirmed, twoFactorEnabled, lockoutEnd, lockoutEnabled, accessFailedCount);
|
return Objects.hash(isOnline, isUsingBlacklist, isUsingWhitelist, blacklist, whitelist, department, ldapLogin, title, firstName, lastName, isActive, tutorTab, coordinates, id, userName, normalizedUserName, email, normalizedEmail, emailConfirmed, passwordHash, securityStamp, concurrencyStamp, phoneNumber, phoneNumberConfirmed, twoFactorEnabled, lockoutEnd, lockoutEnabled, accessFailedCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String toSearchAbleString() {
|
public String toSearchAbleString() {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append(getFirstName()).append(" ");
|
||||||
|
sb.append(getLastName()).append(" ");
|
||||||
|
sb.append(getDepartment()).append(" ");
|
||||||
|
sb.append(getEmail());
|
||||||
|
|
||||||
return getFirstName() + " " +
|
return sb.toString();
|
||||||
getLastName() + " " +
|
|
||||||
getDepartment() + " " +
|
|
||||||
getEmail();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String toSearchAbleUserName(){
|
|
||||||
|
|
||||||
return getFirstName() +
|
|
||||||
getLastName();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|||||||
@ -4,20 +4,15 @@ import android.content.Context;
|
|||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
|
import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
|
||||||
import com.uam.wmi.findmytutor.utils.Const;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import okhttp3.CipherSuite;
|
|
||||||
import okhttp3.ConnectionSpec;
|
|
||||||
import okhttp3.Interceptor;
|
import okhttp3.Interceptor;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
import okhttp3.Response;
|
import okhttp3.Response;
|
||||||
import okhttp3.TlsVersion;
|
|
||||||
import okhttp3.logging.HttpLoggingInterceptor;
|
import okhttp3.logging.HttpLoggingInterceptor;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
import retrofit2.converter.gson.GsonConverterFactory;
|
import retrofit2.converter.gson.GsonConverterFactory;
|
||||||
@ -27,6 +22,7 @@ public class ApiClient {
|
|||||||
private static Retrofit retrofit = null;
|
private static Retrofit retrofit = null;
|
||||||
private static int REQUEST_TIMEOUT = 60;
|
private static int REQUEST_TIMEOUT = 60;
|
||||||
private static OkHttpClient okHttpClient;
|
private static OkHttpClient okHttpClient;
|
||||||
|
private static final String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
|
||||||
|
|
||||||
public static Retrofit getClient(Context context) {
|
public static Retrofit getClient(Context context) {
|
||||||
|
|
||||||
@ -35,18 +31,16 @@ public class ApiClient {
|
|||||||
|
|
||||||
if (retrofit == null) {
|
if (retrofit == null) {
|
||||||
retrofit = new Retrofit.Builder()
|
retrofit = new Retrofit.Builder()
|
||||||
.baseUrl(Const.BASE_URL)
|
.baseUrl(BASE_URL)
|
||||||
.client(okHttpClient)
|
.client(okHttpClient)
|
||||||
.addConverterFactory(GsonConverterFactory.create())
|
.addConverterFactory(GsonConverterFactory.create())
|
||||||
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
|
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
return retrofit;
|
return retrofit;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void initOkHttp(final Context context) {
|
private static void initOkHttp(final Context context) {
|
||||||
|
|
||||||
OkHttpClient.Builder httpClient = new OkHttpClient().newBuilder()
|
OkHttpClient.Builder httpClient = new OkHttpClient().newBuilder()
|
||||||
.connectTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)
|
.connectTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)
|
||||||
.readTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)
|
.readTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)
|
||||||
@ -57,7 +51,9 @@ public class ApiClient {
|
|||||||
|
|
||||||
httpClient.addInterceptor(interceptor);
|
httpClient.addInterceptor(interceptor);
|
||||||
|
|
||||||
httpClient.addInterceptor(chain -> {
|
httpClient.addInterceptor(new Interceptor() {
|
||||||
|
@Override
|
||||||
|
public Response intercept(Chain chain) throws IOException {
|
||||||
Request original = chain.request();
|
Request original = chain.request();
|
||||||
Request.Builder requestBuilder = original.newBuilder()
|
Request.Builder requestBuilder = original.newBuilder()
|
||||||
.addHeader("Accept", "application/json")
|
.addHeader("Accept", "application/json")
|
||||||
@ -72,6 +68,7 @@ public class ApiClient {
|
|||||||
|
|
||||||
Request request = requestBuilder.build();
|
Request request = requestBuilder.build();
|
||||||
return chain.proceed(request);
|
return chain.proceed(request);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
okHttpClient = httpClient.build();
|
okHttpClient = httpClient.build();
|
||||||
|
|||||||
@ -0,0 +1,55 @@
|
|||||||
|
package com.uam.wmi.findmytutor.network;
|
||||||
|
|
||||||
|
import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
|
||||||
|
|
||||||
|
import okhttp3.OkHttpClient;
|
||||||
|
import okhttp3.Request;
|
||||||
|
import okhttp3.logging.HttpLoggingInterceptor;
|
||||||
|
import retrofit2.Retrofit;
|
||||||
|
import retrofit2.converter.gson.GsonConverterFactory;
|
||||||
|
|
||||||
|
public class RetrofitClientInstance {
|
||||||
|
|
||||||
|
private static final String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
|
||||||
|
|
||||||
|
private static Retrofit.Builder builder
|
||||||
|
= new Retrofit.Builder()
|
||||||
|
.baseUrl(BASE_URL)
|
||||||
|
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
|
||||||
|
.addConverterFactory(GsonConverterFactory.create());
|
||||||
|
|
||||||
|
private static Retrofit retrofit = builder.build();
|
||||||
|
|
||||||
|
private static OkHttpClient.Builder httpClient
|
||||||
|
= new OkHttpClient.Builder();
|
||||||
|
|
||||||
|
private static HttpLoggingInterceptor logging
|
||||||
|
= new HttpLoggingInterceptor()
|
||||||
|
.setLevel(HttpLoggingInterceptor.Level.BASIC);
|
||||||
|
|
||||||
|
public static <S> S createService(Class<S> serviceClass) {
|
||||||
|
if (!httpClient.interceptors().contains(logging)) {
|
||||||
|
httpClient.addInterceptor(logging);
|
||||||
|
builder.client(httpClient.build());
|
||||||
|
retrofit = builder.build();
|
||||||
|
}
|
||||||
|
return retrofit.create(serviceClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <S> S createService(Class<S> serviceClass, final String token) {
|
||||||
|
if (token != null) {
|
||||||
|
httpClient.interceptors().clear();
|
||||||
|
httpClient.addInterceptor(chain -> {
|
||||||
|
Request original = chain.request();
|
||||||
|
Request.Builder builder1 = original.newBuilder()
|
||||||
|
.header("Authorization", "Bearer " + token);
|
||||||
|
Request request = builder1.build();
|
||||||
|
return chain.proceed(request);
|
||||||
|
});
|
||||||
|
builder.client(httpClient.build());
|
||||||
|
retrofit = builder.build();
|
||||||
|
}
|
||||||
|
return retrofit.create(serviceClass);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -10,84 +10,63 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
|
import android.location.Criteria;
|
||||||
import android.location.Location;
|
import android.location.Location;
|
||||||
import android.location.LocationListener;
|
|
||||||
import android.location.LocationManager;
|
import android.location.LocationManager;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
|
import android.os.HandlerThread;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.Looper;
|
|
||||||
import android.support.annotation.RequiresApi;
|
import android.support.annotation.RequiresApi;
|
||||||
import android.support.v4.app.ActivityCompat;
|
import android.support.v4.app.ActivityCompat;
|
||||||
import android.support.v4.app.NotificationCompat;
|
import android.support.v4.app.NotificationCompat;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.annimon.stream.Stream;
|
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
||||||
import com.google.android.gms.location.FusedLocationProviderClient;
|
|
||||||
import com.google.android.gms.location.LocationCallback;
|
|
||||||
import com.google.android.gms.location.LocationRequest;
|
|
||||||
import com.google.android.gms.location.LocationResult;
|
|
||||||
import com.google.android.gms.location.LocationServices;
|
|
||||||
import com.mapbox.geojson.Point;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
import com.uam.wmi.findmytutor.model.Coordinate;
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
import com.uam.wmi.findmytutor.network.ApiClient;
|
||||||
import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
|
|
||||||
import com.uam.wmi.findmytutor.utils.Const;
|
|
||||||
import com.uam.wmi.findmytutor.utils.MapUtils;
|
|
||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.SharingLevel;
|
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
||||||
import com.uam.wmi.findmytutor.utils.WifiUtils;
|
|
||||||
|
|
||||||
import org.apache.commons.collections4.queue.CircularFifoQueue;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
import io.reactivex.disposables.CompositeDisposable;
|
||||||
import io.reactivex.observers.DisposableCompletableObserver;
|
import io.reactivex.observers.DisposableSingleObserver;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
|
import okhttp3.ResponseBody;
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.offlineBackgroundLocationInterval;
|
import timber.log.Timber;
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.onlineBackgroundLocationInterval;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.presenceApproximatedName;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.presenceLatitude;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.presenceLongitude;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationStatus;
|
|
||||||
import static java.lang.String.valueOf;
|
|
||||||
|
|
||||||
public class BackgroundLocalizationService extends Service {
|
public class BackgroundLocalizationService extends Service {
|
||||||
|
|
||||||
private static final String TAG = "MyLocationService";
|
private static final String TAG = "MyLocationService";
|
||||||
private static Integer notify_interval = onlineBackgroundLocationInterval;
|
private static final int LOCATION_INTERVAL = 1000;
|
||||||
private static Integer notify_interval_inside_building = onlineBackgroundLocationInterval;
|
private static final float LOCATION_DISTANCE = 5f;
|
||||||
private static Integer notify_interval_outside_building = offlineBackgroundLocationInterval;
|
public static String str_receiver = "background.location.broadcast";
|
||||||
private static int coordinatesHistoryLength = 10;
|
private static long notify_interval = 10000;
|
||||||
private Boolean highAccuracyMode;
|
Location mLastLocation;
|
||||||
private Location mLastLocation;
|
|
||||||
private Boolean stopService = false;
|
ArrayList<String> providers = new ArrayList<String>();
|
||||||
private ArrayList<String> providers = new ArrayList<String>();
|
LocationListener[] mLocationListeners;
|
||||||
private CircularFifoQueue<Location> coordinatesHistory = new CircularFifoQueue<Location>(coordinatesHistoryLength);
|
|
||||||
|
private LocationManager mLocationManager = null;
|
||||||
private Handler mHandler = new Handler();
|
private Handler mHandler = new Handler();
|
||||||
|
private HandlerThread mHandlerThread = null;
|
||||||
private Runnable mStatusChecker;
|
private Runnable mStatusChecker;
|
||||||
private FusedLocationProviderClient mFusedLocationClient;
|
|
||||||
private Location fakeLoc = null;
|
|
||||||
private LocationRequest mLocationRequest;
|
|
||||||
private Location mCurrentLocation;
|
|
||||||
private LocationCallback mLocationCallback;
|
|
||||||
private LocationListener mLocationListener;
|
|
||||||
|
|
||||||
public BackgroundLocalizationService() {
|
public BackgroundLocalizationService() {
|
||||||
providers.add(LocationManager.GPS_PROVIDER);
|
providers.add(LocationManager.GPS_PROVIDER);
|
||||||
providers.add(LocationManager.NETWORK_PROVIDER);
|
providers.add(LocationManager.NETWORK_PROVIDER);
|
||||||
providers.add(LocationManager.PASSIVE_PROVIDER);
|
providers.add(LocationManager.PASSIVE_PROVIDER);
|
||||||
fakeLoc = new Location("");
|
|
||||||
|
|
||||||
fakeLoc.setLatitude(0);
|
mLocationListeners = new LocationListener[]{
|
||||||
fakeLoc.setLongitude(0);
|
new LocationListener(LocationManager.GPS_PROVIDER),
|
||||||
fakeLoc.setAltitude(0);
|
new LocationListener(LocationManager.NETWORK_PROVIDER),
|
||||||
|
new LocationListener(LocationManager.PASSIVE_PROVIDER)
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -100,13 +79,13 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
Log.e(TAG, "onStartCommand");
|
Log.e(TAG, "onStartCommand");
|
||||||
super.onStartCommand(intent, flags, startId);
|
super.onStartCommand(intent, flags, startId);
|
||||||
|
|
||||||
|
//call startForeground first
|
||||||
|
boolean stopService = false;
|
||||||
|
|
||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
stopService = intent.getBooleanExtra("request_stop", false);
|
stopService = intent.getBooleanExtra("request_stop", false);
|
||||||
notify_interval = intent.getIntExtra("notify_interval", onlineBackgroundLocationInterval);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stopService) {
|
if (stopService) {
|
||||||
storeBackgroundLocationStatus(getApplication(), false);
|
|
||||||
stopForeground(true);
|
stopForeground(true);
|
||||||
stopSelf();
|
stopSelf();
|
||||||
return START_STICKY;
|
return START_STICKY;
|
||||||
@ -115,30 +94,10 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
return START_STICKY;
|
return START_STICKY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createLocationCallback() {
|
|
||||||
mLocationCallback = new LocationCallback() {
|
|
||||||
@Override
|
|
||||||
public void onLocationResult(LocationResult locationResult) {
|
|
||||||
super.onLocationResult(locationResult);
|
|
||||||
if (locationResult != null) {
|
|
||||||
mCurrentLocation = locationResult.getLastLocation();
|
|
||||||
sendCoordinateToBackend(mCurrentLocation);
|
|
||||||
changeBackgroundMode();
|
|
||||||
|
|
||||||
//Restart service when a user started using presence in GPS mode and wmi is currently available
|
|
||||||
if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())
|
|
||||||
&& PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.PRESENCE.toString())) {
|
|
||||||
restartService();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
Log.e(TAG, "onCreate");
|
Log.e(TAG, "onCreate");
|
||||||
storeBackgroundLocationStatus(getApplication(), true);
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
|
||||||
startMyOwnForeground();
|
startMyOwnForeground();
|
||||||
@ -148,114 +107,44 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
startForeground(1001, notification);
|
startForeground(1001, notification);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!stopService) {
|
initializeLocationManager();
|
||||||
if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.PRESENCE.toString())) {
|
|
||||||
if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())) {
|
|
||||||
Location presenceFakeLoc = new Location("");
|
|
||||||
|
|
||||||
presenceFakeLoc.setLatitude(Const.presenceLatitude);
|
Integer providerIndex = 0;
|
||||||
presenceFakeLoc.setLongitude(Const.presenceLongitude);
|
|
||||||
presenceFakeLoc.setAltitude(0);
|
|
||||||
createPresenceLooper(presenceFakeLoc);
|
|
||||||
} else {
|
|
||||||
createFusedLocationClient();
|
|
||||||
}
|
|
||||||
} else if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.EXACT.toString())
|
|
||||||
|| PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.APPROXIMATED.toString())
|
|
||||||
) {
|
|
||||||
createFusedLocationClient();
|
|
||||||
} else if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
|
|
||||||
Location manualFakeLoc = new Location("");
|
|
||||||
|
|
||||||
manualFakeLoc.setLatitude(0);
|
for (LocationListener listener : mLocationListeners) {
|
||||||
manualFakeLoc.setLongitude(0);
|
try {
|
||||||
manualFakeLoc.setAltitude(0);
|
mLocationManager.requestLocationUpdates(
|
||||||
createLowBatteryLooper(manualFakeLoc);
|
providers.get(providerIndex),
|
||||||
}
|
LOCATION_INTERVAL,
|
||||||
}
|
LOCATION_DISTANCE,
|
||||||
|
listener
|
||||||
|
);
|
||||||
|
|
||||||
|
} catch (java.lang.SecurityException ex) {
|
||||||
|
Log.i(TAG, "fail to request location update, ignore", ex);
|
||||||
|
} catch (IllegalArgumentException ex) {
|
||||||
|
Log.d(TAG, "network provider does not exist, " + ex.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
providerIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createLowBatteryLooper(Location fakeLoc) {
|
|
||||||
mStatusChecker = () -> {
|
mStatusChecker = () -> {
|
||||||
try {
|
try {
|
||||||
sendCoordinateToBackend(fakeLoc);
|
fn_getlocation();
|
||||||
} finally {
|
} finally {
|
||||||
mHandler.postDelayed(mStatusChecker, notify_interval);
|
mHandler.postDelayed(mStatusChecker, notify_interval);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
AsyncTask.execute(mStatusChecker);
|
AsyncTask.execute(mStatusChecker);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createPresenceLooper(Location fakeLoc) {
|
|
||||||
mStatusChecker = () -> {
|
|
||||||
try {
|
|
||||||
if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())) {
|
|
||||||
sendCoordinateToBackend(fakeLoc);
|
|
||||||
} else {
|
|
||||||
restartService();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
mHandler.postDelayed(mStatusChecker, notify_interval);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
AsyncTask.execute(mStatusChecker);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void createFusedLocationClient() {
|
|
||||||
Integer saveMode = Long.valueOf(notify_interval).compareTo(Long.valueOf(offlineBackgroundLocationInterval));
|
|
||||||
|
|
||||||
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mLocationRequest = new LocationRequest();
|
|
||||||
|
|
||||||
if (saveMode != 0) {
|
|
||||||
mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
|
|
||||||
} else {
|
|
||||||
mLocationRequest.setPriority(LocationRequest.PRIORITY_LOW_POWER);
|
|
||||||
}
|
|
||||||
|
|
||||||
mLocationRequest.setFastestInterval(notify_interval);
|
|
||||||
mLocationRequest.setInterval(notify_interval);
|
|
||||||
|
|
||||||
createLocationCallback();
|
|
||||||
|
|
||||||
if (!stopService) {
|
|
||||||
mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
|
|
||||||
mFusedLocationClient.requestLocationUpdates(mLocationRequest,
|
|
||||||
mLocationCallback, Looper.getMainLooper());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void changeBackgroundMode() {
|
|
||||||
Integer prevInterval = notify_interval;
|
|
||||||
Boolean shouldExtendTimeInterval = Stream.of(coordinatesHistory)
|
|
||||||
.map(MapUtils::checkIfCoordinateIsValid).takeWhile(s -> !s).toList().size() == coordinatesHistoryLength;
|
|
||||||
|
|
||||||
Boolean shouldAbbreviateTimeInterval = Stream.of(coordinatesHistory).
|
|
||||||
map(MapUtils::checkIfCoordinateIsValid).filter(x -> x).toList().size() > 0;
|
|
||||||
|
|
||||||
if (shouldExtendTimeInterval) {
|
|
||||||
notify_interval = notify_interval_outside_building;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (shouldAbbreviateTimeInterval) {
|
|
||||||
notify_interval = notify_interval_inside_building;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Integer changedMode = Long.valueOf(prevInterval).compareTo(Long.valueOf(notify_interval));
|
|
||||||
if (changedMode != 0) {
|
|
||||||
updateListeners();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||||
private void startMyOwnForeground() {
|
private void startMyOwnForeground() {
|
||||||
String NOTIFICATION_CHANNEL_ID = "com.example.fmt";
|
|
||||||
String channelName = "FMT Background location service";
|
String NOTIFICATION_CHANNEL_ID = "com.example.simpleapp";
|
||||||
|
String channelName = "My Background Service";
|
||||||
NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
|
NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
|
||||||
chan.setLightColor(Color.BLUE);
|
chan.setLightColor(Color.BLUE);
|
||||||
chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
|
chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
|
||||||
@ -272,7 +161,41 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
startForeground(2, notification);
|
startForeground(2, notification);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendCoordinateToBackend(Location location) {
|
private void fn_getlocation() {
|
||||||
|
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
||||||
|
// TODO: Consider calling
|
||||||
|
// ActivityCompat#requestPermissions
|
||||||
|
// here to request the missing permissions, and then overriding
|
||||||
|
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
|
||||||
|
// int[] grantResults)
|
||||||
|
// to handle the case where the user grants the permission. See the documentation
|
||||||
|
// for ActivityCompat#requestPermissions for more details.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> providers1 = mLocationManager.getProviders(true);
|
||||||
|
Location bestLocation = null;
|
||||||
|
|
||||||
|
|
||||||
|
for (String provider : providers1) {
|
||||||
|
Location location = mLocationManager.getLastKnownLocation(provider);
|
||||||
|
|
||||||
|
if (location == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (bestLocation == null || location.getAccuracy() < bestLocation.getAccuracy()) {
|
||||||
|
bestLocation = location;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.e("Best localization:", String.valueOf(bestLocation));
|
||||||
|
|
||||||
|
if (bestLocation != null)
|
||||||
|
fn_update(bestLocation);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void fn_update(Location location) {
|
||||||
new Task(location).execute();
|
new Task(location).execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -282,56 +205,66 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
|
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
mHandler.removeCallbacks(mStatusChecker);
|
mHandler.removeCallbacks(mStatusChecker);
|
||||||
destroyLocationListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void destroyLocationListeners() {
|
|
||||||
if (mFusedLocationClient != null) {
|
if (mLocationManager != null) {
|
||||||
mFusedLocationClient.removeLocationUpdates(mLocationCallback);
|
for (LocationListener listener : mLocationListeners) {
|
||||||
mFusedLocationClient = null;
|
try {
|
||||||
mLocationCallback = null;
|
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
||||||
mLocationRequest = null;
|
return;
|
||||||
|
}
|
||||||
|
mLocationManager.removeUpdates(listener);
|
||||||
|
Log.i(TAG, "Removed");
|
||||||
|
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.i(TAG, "fail to remove location listener, ignore", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateListeners() {
|
private void initializeLocationManager() {
|
||||||
if (mFusedLocationClient != null) {
|
Log.e(TAG, "initializeLocationManager - LOCATION_INTERVAL: " + LOCATION_INTERVAL + " LOCATION_DISTANCE: " + LOCATION_DISTANCE);
|
||||||
mFusedLocationClient.removeLocationUpdates(mLocationCallback)
|
|
||||||
.addOnCompleteListener(task -> {
|
if (mLocationManager == null) {
|
||||||
restartService();
|
mLocationManager = (LocationManager) getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
|
||||||
mFusedLocationClient = null;
|
|
||||||
mLocationCallback = null;
|
|
||||||
mLocationRequest = null;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void restartService() {
|
private class LocationListener implements android.location.LocationListener {
|
||||||
|
|
||||||
Intent stopIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
public LocationListener(String provider) {
|
||||||
stopIntent.putExtra("request_stop", true);
|
Log.e(TAG, "LocationListener " + provider);
|
||||||
|
mLastLocation = new Location(provider);
|
||||||
stopService(stopIntent);
|
|
||||||
|
|
||||||
Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
|
|
||||||
startIntent.putExtra("notify_interval", notify_interval);
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
|
|
||||||
startForegroundService(startIntent);
|
|
||||||
} else {
|
|
||||||
startService(startIntent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onLocationChanged(Location location) {
|
||||||
|
Log.e(TAG, "onLocationChanged: " + location);
|
||||||
|
mLastLocation.set(location);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onProviderDisabled(String provider) {
|
||||||
|
Log.e(TAG, "onProviderDisabled: " + provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onProviderEnabled(String provider) {
|
||||||
|
Log.e(TAG, "onProviderEnabled: " + provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStatusChanged(String provider, int status, Bundle extras) {
|
||||||
|
Log.e(TAG, "onStatusChanged: " + provider);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressLint("StaticFieldLeak")
|
|
||||||
private class Task extends AsyncTask {
|
private class Task extends AsyncTask {
|
||||||
private ApproximatedLocalization approximatedLocalization;
|
|
||||||
private Double latitude;
|
private Double latitude;
|
||||||
private Double longitude;
|
private Double longitude;
|
||||||
private Double altitude;
|
private Double altitude;
|
||||||
private String approximatedBuildingPart = null;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
private CompositeDisposable disposable = new CompositeDisposable();
|
||||||
private CoordinateService coordinateService = ApiClient.getClient(getApplicationContext())
|
private CoordinateService coordinateService = ApiClient.getClient(getApplicationContext())
|
||||||
.create(CoordinateService.class);
|
.create(CoordinateService.class);
|
||||||
@ -340,75 +273,52 @@ public class BackgroundLocalizationService extends Service {
|
|||||||
latitude = location.getLatitude();
|
latitude = location.getLatitude();
|
||||||
longitude = location.getLongitude();
|
longitude = location.getLongitude();
|
||||||
altitude = location.getAltitude();
|
altitude = location.getAltitude();
|
||||||
Log.e(TAG, "TASK" + latitude + " " + longitude);
|
|
||||||
approximatedLocalization = new ApproximatedLocalization(MapUtils.loadJsonFromAsset(getApplicationContext(), "building.geojson"));
|
|
||||||
approximatedBuildingPart = approximatedLocalization.getNameOfBuildingPart(Point.fromLngLat(longitude, latitude));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Object doInBackground(Object[] objects) {
|
protected Object doInBackground(Object[] objects) {
|
||||||
|
|
||||||
String locationLevel = PrefUtils.getLocationLevel(getApplicationContext());
|
|
||||||
String status = (PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : "";
|
|
||||||
|
|
||||||
if (locationLevel.equals(SharingLevel.PRESENCE.toString())) {
|
|
||||||
if (!MapUtils.checkIfCoordinateIsValid(latitude, longitude)) {
|
|
||||||
coordinatesHistory.add(fakeLoc);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
latitude = presenceLatitude;
|
|
||||||
longitude = presenceLongitude;
|
|
||||||
approximatedBuildingPart = presenceApproximatedName;
|
|
||||||
} else if (locationLevel.equals(SharingLevel.APPROXIMATED.toString())) {
|
|
||||||
List<Double> points = approximatedLocalization.getMiddlePointOfBuildingPart(approximatedBuildingPart);
|
|
||||||
latitude = points.get(0);
|
|
||||||
longitude = points.get(1);
|
|
||||||
} else if (locationLevel.equals(SharingLevel.MANUAL.toString())) {
|
|
||||||
LatLng latLng = PrefUtils.getManualLocation(getApplicationContext());
|
|
||||||
latitude = latLng.getLatitude();
|
|
||||||
longitude = latLng.getLongitude();
|
|
||||||
approximatedBuildingPart = PrefUtils.getManualLocationApproximation(getApplicationContext());
|
|
||||||
}
|
|
||||||
|
|
||||||
Location fakeLoc = new Location("");
|
|
||||||
|
|
||||||
fakeLoc.setLatitude(latitude);
|
|
||||||
fakeLoc.setLongitude(longitude);
|
|
||||||
coordinatesHistory.add(fakeLoc);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Coordinate coordinate = new Coordinate(
|
Coordinate coordinate = new Coordinate(
|
||||||
latitude,
|
latitude,
|
||||||
longitude,
|
longitude,
|
||||||
altitude,
|
altitude,
|
||||||
approximatedBuildingPart,
|
PrefUtils.getUserFirstName(getApplicationContext()) + " " + PrefUtils.getUserLastName(getApplicationContext()),
|
||||||
status,
|
PrefUtils.getUserId(getApplicationContext())
|
||||||
PrefUtils.getUserId(getApplicationContext()),
|
|
||||||
locationLevel
|
|
||||||
);
|
);
|
||||||
|
|
||||||
disposable.add(
|
disposable.add(
|
||||||
coordinateService
|
coordinateService
|
||||||
.putCoordinate(coordinate, PrefUtils.getUserId(getApplicationContext()))
|
.postCoordinate(coordinate)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribeWith(new DisposableCompletableObserver() {
|
.subscribeWith(new DisposableSingleObserver<Coordinate>() {
|
||||||
|
@SuppressLint("LongLogTag")
|
||||||
@Override
|
@Override
|
||||||
public void onComplete() {
|
public void onSuccess(Coordinate coord) {
|
||||||
Log.e(TAG, "CoordinateSuccess");
|
Log.e("CoordinateService onSuccess", String.valueOf(coord));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("LongLogTag")
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e) {
|
public void onError(Throwable e) {
|
||||||
Log.e(TAG, "onErr" + valueOf(e));
|
|
||||||
|
Log.e("CoordinateService onError", e.getMessage());
|
||||||
|
|
||||||
|
if (e instanceof HttpException) {
|
||||||
|
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
||||||
|
Log.e("CoordinateService onError", RestApiHelper.getErrorMessage(responseBody));
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
Log.e(TAG, e.toString());
|
Timber.e(String.valueOf(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -3,7 +3,6 @@ package com.uam.wmi.findmytutor.service;
|
|||||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
import com.uam.wmi.findmytutor.model.Coordinate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import io.reactivex.Completable;
|
|
||||||
import io.reactivex.Single;
|
import io.reactivex.Single;
|
||||||
import retrofit2.http.Body;
|
import retrofit2.http.Body;
|
||||||
import retrofit2.http.DELETE;
|
import retrofit2.http.DELETE;
|
||||||
@ -25,7 +24,7 @@ public interface CoordinateService {
|
|||||||
Single<List<Coordinate>> getCoordinatesByUserId(@Path("userId") String userId);
|
Single<List<Coordinate>> getCoordinatesByUserId(@Path("userId") String userId);
|
||||||
|
|
||||||
@GET("api/coordinates/userTop/{userId}")
|
@GET("api/coordinates/userTop/{userId}")
|
||||||
Single <Coordinate> getTopCoordinateByUserId(@Path("userId") String userId);
|
Single<List<Coordinate>> getTopCoordinatesByUserId(@Path("userId") String userId);
|
||||||
|
|
||||||
@GET("api/coordinates/top")
|
@GET("api/coordinates/top")
|
||||||
Single<List<Coordinate>> getTopCoordinates();
|
Single<List<Coordinate>> getTopCoordinates();
|
||||||
@ -37,11 +36,9 @@ public interface CoordinateService {
|
|||||||
Single <Coordinate> postCoordinate(@Body Coordinate coordinate);
|
Single <Coordinate> postCoordinate(@Body Coordinate coordinate);
|
||||||
|
|
||||||
@PUT("api/coordinates/{id}")
|
@PUT("api/coordinates/{id}")
|
||||||
Completable putCoordinate(@Body Coordinate coordinate, @Path("id") String id);
|
Single<Coordinate> putCoordinatesById(@Path("id") String id);
|
||||||
|
|
||||||
@DELETE("api/coordinates/{id}")
|
@DELETE("api/coordinates/{id}")
|
||||||
Completable deleteCoordinatesById(@Path("id") String id);
|
Single<Coordinate> deleteCoordinatesById(@Path("id") String id);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.service;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.model.Feedback;
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.Single;
|
|
||||||
import retrofit2.Response;
|
|
||||||
import retrofit2.http.Body;
|
|
||||||
import retrofit2.http.GET;
|
|
||||||
import retrofit2.http.POST;
|
|
||||||
|
|
||||||
public interface FeedbackService {
|
|
||||||
@POST("api/Feedback")
|
|
||||||
Observable<Response<Void>> postFeedback(@Body Feedback feedback);
|
|
||||||
|
|
||||||
@GET("api/Feedback")
|
|
||||||
Observable<Void> getFeedback();
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.service;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import io.reactivex.Single;
|
|
||||||
import retrofit2.http.Body;
|
|
||||||
import retrofit2.http.DELETE;
|
|
||||||
import retrofit2.http.GET;
|
|
||||||
import retrofit2.http.HTTP;
|
|
||||||
import retrofit2.http.POST;
|
|
||||||
import retrofit2.http.Path;
|
|
||||||
|
|
||||||
public interface PredefinedCoordinatesService {
|
|
||||||
@GET("api/users/predefined/coordinate/{tutorId}")
|
|
||||||
Single<List<PredefinedCoordViewModel>> getUserPredefinedCoords(@Path("tutorId") String tutorId);
|
|
||||||
|
|
||||||
@POST("api/users/predefined/coordinate/{tutorId}")
|
|
||||||
Single <PredefinedCoordViewModel> postUserPredefinedCoord(@Path("tutorId") String tutorId, @Body PredefinedCoordViewModel coord);
|
|
||||||
|
|
||||||
@HTTP(method = "DELETE", path = "api/users/predefined/coordinate/{tutorId}", hasBody = true)
|
|
||||||
Single<List<PredefinedCoordViewModel>> deleteUserPredefinedCoord(@Path("tutorId") String tutorId, @Body String uuid);
|
|
||||||
}
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.service;
|
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
|
||||||
import java.util.List;
|
|
||||||
import io.reactivex.Single;
|
|
||||||
import retrofit2.http.Body;
|
|
||||||
import retrofit2.http.DELETE;
|
|
||||||
import retrofit2.http.GET;
|
|
||||||
import retrofit2.http.HTTP;
|
|
||||||
import retrofit2.http.POST;
|
|
||||||
import retrofit2.http.Path;
|
|
||||||
|
|
||||||
public interface PredefinedStatusesService {
|
|
||||||
@GET("api/users/predefined/status/{tutorId}")
|
|
||||||
Single<List<String>> getUserPredefinedStatuses(@Path("tutorId") String tutorId);
|
|
||||||
|
|
||||||
@POST("api/users/predefined/status/{tutorId}")
|
|
||||||
Single<List<String>> postUserPredefinedStatus(@Path("tutorId") String tutorId, @Body String status);
|
|
||||||
|
|
||||||
// @DELETE("api/users/predefined/status/{tutorId}")
|
|
||||||
@HTTP(method = "DELETE", path = "api/users/predefined/status/{tutorId}", hasBody = true)
|
|
||||||
Single<List<String>> deleteUserPredefinedStatus(@Path("tutorId") String tutorId, @Body String status);
|
|
||||||
|
|
||||||
/* @GET("api/users/predefined/coordinate/{tutorId}")
|
|
||||||
Single<List<PredefinedCoordViewModel>> getUserPredefinedCoords(@Path("tutorId") String tutorId);
|
|
||||||
|
|
||||||
@POST("api/users/predefined/coordinate/{tutorId}")
|
|
||||||
Single <PredefinedCoordViewModel> postUserPredefinedCoord(@Path("tutorId") String tutorId, @Body PredefinedCoordViewModel coord);
|
|
||||||
|
|
||||||
@DELETE("api/users/predefined/coordinate/{tutorId}")
|
|
||||||
Single<List<PredefinedCoordViewModel>> deleteUserPredefinedCoord(@Path("tutorId") String tutorId, @Body PredefinedCoordViewModel coord);*/
|
|
||||||
}
|
|
||||||
@ -3,10 +3,8 @@ package com.uam.wmi.findmytutor.service;
|
|||||||
|
|
||||||
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
||||||
|
|
||||||
import io.reactivex.Completable;
|
|
||||||
import io.reactivex.Observable;
|
import io.reactivex.Observable;
|
||||||
import io.reactivex.Single;
|
import io.reactivex.Single;
|
||||||
import retrofit2.Response;
|
|
||||||
import retrofit2.http.*;
|
import retrofit2.http.*;
|
||||||
|
|
||||||
|
|
||||||
@ -18,7 +16,7 @@ public interface TutorTabApi {
|
|||||||
* @return Call<Void>
|
* @return Call<Void>
|
||||||
*/
|
*/
|
||||||
@POST("api/users/scrapTutorTab/{tutorId}")
|
@POST("api/users/scrapTutorTab/{tutorId}")
|
||||||
Completable apiUsersScrapTutorTabByTutorIdPost(
|
Observable<Void> apiUsersScrapTutorTabByTutorIdPost(
|
||||||
@retrofit2.http.Path("tutorId") String tutorId
|
@retrofit2.http.Path("tutorId") String tutorId
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -28,7 +26,7 @@ public interface TutorTabApi {
|
|||||||
* @return Call<Void>
|
* @return Call<Void>
|
||||||
*/
|
*/
|
||||||
@POST("api/users/scrapTutorTab")
|
@POST("api/users/scrapTutorTab")
|
||||||
Single<Void> apiUsersScrapTutorTabPost();
|
Observable<Void> apiUsersScrapTutorTabPost();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -42,10 +40,6 @@ public interface TutorTabApi {
|
|||||||
@retrofit2.http.Path("tutorId") String tutorId
|
@retrofit2.http.Path("tutorId") String tutorId
|
||||||
);
|
);
|
||||||
|
|
||||||
@POST("api/users/tutorTab/{tutorId}")
|
|
||||||
Single<TutorTabViewModel> apiUsersTutorTabByTutorIdPost(
|
|
||||||
@retrofit2.http.Path("tutorId") String tutorId, @retrofit2.http.Body TutorTabViewModel tutorTab
|
|
||||||
);
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
@ -57,7 +51,7 @@ public interface TutorTabApi {
|
|||||||
"Content-Type:application/json"
|
"Content-Type:application/json"
|
||||||
})
|
})
|
||||||
@PUT("api/users/tutorTab/{tutorId}")
|
@PUT("api/users/tutorTab/{tutorId}")
|
||||||
Observable<Response<Void>> apiUsersTutorTabByTutorIdPut(
|
Observable<Void> apiUsersTutorTabByTutorIdPut(
|
||||||
@retrofit2.http.Path("tutorId") String tutorId, @retrofit2.http.Body TutorTabViewModel tutorTab
|
@retrofit2.http.Path("tutorId") String tutorId, @retrofit2.http.Body TutorTabViewModel tutorTab
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -10,17 +10,14 @@ import java.util.List;
|
|||||||
|
|
||||||
import io.reactivex.Completable;
|
import io.reactivex.Completable;
|
||||||
import io.reactivex.Observable;
|
import io.reactivex.Observable;
|
||||||
import io.reactivex.ObservableEmitter;
|
|
||||||
import io.reactivex.Single;
|
import io.reactivex.Single;
|
||||||
import retrofit2.Response;
|
import retrofit2.Response;
|
||||||
import retrofit2.http.Body;
|
import retrofit2.http.Body;
|
||||||
import retrofit2.http.DELETE;
|
import retrofit2.http.DELETE;
|
||||||
import retrofit2.http.GET;
|
import retrofit2.http.GET;
|
||||||
import retrofit2.http.HTTP;
|
|
||||||
import retrofit2.http.POST;
|
import retrofit2.http.POST;
|
||||||
import retrofit2.http.PUT;
|
import retrofit2.http.PUT;
|
||||||
import retrofit2.http.Path;
|
import retrofit2.http.Path;
|
||||||
import retrofit2.http.Query;
|
|
||||||
|
|
||||||
|
|
||||||
public interface UserService {
|
public interface UserService {
|
||||||
@ -30,24 +27,6 @@ public interface UserService {
|
|||||||
@GET("api/users")
|
@GET("api/users")
|
||||||
Single <List<User>> apiUsersGet();
|
Single <List<User>> apiUsersGet();
|
||||||
|
|
||||||
@GET("api/users/tutors")
|
|
||||||
Single <List<User>> getAllTutors();
|
|
||||||
|
|
||||||
@GET("api/users/tutors/online")
|
|
||||||
Single <List<User>> getAllOnlineTutors();
|
|
||||||
|
|
||||||
@GET("api/users/tutors/active")
|
|
||||||
Single <List<User>> getAllActiveTutors();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@GET("api/users/tutors/offline")
|
|
||||||
Single <List<User>> getAllOfflineTutors();
|
|
||||||
|
|
||||||
@GET("api/users/tutors/search")
|
|
||||||
Single <List<User>> searchUser(@Query(value = "searchString", encoded = true) String searchString);
|
|
||||||
|
|
||||||
@POST("api/users")
|
@POST("api/users")
|
||||||
Completable createUser(@Body User user);
|
Completable createUser(@Body User user);
|
||||||
|
|
||||||
@ -61,10 +40,7 @@ public interface UserService {
|
|||||||
Single<PagedResultReturnedTutors> getPagedStudents(@Path("pageNum") String pageNum);
|
Single<PagedResultReturnedTutors> getPagedStudents(@Path("pageNum") String pageNum);
|
||||||
|
|
||||||
@GET("api/users/{id}")
|
@GET("api/users/{id}")
|
||||||
Single <User> getUserById(@Path("id") String userID);
|
Single<User> getUserByID(@Path("id") String userID);
|
||||||
|
|
||||||
@GET("api/users/self/{id}")
|
|
||||||
Single <User> getSelf(@Path("id") String userID);
|
|
||||||
|
|
||||||
@PUT("api/users/{id}")
|
@PUT("api/users/{id}")
|
||||||
Completable updateUserByID(@Path("id") String userID, @Body User user);
|
Completable updateUserByID(@Path("id") String userID, @Body User user);
|
||||||
@ -82,28 +58,26 @@ public interface UserService {
|
|||||||
Completable setUserInActive(@Path("userID") String userID);
|
Completable setUserInActive(@Path("userID") String userID);
|
||||||
|
|
||||||
@GET("api/users/blacklist/{tutorID}")
|
@GET("api/users/blacklist/{tutorID}")
|
||||||
Single <List<String>> getTutorBlacklistedByID(@Path("tutorID") String tutorID);
|
Single<List<User>> getTutorBlacklistedByID(@Path("tutorID") String tutorID);
|
||||||
|
|
||||||
@PUT("api/users/blacklist/{tutorID}")
|
@PUT("api/users/blacklist/{tutorID}")
|
||||||
Completable setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing);
|
Completable setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing);
|
||||||
|
|
||||||
@POST("api/users/blacklist/{tutorID}")
|
@POST("api/users/blacklist/{tutorID}")
|
||||||
Observable <User> addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
Completable addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
||||||
|
|
||||||
// @DELETE("api/users/blacklist/{tutorID}")
|
@DELETE("api/users/blacklist/{tutorID}")
|
||||||
@HTTP(method = "DELETE", path = "api/users/blacklist/{tutorID}", hasBody = true)
|
|
||||||
Completable removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
Completable removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
||||||
|
|
||||||
@GET("api/users/whitelist/{tutorID}")
|
@GET("api/users/whitelist/{tutorID}")
|
||||||
Single<List<String>> getTutorWhitelistedByID(@Path("tutorID") String tutorID);
|
Single<List<User>> getTutorwhitelistedByID(@Path("tutorID") String tutorID);
|
||||||
|
|
||||||
@PUT("api/users/whitelist/{tutorID}")
|
@PUT("api/users/whitelist/{tutorID}")
|
||||||
Completable setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing);
|
Completable setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing);
|
||||||
|
|
||||||
@POST("api/users/whitelist/{tutorID}")
|
@POST("api/users/whitelist/{tutorID}")
|
||||||
Observable <User> addStudentToWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
Completable addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
||||||
|
|
||||||
// @DELETE("api/users/whitelist/{tutorID}")
|
@DELETE("api/users/whitelist/{tutorID}")
|
||||||
@HTTP(method = "DELETE", path = "api/users/whitelist/{tutorID}", hasBody = true)
|
|
||||||
Completable removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
Completable removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import com.mapbox.geojson.Feature;
|
|
||||||
import com.mapbox.geojson.FeatureCollection;
|
|
||||||
import com.mapbox.geojson.Point;
|
|
||||||
import com.mapbox.geojson.Polygon;
|
|
||||||
import com.mapbox.turf.TurfClassification;
|
|
||||||
import com.mapbox.turf.TurfJoins;
|
|
||||||
import com.mapbox.turf.TurfMeasurement;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
;import static com.mapbox.geojson.FeatureCollection.fromJson;
|
|
||||||
|
|
||||||
public class ApproximatedLocalization {
|
|
||||||
private FeatureCollection buildingSchema = null;
|
|
||||||
|
|
||||||
public ApproximatedLocalization(String buildingObject) {
|
|
||||||
buildingSchema = fromJson(buildingObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getNameOfBuildingPart(Point point) {
|
|
||||||
|
|
||||||
for (Feature feature : Objects.requireNonNull(buildingSchema.features())) {
|
|
||||||
boolean isInside = TurfJoins.inside(point, (Polygon) Objects.requireNonNull(feature.geometry()));
|
|
||||||
|
|
||||||
if (isInside)
|
|
||||||
return Objects.requireNonNull(Objects.requireNonNull(feature.getStringProperty("name")));
|
|
||||||
}
|
|
||||||
|
|
||||||
return Const.presenceApproximatedName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Double> getMiddlePointOfBuildingPart(String buildingPart) {
|
|
||||||
|
|
||||||
for (Feature feature : Objects.requireNonNull(buildingSchema.features())) {
|
|
||||||
String partName = feature.getStringProperty("name");
|
|
||||||
|
|
||||||
|
|
||||||
if (buildingPart != null && buildingPart.equals(partName)) {
|
|
||||||
|
|
||||||
Double longitude = feature.getNumberProperty("longitude").doubleValue();
|
|
||||||
Double latitude = feature.getNumberProperty("latitude").doubleValue();
|
|
||||||
|
|
||||||
return Arrays.asList(longitude, latitude);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Arrays.asList(0.0, 0.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.util.Range;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class Const {
|
|
||||||
public final static String BASE_URL = "https://s416084.projektstudencki.pl/master/";
|
|
||||||
public final static Integer mapRefreshInterval = 6000;
|
|
||||||
public final static Integer onlineBackgroundLocationInterval = 7000;
|
|
||||||
public final static Integer offlineBackgroundLocationInterval = 360000;
|
|
||||||
public final static Integer defaultMapZoom = 17;
|
|
||||||
public final static Integer searchMapZoom = 13;
|
|
||||||
public final static Double presenceLatitude = 52.466365;
|
|
||||||
public final static Double presenceLongitude = 16.926792;
|
|
||||||
public final static String presenceApproximatedName = "Unknown";
|
|
||||||
public final static Range<Double> buildingLatitudeRange = Range.create(52.466092, 52.467529);
|
|
||||||
public final static Range<Double> buildingLongitudeRange = Range.create(16.926159, 16.927759);
|
|
||||||
public final static Range<Double> outsideLatitudeRange = Range.create(52.4651, 52.468837);
|
|
||||||
public final static Range<Double> outsideLongitudeRange = Range.create(16.9186, 16.936004);
|
|
||||||
public final static List<String> validApproximatedLocations = Arrays.asList("Skrzydło B", "Skrzydło A", "Aule", "Łącznik", "Biblioteka", "Hol", "Unknown");
|
|
||||||
public final static String WMI_SSID_NAME = "wmi";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.app.DialogFragment;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.activity.MapActivity;
|
|
||||||
|
|
||||||
public class EnableSharingDialog extends DialogFragment {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
return new AlertDialog.Builder(getActivity())
|
|
||||||
.setTitle(R.string.sharing_modal_title)
|
|
||||||
.setMessage(R.string.enable_sharing_question)
|
|
||||||
.setPositiveButton(R.string.possitive_dialog_button, (dialog, which) ->
|
|
||||||
dialogPositiveAnswer(getActivity())
|
|
||||||
)
|
|
||||||
.setNegativeButton(R.string.negative_dialog_button, (dialog, which) -> dialog.cancel()).create();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void dialogPositiveAnswer(Context context) {
|
|
||||||
PrefUtils.storeEnableSharingLocalization(context, true);
|
|
||||||
((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,134 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.CheckBox;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.activity.BaseActivity;
|
|
||||||
import com.uam.wmi.findmytutor.model.Feedback;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.FeedbackService;
|
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
import retrofit2.Response;
|
|
||||||
|
|
||||||
public class FeedbackUtils {
|
|
||||||
private Context activityContext;
|
|
||||||
AlertDialog.Builder alertDialogBuilderUserInput;
|
|
||||||
public FeedbackUtils(Context context){
|
|
||||||
activityContext = context;
|
|
||||||
}
|
|
||||||
public void showNoteDialog(String subject) {
|
|
||||||
|
|
||||||
LayoutInflater layoutInflaterAndroid = LayoutInflater.from(activityContext);
|
|
||||||
View view = layoutInflaterAndroid.inflate(R.layout.feedback_modal, null);
|
|
||||||
alertDialogBuilderUserInput = new AlertDialog.Builder(activityContext);
|
|
||||||
alertDialogBuilderUserInput.setView(view).setPositiveButton(activityContext.getString(R.string.modal_feedback_send),null);
|
|
||||||
final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
|
|
||||||
|
|
||||||
EditText modalUserInput = view.findViewById(R.id.feedback_input);
|
|
||||||
CheckBox modalIsAnonymous = view.findViewById(R.id.feedback_is_anonymous);
|
|
||||||
TextView modalTitle = view.findViewById(R.id.feedback_modal_title);
|
|
||||||
TextView modalSubtitle = view.findViewById(R.id.feedback_modal_subtitle);
|
|
||||||
modalTitle.setText(subject);
|
|
||||||
if( subject.equals(activityContext.getString(R.string.title_bug_report)) ){
|
|
||||||
modalSubtitle.setText(activityContext.getString(R.string.title_bug_report_notice));
|
|
||||||
} else {
|
|
||||||
modalSubtitle.setText(activityContext.getString(R.string.title_feedback_report_notice));
|
|
||||||
}
|
|
||||||
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
|
||||||
@Override
|
|
||||||
public void onShow(DialogInterface dialogInterface) {
|
|
||||||
Button sendButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
|
|
||||||
sendButton.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
String body = modalUserInput.getText().toString();
|
|
||||||
if(TextUtils.isEmpty(body)){
|
|
||||||
Toast.makeText(activityContext, activityContext.getString(R.string.modal_feedback_hint), Toast.LENGTH_SHORT).show();
|
|
||||||
modalUserInput.requestFocus();
|
|
||||||
}else{
|
|
||||||
boolean mode = modalIsAnonymous.isChecked();
|
|
||||||
sendFeedback(subject,body,mode);
|
|
||||||
alertDialog.dismiss();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
alertDialog.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendFeedback(String header, String body, boolean mode) {
|
|
||||||
String appVersion = null;
|
|
||||||
String metadata = null;
|
|
||||||
Feedback userFeedback= null;
|
|
||||||
try {
|
|
||||||
appVersion = activityContext.getPackageManager().getPackageInfo(activityContext.getPackageName(), 0).versionName;
|
|
||||||
if( !mode ){
|
|
||||||
userFeedback = new Feedback(mode,
|
|
||||||
header,
|
|
||||||
PrefUtils.getUserFirstName(activityContext) + " " + PrefUtils.getUserLastName(activityContext) + " | " + PrefUtils.getUserId(activityContext),
|
|
||||||
"Android "+ Build.VERSION.RELEASE,
|
|
||||||
appVersion,
|
|
||||||
Build.MODEL,
|
|
||||||
body);
|
|
||||||
Log.d("FEEDBACK non anon", userFeedback.toString());
|
|
||||||
|
|
||||||
}else{
|
|
||||||
userFeedback = new Feedback(mode,
|
|
||||||
header,
|
|
||||||
"anonymous",
|
|
||||||
"Android "+ Build.VERSION.RELEASE,
|
|
||||||
appVersion,
|
|
||||||
Build.MODEL,
|
|
||||||
body);
|
|
||||||
Log.d("FEEDBACK anon",userFeedback.toString());
|
|
||||||
}
|
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
|
|
||||||
}
|
|
||||||
FeedbackService feedbackService = ApiClient.getClient(activityContext).create(FeedbackService.class);
|
|
||||||
|
|
||||||
CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
disposable.add(feedbackService.postFeedback(userFeedback)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::handleResponse, this::handleError));
|
|
||||||
}
|
|
||||||
private void handleResponse( Response<Void> resp) {
|
|
||||||
Toast.makeText(activityContext, activityContext.getString(R.string.modal_feedback_thankyou), Toast.LENGTH_SHORT).show();
|
|
||||||
Log.d("FEEDBACK toast","gdzie jest mój tost");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleError(Throwable error) {
|
|
||||||
if (error instanceof HttpException) {
|
|
||||||
|
|
||||||
ResponseBody responseBody = ((HttpException) error).response().errorBody();
|
|
||||||
Toast.makeText(activityContext,
|
|
||||||
RestApiHelper.getErrorMessage(responseBody), Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// Toast.makeText(activityContext,
|
|
||||||
// "Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
Log.d("FEEDBACK handerr ",error.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
|
|
||||||
public class InfoHelperUtils {
|
|
||||||
|
|
||||||
public static void infoPopUp(View anchorView, int layoutId) {
|
|
||||||
LayoutInflater layoutInflater = (LayoutInflater)getApplicationContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE );
|
|
||||||
View popupView = Objects.requireNonNull(layoutInflater).inflate(layoutId, null);
|
|
||||||
|
|
||||||
PopupWindow popupWindow = new PopupWindow(popupView,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
||||||
// If the PopupWindow should be focusable
|
|
||||||
popupWindow.setFocusable(true);
|
|
||||||
// If you need the PopupWindow to dismiss when when touched outside
|
|
||||||
popupWindow.setBackgroundDrawable(new ColorDrawable());
|
|
||||||
int location[] = new int[2];
|
|
||||||
// Get the View's(the one that was clicked in the Fragment) location
|
|
||||||
anchorView.getLocationOnScreen(location);
|
|
||||||
// Using location, the PopupWindow will be displayed right under anchorView
|
|
||||||
popupWindow.showAtLocation(anchorView, Gravity.NO_GRAVITY,
|
|
||||||
location[0] + anchorView.getWidth() / 2, location[1] + anchorView.getHeight());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.content.res.Configuration;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
public class LocaleHelper {
|
|
||||||
|
|
||||||
private static final String SELECTED_LANGUAGE = "Locale.Helper.Selected.Language";
|
|
||||||
|
|
||||||
public static Context onAttach(Context context) {
|
|
||||||
String lang = getPersistedData(context, Locale.getDefault().getLanguage());
|
|
||||||
return setLocale(context, lang);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Context onAttach(Context context, String defaultLanguage) {
|
|
||||||
String lang = getPersistedData(context, defaultLanguage);
|
|
||||||
return setLocale(context, lang);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getLanguage(Context context) {
|
|
||||||
return getPersistedData(context, Locale.getDefault().getLanguage());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Context setLocale(Context context, String language) {
|
|
||||||
persist(context, language);
|
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
|
||||||
return updateResources(context, language);
|
|
||||||
}
|
|
||||||
|
|
||||||
return updateResourcesLegacy(context, language);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getPersistedData(Context context, String defaultLanguage) {
|
|
||||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
return preferences.getString(SELECTED_LANGUAGE, defaultLanguage);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void persist(Context context, String language) {
|
|
||||||
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
|
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
|
||||||
|
|
||||||
editor.putString(SELECTED_LANGUAGE, language);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
@TargetApi(Build.VERSION_CODES.N)
|
|
||||||
private static Context updateResources(Context context, String language) {
|
|
||||||
Locale locale = new Locale(language);
|
|
||||||
Locale.setDefault(locale);
|
|
||||||
|
|
||||||
Configuration configuration = context.getResources().getConfiguration();
|
|
||||||
configuration.setLocale(locale);
|
|
||||||
|
|
||||||
return context.createConfigurationContext(configuration);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
private static Context updateResourcesLegacy(Context context, String language) {
|
|
||||||
Locale locale = new Locale(language);
|
|
||||||
Locale.setDefault(locale);
|
|
||||||
|
|
||||||
Resources resources = context.getResources();
|
|
||||||
|
|
||||||
Configuration configuration = resources.getConfiguration();
|
|
||||||
configuration.locale = locale;
|
|
||||||
|
|
||||||
resources.updateConfiguration(configuration, resources.getDisplayMetrics());
|
|
||||||
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.res.Configuration;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.support.v4.os.ConfigurationCompat;
|
|
||||||
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
public class LocaleUtils {
|
|
||||||
public static String getCurrentLocale() {
|
|
||||||
return String.valueOf(ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Context updateResources(Context context, String language) {
|
|
||||||
Locale locale = new Locale(language);
|
|
||||||
Locale.setDefault(locale);
|
|
||||||
|
|
||||||
Resources res = context.getResources();
|
|
||||||
Configuration config = new Configuration(res.getConfiguration());
|
|
||||||
if (Build.VERSION.SDK_INT >= 22) {
|
|
||||||
config.setLocale(locale);
|
|
||||||
context = context.createConfigurationContext(config);
|
|
||||||
} else {
|
|
||||||
config.locale = locale;
|
|
||||||
res.updateConfiguration(config, res.getDisplayMetrics());
|
|
||||||
}
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.Fragment;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.preference.PreferenceFragment;
|
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
import com.uam.wmi.findmytutor.activity.BaseActivity;
|
|
||||||
import com.uam.wmi.findmytutor.activity.MapActivity;
|
|
||||||
import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
|
|
||||||
import com.uam.wmi.findmytutor.network.ApiClient;
|
|
||||||
import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
import static java.security.AccessController.getContext;
|
|
||||||
|
|
||||||
@SuppressLint("ValidFragment")
|
|
||||||
public class ManualLocationUtils {
|
|
||||||
private Context activityContext;
|
|
||||||
|
|
||||||
public ManualLocationUtils(Context context) {
|
|
||||||
activityContext = context;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleError(Throwable error) {
|
|
||||||
if (error instanceof HttpException) {
|
|
||||||
|
|
||||||
ResponseBody responseBody = ((HttpException) error).response().errorBody();
|
|
||||||
Toast.makeText(activityContext,
|
|
||||||
RestApiHelper.getErrorMessage(responseBody), Toast.LENGTH_SHORT).show();
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Toast.makeText(activityContext,
|
|
||||||
"Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.view.View;
|
|
||||||
|
|
||||||
import com.mapbox.mapboxsdk.annotations.Icon;
|
|
||||||
import com.mapbox.mapboxsdk.annotations.InfoWindow;
|
|
||||||
import com.mapbox.mapboxsdk.annotations.Marker;
|
|
||||||
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
|
|
||||||
import com.mapbox.mapboxsdk.maps.MapView;
|
|
||||||
import com.mapbox.mapboxsdk.maps.MapboxMap;
|
|
||||||
|
|
||||||
public class MapMarker{
|
|
||||||
|
|
||||||
private MarkerOptions markerOptions;
|
|
||||||
private Marker marker;
|
|
||||||
private String markerType;
|
|
||||||
private Icon defaultIcon;
|
|
||||||
private Icon markerIcon;
|
|
||||||
|
|
||||||
|
|
||||||
public MapMarker(Marker marker, MarkerOptions markerOptions, Icon icon, String markerType) {
|
|
||||||
this.setMarker(marker);
|
|
||||||
this.setMarkerOptions(markerOptions);
|
|
||||||
this.defaultIcon = icon;
|
|
||||||
this.markerType = markerType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void restoreDefaultIcon() {
|
|
||||||
this.marker.setIcon(this.defaultIcon);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDefaultIcon(Icon icon) {
|
|
||||||
this.defaultIcon = icon;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void changeMarkerType(String markerType) {
|
|
||||||
this.markerType = markerType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MarkerOptions getMarkerOptions() {
|
|
||||||
return markerOptions;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setMarkerOptions(MarkerOptions marker) {
|
|
||||||
this.markerOptions = marker;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Marker getMarker() {
|
|
||||||
return marker;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMarker(Marker marker) {
|
|
||||||
this.marker = marker;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getMarkerType() {
|
|
||||||
return markerType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMarkerType(String markerType) {
|
|
||||||
this.markerType = markerType;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,127 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.animation.TypeEvaluator;
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.location.Location;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.provider.Settings;
|
|
||||||
|
|
||||||
import com.mapbox.mapboxsdk.camera.CameraPosition;
|
|
||||||
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLngBounds;
|
|
||||||
import com.mapbox.mapboxsdk.maps.MapView;
|
|
||||||
import com.mapbox.mapboxsdk.maps.MapboxMap;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.outsideLatitudeRange;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.Const.outsideLongitudeRange;
|
|
||||||
import static com.uam.wmi.findmytutor.utils.PrefUtils.shouldBatteryExclusionBeShown;
|
|
||||||
|
|
||||||
public class MapUtils {
|
|
||||||
|
|
||||||
// Boundires
|
|
||||||
private static final LatLngBounds WMI_BOUNDS = new LatLngBounds.Builder()
|
|
||||||
.include(new LatLng(52.46588041661952, 16.92543089389801))
|
|
||||||
.include(new LatLng(52.467824943492374, 16.928574442863464))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
// Map Bounds Area
|
|
||||||
public static void setMapBoundsArea(Context context, MapboxMap mapboxMap, MapView mapView, Boolean check) {
|
|
||||||
|
|
||||||
if (check) {
|
|
||||||
// Set bounds to WMI
|
|
||||||
mapboxMap.setLatLngBoundsForCameraTarget(WMI_BOUNDS);
|
|
||||||
makeNewCamera(mapboxMap, 52.466799, 16.927002, 17, 0, 0, 4000);
|
|
||||||
mapboxMap.setMinZoomPreference(16); // TODO export to map config
|
|
||||||
} else {
|
|
||||||
mapboxMap.setLatLngBoundsForCameraTarget(null);
|
|
||||||
mapboxMap.setMinZoomPreference(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Map Bounds Area
|
|
||||||
public static void setZoom(MapboxMap mapboxMap, Integer zoom) {
|
|
||||||
makeNewCamera(mapboxMap, 52.466799, 16.927002, zoom, 0, 0, 1000);
|
|
||||||
mapboxMap.setMinZoomPreference(16); // TODO export to map config
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void makeNewCamera(MapboxMap mapboxMap, double lat, double lon, int zoomParam, int bearingParam, int tiltParam, int duration) {
|
|
||||||
CameraPosition position = new CameraPosition.Builder()
|
|
||||||
.target(new LatLng(lat, lon)) // Sets the new camera position
|
|
||||||
.zoom(zoomParam) // Sets the zoom
|
|
||||||
.bearing(bearingParam) // Rotate the camera
|
|
||||||
.tilt(tiltParam) // Set the camera tilt
|
|
||||||
.build(); // Creates a CameraPosition from the builder
|
|
||||||
|
|
||||||
mapboxMap.animateCamera(CameraUpdateFactory
|
|
||||||
.newCameraPosition(position), duration);
|
|
||||||
}
|
|
||||||
|
|
||||||
// read file to JSON
|
|
||||||
public static String loadJsonFromAsset(Context context, String filename) {
|
|
||||||
try {
|
|
||||||
InputStream is = context.getAssets().open(filename);
|
|
||||||
int size = is.available();
|
|
||||||
byte[] buffer = new byte[size];
|
|
||||||
is.read(buffer);
|
|
||||||
is.close();
|
|
||||||
return new String(buffer, "UTF-8");
|
|
||||||
|
|
||||||
} catch (IOException ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean checkIfCoordinateIsValid(Location coordinate) {
|
|
||||||
return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean checkIfCoordinateIsValid(Double latitude, Double longitude) {
|
|
||||||
return Const.buildingLatitudeRange.contains(latitude) && Const.buildingLongitudeRange.contains(longitude);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void BatteryOptimizationsExceptionCheck(Context context) {
|
|
||||||
if (shouldBatteryExclusionBeShown(getApplicationContext())) {
|
|
||||||
PrefUtils.setBatteryExlusionInfoStatus(getApplicationContext(), false);
|
|
||||||
|
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
|
||||||
builder.setTitle(R.string.batter_exclusions_title);
|
|
||||||
builder.setMessage(R.string.batter_exclusions_message)
|
|
||||||
.setPositiveButton(R.string.ok, (dialog, id) -> {
|
|
||||||
Intent intent = new Intent();
|
|
||||||
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
|
||||||
Uri uri = Uri.fromParts("package", getApplicationContext().getPackageName(), null);
|
|
||||||
intent.setData(uri);
|
|
||||||
context.startActivity(intent);
|
|
||||||
})
|
|
||||||
.setNegativeButton(R.string.cancel, (dialog, id) -> {
|
|
||||||
|
|
||||||
}).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Function for marker animation
|
|
||||||
public static class LatLngEvaluator implements TypeEvaluator<LatLng> {
|
|
||||||
// Method is used to interpolate the marker animation.
|
|
||||||
|
|
||||||
private LatLng latLng = new LatLng();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
|
|
||||||
latLng.setLatitude(startValue.getLatitude()
|
|
||||||
+ ((endValue.getLatitude() - startValue.getLatitude()) * fraction));
|
|
||||||
latLng.setLongitude(startValue.getLongitude()
|
|
||||||
+ ((endValue.getLongitude() - startValue.getLongitude()) * fraction));
|
|
||||||
return latLng;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -2,12 +2,8 @@ package com.uam.wmi.findmytutor.utils;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.preference.ListPreference;
|
|
||||||
import android.preference.PreferenceFragment;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
|
||||||
import com.uam.wmi.findmytutor.activity.SharingFragment;
|
|
||||||
import com.auth0.android.jwt.Claim;
|
import com.auth0.android.jwt.Claim;
|
||||||
import com.auth0.android.jwt.JWT;
|
import com.auth0.android.jwt.JWT;
|
||||||
|
|
||||||
@ -19,9 +15,10 @@ public class PrefUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static SharedPreferences getSharedPreferences(Context context) {
|
public static SharedPreferences getSharedPreferences(Context context) {
|
||||||
return context.getSharedPreferences("com.uam.wmi.findmytutor_preferences", Context.MODE_PRIVATE);
|
return context.getSharedPreferences("APP_PREF", Context.MODE_PRIVATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void getAllKeys(Context context){
|
public static void getAllKeys(Context context){
|
||||||
Map<String,?> keys = getSharedPreferences(context).getAll();
|
Map<String,?> keys = getSharedPreferences(context).getAll();
|
||||||
|
|
||||||
@ -56,29 +53,9 @@ public class PrefUtils {
|
|||||||
return getSharedPreferences(context).getString("USER_ID", null);
|
return getSharedPreferences(context).getString("USER_ID", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isStatusEnabled(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("key_status_enabled", false);
|
|
||||||
|
|
||||||
}
|
|
||||||
public static void enableStatus(Context context){
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("key_status_enabled", true);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
public static void disableStatus(Context context) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("key_status_enabled", false);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getUserStatus(Context context) {
|
public static String getUserStatus(Context context) {
|
||||||
return getSharedPreferences(context).getString("status_entry", "Dostępny");
|
return getSharedPreferences(context).getString("USER_STATUS", "Android");
|
||||||
}
|
|
||||||
|
|
||||||
public static void storeStatus(Context context, String status) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putString("status_entry", status);
|
|
||||||
editor.apply();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void storeIsTutor(Context applicationContext, boolean isTutor) {
|
public static void storeIsTutor(Context applicationContext, boolean isTutor) {
|
||||||
@ -102,27 +79,12 @@ public class PrefUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isEnableSharingLocalization(Context context) {
|
public static boolean isEnableSharingLocalization(Context context) {
|
||||||
return getSharedPreferences(context).getBoolean("key_sharing_enabled", false);
|
return getSharedPreferences(context).getBoolean("IS_ENABLE_SHARING_LOCALIZATION", false);
|
||||||
}
|
|
||||||
public static void disableSharing(Context context){
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("key_sharing_enabled", false);
|
|
||||||
editor.apply();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void storeEnableSharingLocalization(Context context,Boolean isChecked) {
|
public static void storeEnableSharingLocalization(Context context,Boolean isChecked) {
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
||||||
editor.putBoolean("key_sharing_enabled", isChecked);
|
editor.putBoolean("IS_ENABLE_SHARING_LOCALIZATION", isChecked);
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getLocationLevel(Context context) {
|
|
||||||
return getSharedPreferences(context).getString("location_mode", "exact");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void storeLocationMode(Context context, String mode) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putString("location_mode", mode);
|
|
||||||
editor.apply();
|
editor.apply();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,97 +121,8 @@ public class PrefUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getLocale(Context context) {
|
public static String getLocale(Context context) {
|
||||||
return getSharedPreferences(context).getString("LOCALE", LocaleUtils.getCurrentLocale());
|
return getSharedPreferences(context).getString("LOCALE", "pl");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Boolean isBackgroundLocationServiceRunning(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("BACKGROUND_SERVICE_STATUS", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void storeBackgroundLocationStatus(Context context, Boolean status) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("BACKGROUND_SERVICE_STATUS", status);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void putManualLocation(Context context, LatLng latLng, String approximatedLocation) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putString("key_location_level","3");
|
|
||||||
editor.putString("location_mode", "manual");
|
|
||||||
editor.putString("approx_manual_loc", approximatedLocation);
|
|
||||||
/*editor.putBoolean("key_sharing_enabled", true);*/
|
|
||||||
editor.putLong("longitude_manual_location", Double.doubleToRawLongBits(latLng.getLongitude()));
|
|
||||||
editor.putLong("latitude_manual_location", Double.doubleToRawLongBits(latLng.getLatitude()));
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LatLng getManualLocation(Context context) {
|
|
||||||
return new LatLng(
|
|
||||||
Double.longBitsToDouble(getSharedPreferences(context).getLong("latitude_manual_location", 0)),
|
|
||||||
Double.longBitsToDouble(getSharedPreferences(context).getLong("longitude_manual_location", 0))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getManualLocationApproximation(Context context) {
|
|
||||||
return getSharedPreferences(context).getString("approx_manual_loc", "unknown");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void putCurrentManualLocation(Context context,String manualId) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putString("current_manual_location", manualId);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getCurrentManualLocation(Context context) {
|
|
||||||
return getSharedPreferences(context).getString("current_manual_location", null);
|
|
||||||
}
|
|
||||||
public static void putCurrentManualLocationName(Context context, String locationName) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putString("current_manual_location_name", locationName);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
public static String getCurrentManualLocationName(Context context) {
|
|
||||||
return getSharedPreferences(context).getString("current_manual_location_name", null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void putShowOnlyOnlineUsers(Context context, Boolean flag) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("show_only_online_users_in_list", flag);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean getShowOnlyOnlineUsers(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("show_only_online_users_in_list", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void useBlacklist(Context context, Boolean flag) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("blacklisting", flag);
|
|
||||||
editor.putBoolean("whitelisting", false);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void useWhitelist(Context context, Boolean flag) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("whitelisting", flag);
|
|
||||||
editor.putBoolean("blacklisting", false);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean isBlackListing(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("blacklisting", false);
|
|
||||||
}
|
|
||||||
public static Boolean isWhiteListing(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("whitelisting", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean shouldBatteryExclusionBeShown(Context context) {
|
|
||||||
return getSharedPreferences(context).getBoolean("show_battery_exclusion", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setBatteryExlusionInfoStatus(Context context, Boolean flag) {
|
|
||||||
SharedPreferences.Editor editor = getSharedPreferences(context).edit();
|
|
||||||
editor.putBoolean("show_battery_exclusion", flag);
|
|
||||||
editor.apply();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -23,9 +23,8 @@ public class RestApiHelper extends Activity {
|
|||||||
JSONObject jsonObject = new JSONObject(responseBody.string());
|
JSONObject jsonObject = new JSONObject(responseBody.string());
|
||||||
return jsonObject.getString("message");
|
return jsonObject.getString("message");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return "Something went wrong!";
|
return e.getMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -35,8 +34,6 @@ public class RestApiHelper extends Activity {
|
|||||||
if (e instanceof HttpException) {
|
if (e instanceof HttpException) {
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
||||||
message = RestApiHelper.getErrorMessage(responseBody);
|
message = RestApiHelper.getErrorMessage(responseBody);
|
||||||
} else {
|
|
||||||
message ="Network Error !";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Snackbar snackbar = Snackbar.make(findViewById(R.id.activity_content), message, Snackbar.LENGTH_LONG);
|
Snackbar snackbar = Snackbar.make(findViewById(R.id.activity_content), message, Snackbar.LENGTH_LONG);
|
||||||
|
|||||||
@ -1,74 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.preference.Preference;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Button;
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
|
|
||||||
public class RightButtonPreference extends Preference {
|
|
||||||
|
|
||||||
private Button prefButton;
|
|
||||||
private String buttonText;
|
|
||||||
|
|
||||||
public RightButtonPreference(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
setWidgetLayoutResource(R.layout.preference_button_widget);
|
|
||||||
init(context, attrs);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void init(Context context, AttributeSet attrs){
|
|
||||||
for (int i=0;i<attrs.getAttributeCount();i++) {
|
|
||||||
String attr = attrs.getAttributeName(i);
|
|
||||||
try {
|
|
||||||
if(attr.equalsIgnoreCase("key")){
|
|
||||||
Log.e("BUTTON_ERR",attr);
|
|
||||||
String val = attrs.getAttributeValue(i);
|
|
||||||
|
|
||||||
switch (val) {
|
|
||||||
case "remove_manual_status":
|
|
||||||
buttonText = context.getResources().getString(R.string.preference_manual_location_button_remove);
|
|
||||||
break;
|
|
||||||
case "manual_location_button":
|
|
||||||
buttonText = context.getResources().getString(R.string.preference_manual_location_button);
|
|
||||||
break;
|
|
||||||
case "remove_manual_location":
|
|
||||||
buttonText = context.getResources().getString(R.string.preference_manual_location_button_remove);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
buttonText = "";
|
|
||||||
Log.e("BUTTON_ERR", String.valueOf(e));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void setText(String text){
|
|
||||||
prefButton.setText(text);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected View onCreateView(ViewGroup parent) {
|
|
||||||
return super.onCreateView(parent);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void onBindView(View view)
|
|
||||||
{
|
|
||||||
super.onBindView(view);
|
|
||||||
prefButton = view.findViewById(R.id.button_choose_from_map);
|
|
||||||
prefButton.setText(buttonText);
|
|
||||||
if(prefButton != null)
|
|
||||||
{
|
|
||||||
prefButton.setOnClickListener(view1 -> {
|
|
||||||
callChangeListener(null);
|
|
||||||
notifyChanged();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.support.v7.widget.SearchView;
|
|
||||||
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.subjects.PublishSubject;
|
|
||||||
|
|
||||||
public class RxSearchObservable {
|
|
||||||
|
|
||||||
private RxSearchObservable() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Observable<String> fromView(SearchView searchView) {
|
|
||||||
|
|
||||||
final PublishSubject<String> subject = PublishSubject.create();
|
|
||||||
|
|
||||||
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextSubmit(String s) {
|
|
||||||
subject.onNext(s);
|
|
||||||
searchView.clearFocus();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onQueryTextChange(String text) {
|
|
||||||
subject.onNext(text);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return subject;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.preference.Preference;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.view.Gravity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.PopupWindow;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.uam.wmi.findmytutor.R;
|
|
||||||
|
|
||||||
import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
|
|
||||||
|
|
||||||
public class SharingInfoPopupButtonPreference extends Preference {
|
|
||||||
|
|
||||||
public SharingInfoPopupButtonPreference(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
setWidgetLayoutResource(R.layout.preference_popup_info_button_widget);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected View onCreateView(ViewGroup parent) {
|
|
||||||
View view = super.onCreateView(parent);
|
|
||||||
// LayoutInflater li = (LayoutInflater)getContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE );
|
|
||||||
// View temp =li.inflate( R.layout.preference_button_widget, parent, false);
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected void onBindView(View view)
|
|
||||||
{
|
|
||||||
super.onBindView(view);
|
|
||||||
ImageButton button = view.findViewById(R.id.sharingTabInfoImageButton);
|
|
||||||
button.setOnClickListener(v-> {
|
|
||||||
InfoHelperUtils.infoPopUp(v,R.layout.info_popup_sharing_tab);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
public enum SharingLevel {
|
|
||||||
PRESENCE("presence"),
|
|
||||||
APPROXIMATED("approximated"),
|
|
||||||
EXACT("exact"),
|
|
||||||
PREDEFINED("predefined"),
|
|
||||||
MANUAL("manual");
|
|
||||||
|
|
||||||
private final String text;
|
|
||||||
|
|
||||||
SharingLevel(final String text) {
|
|
||||||
this.text = text;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.net.NetworkInfo;
|
|
||||||
import android.net.wifi.WifiInfo;
|
|
||||||
import android.net.wifi.WifiManager;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class WifiUtils {
|
|
||||||
|
|
||||||
public static String getWifiName(Context context) {
|
|
||||||
WifiManager manager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
|
|
||||||
if (Objects.requireNonNull(manager).isWifiEnabled()) {
|
|
||||||
WifiInfo wifiInfo = manager.getConnectionInfo();
|
|
||||||
if (wifiInfo != null) {
|
|
||||||
NetworkInfo.DetailedState state = WifiInfo.getDetailedStateOf(wifiInfo.getSupplicantState());
|
|
||||||
if (state == NetworkInfo.DetailedState.CONNECTED || state == NetworkInfo.DetailedState.OBTAINING_IPADDR) {
|
|
||||||
return wifiInfo.getSSID();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean checkIfUserIsInRangeOfWmiWifi(Context context) {
|
|
||||||
return Objects.equals(getWifiName(context), Const.WMI_SSID_NAME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
|
||||||
import android.support.v7.widget.RecyclerView;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
public class WrapContentLinearLayoutManager extends LinearLayoutManager {
|
|
||||||
public WrapContentLinearLayoutManager(Context context) {
|
|
||||||
super(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
|
|
||||||
try {
|
|
||||||
super.onLayoutChildren(recycler, state);
|
|
||||||
} catch (IndexOutOfBoundsException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 381 B |
Binary file not shown.
|
Before Width: | Height: | Size: 447 B |
Binary file not shown.
|
Before Width: | Height: | Size: 660 B |
Binary file not shown.
|
Before Width: | Height: | Size: 830 B |
Binary file not shown.
|
Before Width: | Height: | Size: 259 B |
Binary file not shown.
|
Before Width: | Height: | Size: 306 B |
Binary file not shown.
|
Before Width: | Height: | Size: 447 B |
Binary file not shown.
|
Before Width: | Height: | Size: 595 B |
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<solid android:color="@color/black_semi_transparent"/>
|
|
||||||
<padding
|
|
||||||
android:left="16dp"
|
|
||||||
android:top="4dp"
|
|
||||||
android:right="16dp"
|
|
||||||
android:bottom="4dp"/>
|
|
||||||
<corners
|
|
||||||
android:radius="2dp"/>
|
|
||||||
</shape>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 447 B |
Binary file not shown.
|
Before Width: | Height: | Size: 595 B |
Binary file not shown.
|
Before Width: | Height: | Size: 830 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 660 B |
Binary file not shown.
|
Before Width: | Height: | Size: 830 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 830 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<gradient android:angle="45"
|
|
||||||
android:startColor="@color/mapboxGrayFaint"
|
|
||||||
android:endColor="@color/mapboxGrayLight"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</shape>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB |
@ -1,4 +0,0 @@
|
|||||||
<vector android:height="24dp" android:viewportHeight="512"
|
|
||||||
android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M511.988,288.9c-0.478,17.43 -15.217,31.1 -32.653,31.1H424v16c0,21.864 -4.882,42.584 -13.6,61.145l60.228,60.228c12.496,12.497 12.496,32.758 0,45.255 -12.498,12.497 -32.759,12.496 -45.256,0l-54.736,-54.736C345.886,467.965 314.351,480 280,480V236c0,-6.627 -5.373,-12 -12,-12h-24c-6.627,0 -12,5.373 -12,12v244c-34.351,0 -65.886,-12.035 -90.636,-32.108l-54.736,54.736c-12.498,12.497 -32.759,12.496 -45.256,0 -12.496,-12.497 -12.496,-32.758 0,-45.255l60.228,-60.228C92.882,378.584 88,357.864 88,336v-16H32.666C15.23,320 0.491,306.33 0.013,288.9 -0.484,270.816 14.028,256 32,256h56v-58.745l-46.628,-46.628c-12.496,-12.497 -12.496,-32.758 0,-45.255 12.498,-12.497 32.758,-12.497 45.256,0L141.255,160h229.489l54.627,-54.627c12.498,-12.497 32.758,-12.497 45.256,0 12.496,12.497 12.496,32.758 0,45.255L424,197.255V256h56c17.972,0 32.484,14.816 31.988,32.9zM257,0c-61.856,0 -112,50.144 -112,112h224C369,50.144 318.856,0 257,0z"/>
|
|
||||||
</vector>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<solid android:color="@color/black_semi_transparent"/>
|
|
||||||
<padding
|
|
||||||
android:left="16dp"
|
|
||||||
android:top="4dp"
|
|
||||||
android:right="16dp"
|
|
||||||
android:bottom="4dp"/>
|
|
||||||
<corners
|
|
||||||
android:radius="2dp"/>
|
|
||||||
</shape>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
|
|
||||||
<path
|
|
||||||
android:pathData="M0 0h24v24H0z" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFFFFF"
|
|
||||||
android:pathData="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
</selector>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportHeight="24.0"
|
|
||||||
android:viewportWidth="24.0">
|
|
||||||
<path
|
|
||||||
android:fillColor="#FF000000"
|
|
||||||
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
</selector>
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:aapt="http://schemas.android.com/aapt"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportHeight="108"
|
|
||||||
android:viewportWidth="108">
|
|
||||||
<path
|
|
||||||
android:fillType="evenOdd"
|
|
||||||
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
|
|
||||||
android:strokeColor="#00000000"
|
|
||||||
android:strokeWidth="1">
|
|
||||||
<aapt:attr name="android:fillColor">
|
|
||||||
<gradient
|
|
||||||
android:endX="78.5885"
|
|
||||||
android:endY="90.9159"
|
|
||||||
android:startX="48.7653"
|
|
||||||
android:startY="61.0927"
|
|
||||||
android:type="linear">
|
|
||||||
<item
|
|
||||||
android:color="#44000000"
|
|
||||||
android:offset="0.0" />
|
|
||||||
<item
|
|
||||||
android:color="#00000000"
|
|
||||||
android:offset="1.0" />
|
|
||||||
</gradient>
|
|
||||||
</aapt:attr>
|
|
||||||
</path>
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFFFFF"
|
|
||||||
android:fillType="nonZero"
|
|
||||||
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
|
|
||||||
android:strokeColor="#00000000"
|
|
||||||
android:strokeWidth="1" />
|
|
||||||
</vector>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportHeight="24.0"
|
|
||||||
android:viewportWidth="24.0">
|
|
||||||
<path
|
|
||||||
android:fillColor="#FF000000"
|
|
||||||
android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportHeight="24.0"
|
|
||||||
android:viewportWidth="24.0">
|
|
||||||
<path
|
|
||||||
android:fillColor="#FF000000"
|
|
||||||
android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="#FF000000"
|
|
||||||
android:pathData="M9,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8 0,-0.29 0.02,-0.58 0.05,-0.86 2.36,-1.05 4.23,-2.98 5.21,-5.37C11.07,8.33 14.05,10 17.42,10c0.78,0 1.53,-0.09 2.25,-0.26 0.21,0.71 0.33,1.47 0.33,2.26 0,4.41 -3.59,8 -8,8z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<solid android:color="#ffffff"/>
|
|
||||||
<stroke android:width="3dp" android:color="#b1bcbe" />
|
|
||||||
<corners android:radius="10dp"/>
|
|
||||||
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
|
|
||||||
</shape>
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
<vector android:height="24dp" android:viewportHeight="61.7"
|
|
||||||
android:viewportWidth="61.34" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M52.65,41.79A25.13,25.13 0,0 1,45.36 46.96c-1.49,0.71 -29,8.51 -40.74,11.82 -1,0.27 -1.86,0.52 -2.58,0.73 0.18,-0.73 0.39,-1.61 0.66,-2.6C5.68,45.29 12.62,17.99 13.28,16.5a24.77,24.77 0,0 1,5 -7.31A25.57,25.57 0,0 1,52.02 6.72c0.35,0.27 0.7,0.56 1.05,0.86s0.61,0.65 0.9,1A24.48,24.48 0,0 1,52.65 41.79Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M43.05,45.73"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M21.13,27.35l1,1.75 3.54,-2 1.51,2.65 -3.54,2L25.81,35.6l-3.06,1.73 -6.24,-11 7,-4 1.56,2.74Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M24.36,20.54l1.41,2.49 2.88,-1.64 -1.41,-2.48ZM26.36,24.1L31.14,32.6 32.36,27.81l-3,-5.37Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M41.36,19.96 L44.36,25.14 41.36,26.8l-2.7,-4.78c-0.56,-1 -1.21,-1.27 -2,-0.85 -0.91,0.52 -1.07,1.45 -0.46,2.53l2.57,4.54L35.91,29.9l-4.81,-8.5 2,-1.16 0.9,0.65a4.07,4.07 0,0 1,2 -2.65C38.06,17.13 40.15,17.79 41.36,19.96Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M48.48,7.5l6.55,11.57L52.86,20.29l-0.63,-0.47a4.51,4.51 0,0 1,-2 2.37,5 5,0 0,1 -7,-2 5,5 0,0 1,1.89 -7,4.58 4.58,0 0,1 2.45,-0.61l-1.91,-3.38ZM49.91,16.35a2.19,2.19 0,1 0,-0.8 3A2.16,2.16 0,0 0,49.91 16.35Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M20.42,39.69l-3,1.7 4.69,8.28 -3,1.72L14.36,43.11l-3,1.7 -1.54,-2.73 9,-5.12Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M23.58,44.03l-2.75,-4.85 2.93,-1.66 2.67,4.72a1.43,1.43 0,0 0,2.07 0.71,1.41 1.41,0 0,0 0.45,-2.13l-2.67,-4.73 2.93,-1.65 2.74,4.84c1.35,2.38 0.55,4.88 -2,6.3S24.93,46.4 23.58,44.03Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M40.02,36.15l1.45,2.56 -2,1.14a3.21,3.21 0,0 1,-4.74 -1.33l-1.82,-3.2L31.36,36.2l-0.39,-0.68 1.51,-6.21 0.6,-0.34 1.41,2.48 2.13,-1.21 1.28,2.25 -2.06,1.17L37.36,36.37a1,1 0,0 0,1.54 0.41Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M39.91,33.95a5.15,5.15 0,0 1,2.2 -7.22,5.21 5.21,0 1,1 5.13,9.05A5.16,5.16 0,0 1,39.91 33.95ZM45.75,33.15a2.18,2.18 0,1 0,-2.91 -0.86,2 2,0 0,0 2.91,0.86Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M53.83,20.43 L55.36,23.11l-1.14,0.64a1.49,1.49 0,0 0,-0.6 2.37l2.45,4.33L53.13,32.1 48.36,23.6l2,-1.11 1,0.68a3.28,3.28 0,0 1,1.79 -2.31Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M17.17,35.42l0.94,1.67 -0.91,0.52L16.36,36.06c-0.16,-0.28 -0.34,-0.36 -0.53,-0.25s-0.28,0.39 -0.09,0.73l0.82,1.45 -0.89,0.51 -0.88,-1.56c-0.15,-0.26 -0.33,-0.35 -0.53,-0.24s-0.28,0.39 -0.09,0.72l0.82,1.46 -0.91,0.52 -1.51,-2.66 0.65,-0.36 0.29,0.21a1.14,1.14 0,0 1,0.57 -0.8,1 1,0 0,1 1,0 1.23,1.23 0,0 1,0.6 -0.86A1.11,1.11 0,0 1,17.17 35.42Z"/>
|
|
||||||
<path android:fillColor="#FF000000" android:pathData="M18.69,33.26l0.3,1.75 -1.39,-1.13 -1,0.56 2.47,1.82a0.61,0.61 0,0 1,0 0.48l0.47,0.84c0.48,-0.36 0.58,-0.84 0.49,-1.71l-0.31,-3.17Z"/>
|
|
||||||
</vector>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user