Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion app/src/main/java/madelyntav/c4q/nyc/chipchop/BuyActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
Expand Down Expand Up @@ -226,14 +228,24 @@ public void onClick(View view) {
new Toolbar(this), R.string.drawer_open,
R.string.drawer_close) {

final ImageView myImage = (ImageView)findViewById(R.id.profile_image);
public void onDrawerClosed(View view) {
//
myImage.setVisibility(View.INVISIBLE);
}

public void onDrawerOpened(View drawerView) {


myImage.setVisibility(View.VISIBLE);
final Animation myRotation = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.rotate);
myImage.startAnimation(myRotation);

sellButton = (Button) findViewById(R.id.sellButton);

Animation shake = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.shake);
drawerUserNameTV.startAnimation(shake);


new MaterialShowcaseView.Builder(BuyActivity.this)
.setTarget(sellButton)
.setMaskColour(R.drawable.showcase)
Expand Down Expand Up @@ -292,6 +304,9 @@ public void run() {

private void bindViews() {
drawerUserNameTV = (TextView) findViewById(R.id.drawer_user_nameTV);



frameLayout = (FrameLayout) findViewById(R.id.sellerFrameLayout);
DrawerLinear = (LinearLayout) findViewById(R.id.DrawerLinear);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
import android.content.IntentSender;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.location.Location;
import android.location.LocationManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -25,6 +23,9 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.Toast;

Expand Down Expand Up @@ -65,7 +66,7 @@
public class Fragment_Buyer_Map extends Fragment implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {

View coordinatorLayoutView;
FloatingActionButton refreshButton;
ImageButton refreshButton;
ImageView arrowImage;
public SlidingUpPanelLayout slidingPanel;
public final static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 9000;
Expand Down Expand Up @@ -121,6 +122,7 @@ private void setListeners() {
public void onClick(View view) {
// TODO: WRITE CODE TO REFRESH RECYCLERVIEW !!
activity.replaceFragment(new Fragment_Buyer_Map());

}
});

Expand Down Expand Up @@ -215,7 +217,11 @@ private void initializeMap() {
private void bindViews() {
arrowImage = (ImageView) root.findViewById(R.id.arrow_image);
itemsRView = (RecyclerView) root.findViewById(R.id.buyers_orders_list);
refreshButton = (FloatingActionButton) root.findViewById(R.id.refresh_button);
refreshButton = (ImageButton) root.findViewById(R.id.refresh_button);

final Animation myRotation = AnimationUtils.loadAnimation(getActivity(), R.anim.rotate);
refreshButton.startAnimation(myRotation);

coordinatorLayoutView = root.findViewById(R.id.snackbarPosition);
slidingPanel = (SlidingUpPanelLayout) root.findViewById(R.id.slidinglayout);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RatingBar;
Expand All @@ -38,7 +41,7 @@ public class Fragment_Buyer_SellerProfile extends Fragment {

public static final String TAG = "fragment_buyer_seller_profile";

android.support.design.widget.FloatingActionButton cartButton;
ImageButton cartButton;
private ArrayList<Item> foodItems;
private RecyclerView foodList;

Expand All @@ -47,7 +50,7 @@ public class Fragment_Buyer_SellerProfile extends Fragment {

View coordinatorLayoutView;
CircleImageView storeImage;
TextView storeName,storeDescription;
TextView storeName,storeDescription, cookingStatus;
TextView deliveryTV, pickupTV;
RatingBar ratingBar;

Expand Down Expand Up @@ -161,8 +164,10 @@ private void setListeners() {
cartButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

BuyActivity activity = (BuyActivity) getActivity();
activity.replaceFragment(new Fragment_Buyer_ViewCart());

}
});
}
Expand All @@ -178,10 +183,23 @@ private void bindViews(View root) {
containingView = (LinearLayout) root.findViewById(R.id.container);
containingView.setVisibility(View.INVISIBLE);

cartButton = (android.support.design.widget.FloatingActionButton) root.findViewById(R.id.viewCartButton);
cartButton = (ImageButton) root.findViewById(R.id.viewCartButton);
final Animation myRotation2 = AnimationUtils.loadAnimation(getActivity(), R.anim.rotate);
cartButton.startAnimation(myRotation2);

foodList = (RecyclerView) root.findViewById(R.id.seller_items_list);
storeImage = (CircleImageView) root.findViewById(R.id.profile_image);

//

cookingStatus =(TextView) root.findViewById(R.id.cooking_status);

Animation shake = AnimationUtils.loadAnimation(getActivity(), R.anim.shake);
cookingStatus.startAnimation(shake);


storeName = (TextView) root.findViewById(R.id.seller_name);

storeDescription = (TextView) root.findViewById(R.id.store_description);
coordinatorLayoutView = root.findViewById(R.id.snackbarPosition);
ratingBar = (RatingBar) root.findViewById(R.id.rating_bar);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageButton;

import java.util.ArrayList;

Expand All @@ -33,7 +36,7 @@ public class Fragment_Buyer_ViewCart extends Fragment {
public static final String TAG = "fragment_buyer_view_cart";
public static final String FROM_CART = "from_cart";

android.support.design.widget.FloatingActionButton checkoutButton;
ImageButton checkoutButton;
private ArrayList<Item> cartItems;
private RecyclerView cartList;
private DBHelper dbHelper;
Expand Down Expand Up @@ -98,10 +101,12 @@ private void setListAdapter() {
}

private void bindViews(View root) {
checkoutButton = (android.support.design.widget.FloatingActionButton) root.findViewById(R.id.checkoutButton);
checkoutButton = (ImageButton) root.findViewById(R.id.checkoutButton);
final Animation myRotation = AnimationUtils.loadAnimation(getActivity(), R.anim.rotate);
checkoutButton.startAnimation(myRotation);

cartList = (RecyclerView) root.findViewById(R.id.cart_list);
coordinatorLayoutView = root.findViewById(R.id.snackbarPosition);

}

private void initializeData() {
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/anim/anim_scale.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/linear_interpolator">
<scale
android:fromXScale="1.0"
android:toXScale="3.0"
android:fromYScale="1.0"
android:toYScale="3.0"
android:pivotX="50%"
android:pivotY="50%"
android:duration="500"
android:repeatCount="1"
android:repeatMode="reverse" />
</set>
3 changes: 3 additions & 0 deletions app/src/main/res/anim/cycle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:cycles="4" />
35 changes: 35 additions & 0 deletions app/src/main/res/anim/rotate
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/linear_interpolator">
<rotate
android:fromDegrees="0"
android:toDegrees="-360"
android:pivotX="50%"
android:pivotY="50%"
android:duration="800"
android:startOffset="0"
android:interpolator="@android:anim/linear_interpolator" />

<!--<rotate android:fromDegrees="30" android:toDegrees="0"-->
<!--android:pivotX="50%" android:pivotY="50%" android:repeatCount="4"-->
<!--android:repeatMode="reverse" android:duration="2000"-->
<!--android:interpolator="@android:anim/linear_interpolator" />-->

<!-- Left to right -->
<translate
android:fromXDelta="-100%p" android:toXDelta="0"

android:duration="800"
android:interpolator="@android:anim/linear_interpolator" />
<!--&lt;!&ndash; Up and down bob &ndash;&gt;-->
<translate android:fromXDelta="0" android:toXDelta="0"
android:fromYDelta="-50" android:toYDelta="0" android:repeatMode="reverse"
android:repeatCount="1" android:interpolator="@android:anim/linear_interpolator"
android:duration="800" />


<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:duration="800"/>
</set>
10 changes: 10 additions & 0 deletions app/src/main/res/anim/scale_fab_in.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<scale xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="500"
android:fromXScale="0"
android:fromYScale="0"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="1"
android:toYScale="1"
android:interpolator="@android:interpolator/overshoot"/>
10 changes: 10 additions & 0 deletions app/src/main/res/anim/scale_fab_out.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<scale xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="400"
android:fromXScale="1"
android:fromYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="0"
android:toYScale="0"
android:interpolator="@android:interpolator/overshoot"/>
9 changes: 9 additions & 0 deletions app/src/main/res/anim/shake.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="100"
android:fromDegrees="-5"
android:pivotX="50%"
android:pivotY="50%"
android:repeatCount="10"
android:repeatMode="reverse"
android:toDegrees="8" />
55 changes: 55 additions & 0 deletions app/src/main/res/drawable/roundedbutton.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false"> <layer-list>
<item android:right="5dp" android:top="5dp">
<shape>
<corners android:bottomRightRadius="30dp"
android:bottomLeftRadius="30dp"
android:topRightRadius="30dp"
android:topLeftRadius="30dp"
/>
<solid android:color="#D6D6D6" />
</shape>
</item>
<item android:bottom="2dp" android:left="2dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D42028" />
<corners android:bottomRightRadius="30dp"
android:bottomLeftRadius="30dp"
android:topRightRadius="30dp"
android:topLeftRadius="30dp"
/>

</shape>
</item>
</layer-list>
</item>

<item android:state_pressed="true"> <layer-list>
<item android:right="5dp" android:top="5dp">
<shape>
<corners android:bottomRightRadius="30dp"
android:bottomLeftRadius="30dp"
android:topRightRadius="30dp"
android:topLeftRadius="30dp"
/>
<solid android:color="#949494" />
</shape>
</item>
<item android:bottom="2dp" android:left="2dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D42028" />
<corners android:bottomRightRadius="30dp"
android:bottomLeftRadius="30dp"
android:topRightRadius="30dp"
android:topLeftRadius="30dp"
/>

</shape>
</item>
</layer-list>
</item>

</selector>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_buy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
android:padding="15dp"
android:layout_marginTop="25dp"
app:border_color="#FFF"
android:layout_gravity="center_horizontal"/>
android:layout_gravity="center_horizontal"
android:visibility="invisible"/>

<TextView
android:layout_width="match_parent"
Expand Down
30 changes: 24 additions & 6 deletions app/src/main/res/layout/fragment_buyer__view_cart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,34 @@
android:gravity="center_horizontal"
android:id="@+id/cart_text"/>

<android.support.design.widget.FloatingActionButton
<!--<android.support.design.widget.FloatingActionButton-->
<!--android:id="@+id/checkoutButton"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="end"-->
<!--android:layout_marginEnd="5dp"-->
<!--android:src="@drawable/checkout"-->
<!--app:backgroundTint="#D42028"-->
<!--app:elevation="6dp"-->
<!--app:pressedTranslationZ="12dp"/>-->

<ImageButton
android:id="@+id/checkoutButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="55dp"
android:layout_height="55dp"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_marginEnd="5dp"
android:src="@drawable/checkout"
app:backgroundTint="#D42028"
app:elevation="6dp"
app:pressedTranslationZ="12dp"/>
android:layout_marginRight="25dp"
android:padding="15dp"
android:background = "@drawable/roundedbutton"
android:layout_above="@+id/seller_items_list"
android:elevation="6dp"

/>

<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
Expand Down
Loading