Skip to content

Back buttons changed #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vpham30 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Back buttons changed #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9d73bd
Back buttons changed to floating action buttons.
vpham30 Nov 7, 2018
7d3db39
Merge remote-tracking branch 'origin/Victoria' into Victoria
vpham30 Nov 7, 2018
bd4a4b8
Update SearchActivity.java
vpham30 Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/java/edu/gatech/team83/donationtracker/controller/LocationRecyclerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void onBackPressed(View v) {
if (getIntent().hasExtra("Act") && getIntent().getStringExtra("Act").equals("SearchActivity")) {
Intent intent = new Intent(context, SearchActivity.class);
}
Intent intent = new Intent(context, WelcomeActivity.class);
Intent intent = new Intent(context, AppLandingActivity.class);
startActivity(intent);
}

Expand Down
19 changes: 10 additions & 9 deletions app/src/main/res/layout/inventory_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_alignParentBottom="true"
android:layout_marginTop="15dp"
android:layout_marginBottom="80dp"
app:layoutManager="LinearLayoutManager"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:context="cs2340.gatech.edu.lab3.controllers.CourseListActivity"
tools:listitem="@layout/inventory_list_item">

Expand All @@ -29,14 +29,15 @@
android:id="@+id/add_item_button"
android:onClick="onAddItemPressed"/>

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="25dp"
android:text="Back"
android:layout_marginStart="30dp"
<android.support.design.widget.FloatingActionButton
android:id="@+id/log_out_button"
android:onClick="onBackToInventoryPressed"/>
android:layout_width="124dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/add_item_button"
android:layout_alignParentStart="true"
android:layout_marginStart="34dp"
android:clickable="true"
android:onClick="onBackToInventoryPressed"
app:srcCompat="@android:drawable/ic_menu_revert" />

</RelativeLayout>
11 changes: 6 additions & 5 deletions app/src/main/res/layout/item_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
Expand Down Expand Up @@ -77,12 +78,12 @@
android:text="Delete Item"
android:onClick="onDeleteItemPressed" />

<Button

<android.support.design.widget.FloatingActionButton
android:id="@+id/item_back_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Back"
android:onClick="onBackItemPressed">

</Button>
android:clickable="true"
app:srcCompat="@android:drawable/ic_menu_revert"
android:onClick="onBackItemPressed"/>
</LinearLayout>
20 changes: 11 additions & 9 deletions app/src/main/res/layout/location_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
Expand Down Expand Up @@ -57,22 +58,23 @@
android:id="@+id/location_edit_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Edit Location"
android:onClick="onEditLocationPressed"/>
android:onClick="onEditLocationPressed"
android:text="Edit Location" />

<Button
android:id="@+id/inventory_view_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="View Inventory"
android:onClick="onViewInventoryPressed"/>
android:onClick="onViewInventoryPressed"
android:text="View Inventory" />

<Button
<android.support.design.widget.FloatingActionButton
android:id="@+id/location_back_button"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Back"
android:onClick="onBackPressed">
android:baselineAligned="false"
android:clickable="true"
android:onClick="onBackPressed"
app:srcCompat="@android:drawable/ic_menu_revert" />

</Button>
</LinearLayout>
16 changes: 9 additions & 7 deletions app/src/main/res/layout/location_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_alignParentBottom="true"
android:layout_marginTop="15dp"
android:layout_marginBottom="80dp"
app:layoutManager="LinearLayoutManager"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
tools:context="cs2340.gatech.edu.lab3.controllers.CourseListActivity"
tools:listitem="@layout/location_list_item">

Expand All @@ -29,14 +29,16 @@
android:id="@+id/add_location_button"
android:onClick="onAddLocationPressed"/>

<Button
android:id="@+id/log_out_button"

<android.support.design.widget.FloatingActionButton
android:id="@+id/floatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="25dp"
android:layout_marginStart="30dp"
android:layout_alignBottom="@+id/add_location_button"
android:layout_alignParentStart="true"
android:layout_marginStart="39dp"
android:clickable="true"
android:onClick="onBackPressed"
android:text="Back" />
app:srcCompat="@android:drawable/ic_menu_revert" />

</RelativeLayout>
27 changes: 16 additions & 11 deletions app/src/main/res/layout/search_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@
app:layout_constraintTop_toBottomOf="@+id/textView10"
app:layout_constraintVertical_bias="0.378" />

<Button
android:id="@+id/back_search_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:onClick="onBackSearchButton"
android:text="Back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<Button
android:id="@+id/search_loc_button"
android:layout_width="88dp"
Expand Down Expand Up @@ -138,4 +127,20 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.028"
app:layout_constraintStart_toStartOf="parent" />

<android.support.design.widget.FloatingActionButton
android:id="@+id/back_search_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:layout_marginEnd="328dp"
android:layout_marginStart="16dp"
android:layout_marginTop="90dp"
android:clickable="true"
android:onClick="onBackSearchButton"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editText"
app:srcCompat="@android:drawable/ic_menu_revert" />
</android.support.constraint.ConstraintLayout>