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

Merge branch 'develop' into add-slider

Browse Source
This commit is contained in:
Mieszko Wrzeszczyński 2019-01-03 23:02:18 +01:00
commit 7d1460353d
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
View File

@ -248,11 +248,8 @@ public class BlackList extends AppCompatActivity {
} else { } else {
message = "Network Error !"; message = "Network Error !";
} }
Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
Toast.makeText(this, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(getWindow().getDecorView().getRootView(), message, Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
} }
private void toggleEmptyNotes() { private void toggleEmptyNotes() {

4
app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
View File

@ -235,9 +235,7 @@ public class WhiteList extends AppCompatActivity {
} else { } else {
message = "Network Error !"; message = "Network Error !";
} }
Toast.makeText(this, message, Snackbar.LENGTH_LONG).show();
Snackbar.make(getWindow().getDecorView().getRootView(), message, Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
} }
private void toggleEmptyNotes() { private void toggleEmptyNotes() {

13
app/src/main/res/drawable/ic_add_person.xml Normal file
View File

@ -0,0 +1,13 @@
<?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>

2
app/src/main/res/layout/activity_black_list.xml
View File

@ -73,7 +73,7 @@
android:layout_marginTop="-322dp" android:layout_marginTop="-322dp"
app:layout_anchor="@id/app_bar" app:layout_anchor="@id/app_bar"
app:layout_anchorGravity="bottom|end" app:layout_anchorGravity="bottom|end"
app:srcCompat="@android:drawable/ic_input_add" app:srcCompat="@drawable/ic_add_person"
app:useCompatPadding="true" app:useCompatPadding="true"
tools:srcCompat="@tools:sample/backgrounds/scenic" /> tools:srcCompat="@tools:sample/backgrounds/scenic" />

2
app/src/main/res/layout/activity_white_list.xml
View File

@ -73,7 +73,7 @@
android:layout_marginTop="-322dp" android:layout_marginTop="-322dp"
app:layout_anchor="@id/app_bar" app:layout_anchor="@id/app_bar"
app:layout_anchorGravity="bottom|end" app:layout_anchorGravity="bottom|end"
app:srcCompat="@android:drawable/ic_input_add" app:srcCompat="@drawable/ic_add_person"
app:useCompatPadding="true" app:useCompatPadding="true"
tools:srcCompat="@tools:sample/backgrounds/scenic" /> tools:srcCompat="@tools:sample/backgrounds/scenic" />