s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge branch 'userListEnchancment' of https://git.wmi.amu.edu.pl/s416084/find-my-tutor-android into userListEnchancment

Browse Source
This commit is contained in:
Domagalski 2019-01-11 22:26:54 +01:00
commit 01bfbbfc0c
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -10,7 +10,7 @@ android {
applicationId "com.uam.wmi.findmytutor" applicationId "com.uam.wmi.findmytutor"
minSdkVersion 22 minSdkVersion 22
targetSdkVersion 27 targetSdkVersion 27
versionCode 54 versionCode 55
versionName "1.0.0" versionName "1.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true

5
app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
View File

@ -57,10 +57,7 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
String ts = tutorsTimeStamps.get(tutor.getId()); String ts = tutorsTimeStamps.get(tutor.getId());
if (ts != null){ if (ts != null){
Toast.makeText(context,"eeeeeee",Toast.LENGTH_SHORT); holder.lastSeen.setText(String.format("%s: %s", context.getString(R.string.last_seen), ts));
holder.lastSeen.setText(String.format("%s: %s", context.getResources().getString(R.string.last_seen), ts));
} else {
holder.lastSeen.setText(String.format("%s: %s", context.getResources().getString(R.string.last_seen), "unknwon"));
} }
} }

4
app/src/main/java/com/uam/wmi/findmytutor/utils/Const.java
View File

@ -17,8 +17,8 @@ public class Const {
public final static String presenceApproximatedName = "Unknown"; public final static String presenceApproximatedName = "Unknown";
public final static Range<Double> buildingLatitudeRange = Range.create(52.466092, 52.467529); 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> buildingLongitudeRange = Range.create(16.926159, 16.927759);
public final static Range<Double> outsideLatitudeRange = Range.create(52.463512, 52.468837); public final static Range<Double> outsideLatitudeRange = Range.create(52.4651, 52.468837);
public final static Range<Double> outsideLongitudeRange = Range.create(16.922372, 16.936004); 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 List<String> validApproximatedLocations = Arrays.asList("Skrzydło B", "Skrzydło A", "Aule", "Łącznik", "Biblioteka", "Hol", "Unknown");
} }

6
app/src/main/res/layout/activity_login.xml
View File

@ -58,9 +58,13 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
app:passwordToggleEnabled="true"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<EditText
<android.support.design.widget.TextInputEditText
android:id="@+id/password" android:id="@+id/password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"