Skip to content

create order detail screen #47

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
joaopmaia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

create order detail screen #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
}


lintOptions{
lintOptions {
abortOnError false
}

Expand Down Expand Up @@ -56,7 +56,7 @@ dependencies {
implementation 'com.cielo.lio:order-manager:1.4.0'
// --------------------------------------------------------------------------- //

implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.1') {
implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.1') {
exclude group: 'com.android.support'
exclude module: 'appcompat-v7'
exclude module: 'support-v4'
Expand Down
21 changes: 11 additions & 10 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cielo.ordermanager.sdk">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

<application
android:name=".MyApplication"
Expand All @@ -13,6 +13,9 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".sample.DetailOrderActivity"
android:parentActivityName=".sample.ListOrdersActivity">
</activity>
<activity android:name=".sample.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -28,18 +31,16 @@
<activity android:name=".sample.ListOrdersActivity" />
<activity android:name=".sample.CancelPaymentActivity" />
<activity android:name=".sample.CancellationOrderList" />
<activity android:name=".sample.PrintSampleActivity"></activity>
<activity android:name=".sample.LocationSampleActivity"></activity>
<activity android:name=".sample.QrCodeActivity"></activity>
<activity android:name=".sample.PaymentActivity"></activity>
<activity android:name=".sample.PrintSampleActivity" />
<activity android:name=".sample.LocationSampleActivity" />
<activity android:name=".sample.QrCodeActivity" />
<activity android:name=".sample.PaymentActivity" />

<receiver android:name=".receiver.LIOCancelationBroadcastReceiver">
<intent-filter>
<action android:name="cielo.action.NOTIFY_TRANSACTION_CANCEL">
</action>
<action android:name="cielo.action.NOTIFY_TRANSACTION_CANCEL"></action>
</intent-filter>
</receiver>

</application>

</manifest>
9 changes: 9 additions & 0 deletions app/src/main/java/com/cielo/ordermanager/sdk/adapter/OrderRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

public class OrderRecyclerViewAdapter extends RecyclerView.Adapter<OrderRecyclerViewAdapter.OrderViewHolder> {
private List<Order> orderItemList;
public OnItemClickListener onItemClickListener;

static class OrderViewHolder extends RecyclerView.ViewHolder {
TextView title;
Expand Down Expand Up @@ -51,11 +52,19 @@ public void onBindViewHolder(OrderViewHolder holder, int position) {
if(order.getReleaseDate() != null)
holder.title.setText(order.getReleaseDate().toString());
holder.summary.setText(product + "R$ " +order.getPrice());

holder.itemView.setOnClickListener(view -> onItemClickListener.onItemClick(order));
}
}

@Override
public int getItemCount() {
return (null != orderItemList ? orderItemList.size() : 0);
}

public interface OnItemClickListener {
void onItemClick(Order order);
}
}


34 changes: 34 additions & 0 deletions app/src/main/java/com/cielo/ordermanager/sdk/sample/DetailOrderActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.cielo.ordermanager.sdk.sample;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
import android.widget.TextView;

import com.cielo.ordermanager.sdk.R;

import cielo.orders.domain.Order;

public class DetailOrderActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_detail_order);
getSupportActionBar().setTitle("Ordem Detalhada");
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Order order = (Order) getIntent().getSerializableExtra("order");
TextView idOrdem = findViewById(R.id.idOrdem);
TextView transactionValue = findViewById(R.id.transactionValue);
Button orderButton = findViewById(R.id.orderButton);

idOrdem.setText(order.getId());
transactionValue.setText("R$ " + String.valueOf(order.getPrice()));

orderButton.setOnClickListener(view -> {
finish();
});
}

}
14 changes: 11 additions & 3 deletions app/src/main/java/com/cielo/ordermanager/sdk/sample/ListOrdersActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cielo.ordermanager.sdk.sample;


import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -20,6 +21,8 @@
import com.cielo.ordermanager.sdk.R;

import com.cielo.ordermanager.sdk.adapter.OrderRecyclerViewAdapter;
import com.cielo.ordermanager.sdk.listener.RecyclerItemClickListener;

import cielo.orders.domain.Credentials;
import cielo.orders.domain.Order;
import cielo.orders.domain.ResultOrders;
Expand Down Expand Up @@ -68,7 +71,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
}

public void configSDK() {
Credentials credentials = new Credentials( "clientID", "accessToken");
Credentials credentials = new Credentials("clientID", "accessToken");
orderManager = new OrderManager(credentials, this);
orderManager.bind(this, new ServiceBindListener() {
@Override
Expand Down Expand Up @@ -100,8 +103,13 @@ private void listOrders() {

final List<Order> orderList = resultOrders.getResults();

recyclerView.setAdapter(
new OrderRecyclerViewAdapter(orderList));
OrderRecyclerViewAdapter orderRecyclerViewAdapter = new OrderRecyclerViewAdapter(orderList);
recyclerView.setAdapter(orderRecyclerViewAdapter);
orderRecyclerViewAdapter.onItemClickListener = order -> {
Intent intent = new Intent(this, DetailOrderActivity.class);
intent.putExtra("order", order);
startActivity(intent);
};

Log.i(TAG, "orders: " + orderList);
for (Order or : orderList) {
Expand Down
82 changes: 82 additions & 0 deletions app/src/main/res/layout/activity_detail_order.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/empty_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="16dp"
android:layout_marginTop="100dp"
android:layout_marginEnd="16dp"
android:gravity="center"
android:text="ID da Ordem"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/idOrdem"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:gravity="center_horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/empty_view"
tools:text="ID DA ORDEM" />

<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="16dp"
android:gravity="center_horizontal"
android:text="Valor da Transação"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/idOrdem" />

<TextView
android:id="@+id/transactionValue"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:gravity="center_horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
tools:text="R$ 100,00" />

<Button
android:id="@+id/orderButton"
style="@style/PrimaryActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="54dp"
android:layout_marginEnd="16dp"
android:text="Voltar"
android:textColor="#FFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/transactionValue" />


</android.support.constraint.ConstraintLayout>