diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 065fdfe..0000000
Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/app/build.gradle b/app/build.gradle
index b82179e..f739be0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,5 +36,5 @@ dependencies {
implementation "io.swagger:swagger-annotations:1.5.15"
implementation "org.threeten:threetenbp:1.3.5"
implementation "com.squareup.okhttp3:logging-interceptor:3.10.0"
-
+ implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.4.0'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da59066..0192f05 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,9 @@
+
+
+
loginResponse = service.fakeValidate(user).execute();
+ Log.e("Login", "jwt token: " + loginResponse.body());
if (loginResponse.isSuccessful()) {
String authToken = loginResponse.body().getToken();
Log.e("Login", "jwt token: " + authToken);
@@ -335,12 +337,14 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
return true;
}
- } catch (IOException e) {
- Log.d("login failure",e.toString());
- Log.e("Login error", e.toString());
+ } catch (Exception e) {
+ Log.e("Login error", "nie udalo sie kurde...");
return false;
}
+
+
+
//To jest async i nie da sie zwrocic :(
// Call call = service.fakeValidate(user);
//
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java
index 1032282..8558086 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java
@@ -7,6 +7,8 @@ import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.widget.Toast;
+import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.maps.MapView;
import com.uam.wmi.findmytutor.R;
import com.uam.wmi.findmytutor.model.Coordinate;
import com.uam.wmi.findmytutor.network.RetrofitClientInstance;
@@ -20,33 +22,120 @@ import retrofit2.Response;
public class MainActivity extends AppCompatActivity {
+ private MapView mapView;
+
+ public List getCoordinates() {
+ return this.coordinates;
+ }
+
+ public void setCoordinates(List coordinates) {
+ this.coordinates = coordinates;
+ }
+
+ public List coordinates;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ Mapbox.getInstance(this, getString(R.string.access_token));
+ setContentView(R.layout.activity_main);
+ mapView = (MapView) findViewById(R.id.mapView);
+ mapView.onCreate(savedInstanceState);
+
+
setContentView(R.layout.activity_main);
SharedPreferences sharedPref = getSharedPreferences("fmtPrefs", Context.MODE_PRIVATE);
final String authToken = sharedPref.getString("authToken",null);
Coordinates service = RetrofitClientInstance.createService(Coordinates.class,authToken);
- Call> call = service.getTopCoordinates();
+ Call> call = service.getOnlineCoordinates();
call.enqueue(new Callback>() {
@Override
public void onResponse(Call> call, Response> response) {
Log.e("MainActivity", "rsp: " + response.body());
+
+ setCoordinates(response.body());
+
+
+ /* mapView.getMapAsync(new OnMapReadyCallback() {
+ @Override
+ public void onMapReady(MapboxMap mapboxMap,List response) {
+
+ // Add the custom icon marker to the map
+ for(Coordinate coord: response.body()){
+ mapboxMap.addMarker(new MarkerOptions()
+ .position(new LatLng(coord.getLatitude(), coord.getLongitude()))
+
+ }
+
+ }
+ });*/
}
@Override
public void onFailure(Call> call, Throwable t) {
Toast.makeText(MainActivity.this, "Something went wrong...Error message: " + t.getMessage(), Toast.LENGTH_SHORT).show();
}
+
+
+
+
});
+
+
}
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ mapView.onStart();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mapView.onResume();
+
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mapView.onPause();
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ mapView.onStop();
+ }
+
+ @Override
+ public void onLowMemory() {
+ super.onLowMemory();
+ mapView.onLowMemory();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ mapView.onDestroy();
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ mapView.onSaveInstanceState(outState);
+ }
+
+
}
+
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/LdapUser.java b/app/src/main/java/com/uam/wmi/findmytutor/model/LdapUser.java
index 4704389..22a640b 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/model/LdapUser.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/model/LdapUser.java
@@ -33,7 +33,14 @@ public class LdapUser {
@SerializedName("email")
private String email = null;
- public LdapUser(String string, String mPassword, String string1, String pracownik, String string2, String string3, String mEmail) {
+ public LdapUser(String login, String password, String department, String title, String firstName, String lastName, String email) {
+ this.login = login;
+ this.password = password;
+ this.department = department;
+ this.title = title;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.email = email;
}
public LdapUser login(String login) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7fcef54..cbad62f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,6 +2,7 @@
@@ -23,10 +24,13 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3730eb0..5da9a7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,4 +17,5 @@
completions."
MainActivity
+ pk.eyJ1IjoiZG9tYWdhbHNreSIsImEiOiJjamd4am4zazYwNXo1MzBxeDZtYjA4d2s4In0.KzNdhc9V_-SYe14AZ-q3Ew