sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +20
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79e24621e2 - Show all commits

14
app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
View File

@@ -10,12 +10,21 @@ import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import com.a1.nextlocation.data.Coupon;
import com.a1.nextlocation.recyclerview.CouponAdapter;
import com.a1.nextlocation.recyclerview.CouponListManager;
import java.util.List;
public class StatisticFragment extends Fragment { public class StatisticFragment extends Fragment {
private List<Coupon> couponList;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -25,6 +34,11 @@ public class StatisticFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_statistic, container, false); View view = inflater.inflate(R.layout.fragment_statistic, container, false);
this.couponList = CouponListManager.INSTANCE.getCouponList();
CouponAdapter adapter = new CouponAdapter(this.getContext(), this.couponList);
TextView couponNumber = view.findViewById(R.id.couponAmount);
couponNumber.setText(String.valueOf(adapter.getItemCount()));
ConstraintLayout constraintLayout = view.findViewById(R.id.Box4); ConstraintLayout constraintLayout = view.findViewById(R.id.Box4);
constraintLayout.setOnClickListener(v -> { constraintLayout.setOnClickListener(v -> {

5
app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
View File

@@ -53,6 +53,11 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
} }
public CouponAdapter(Context context, List<Coupon> coupon) {
this.appContext = context;
this.couponList = coupon;
}
@NonNull @NonNull
@Override @Override
public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

1
app/src/main/res/layout/fragment_statistic.xml
View File

@@ -211,6 +211,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/couponAmount"
android:text="GETAL" android:text="GETAL"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" android:textSize="20sp"