From 844a3710b463c63364fe950eb3407bef38e5832d Mon Sep 17 00:00:00 2001 From: Umberto Furno Date: Thu, 2 Jan 2020 20:03:26 +0100 Subject: [PATCH] Update UI list view --- app/build.gradle | 2 + .../ding/ids/wedroid/app/MainActivity.kt | 1 + .../wedroid/app/view/BoardViewActivity.java | 24 ++++-- .../wedroid/app/view/WListsListActivity.java | 18 +++- .../app/view/adapter/WListsAdapter.java | 86 +++++++++---------- .../main/res/layout/activity_wlists_view.xml | 15 +++- .../res/layout/wlist_recyclerview_item.xml | 17 +++- 7 files changed, 104 insertions(+), 59 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0df9fce..6bdcee9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,6 +55,8 @@ dependencies { // UI implementation "com.google.android.material:material:$rootProject.materialVersion" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + //Card view + implementation 'androidx.cardview:cardview:1.0.0' // TESTING diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt index e5390c0..0c662bd 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt @@ -11,4 +11,5 @@ class MainActivity : AppCompatActivity() { setContentView(R.layout.activity_main) val service : BoardService? = null } + } diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java index 2eb4d6f..ee08fcf 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/BoardViewActivity.java @@ -30,7 +30,8 @@ import retrofit2.Response; public class BoardViewActivity extends AppCompatActivity { - String idBoard, username; + String idBoard, username, boardTitle; + int boardColor; TextView description, members, permission, creationDate, lastModificationDate; View divider1, divider2, divider3; ListView listView; @@ -65,11 +66,14 @@ public class BoardViewActivity extends AppCompatActivity { initializeUI(idBoard); + getListsButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Intent i = new Intent(getApplicationContext(), WListsListActivity.class); i.putExtra("idBoard", idBoard); + i.putExtra("barTitle", boardTitle); + i.putExtra("barColor", boardColor); startActivity(i); } }); @@ -86,9 +90,13 @@ public class BoardViewActivity extends AppCompatActivity { myToolbar.setBackgroundColor(Color.parseColor(encodeColor( board.getBackgroundColor().toString()))); + boardTitle = board.getTitle(); + + boardColor= Color.parseColor(encodeColor( + board.getBackgroundColor().toString())); + Drawable background = getListsButton.getBackground(); - background.setTint(Color.parseColor(encodeColor( - board.getBackgroundColor().toString()))); + background.setTint(boardColor); getListsButton.setBackgroundDrawable(background); description.setText(board.getDescription()); @@ -100,12 +108,10 @@ public class BoardViewActivity extends AppCompatActivity { creationDate.append("\n" + board.getCreatedAt()); lastModificationDate.append("\n" + board.getModifiedAt()); - divider1.setBackgroundColor(Color.parseColor(encodeColor( - board.getBackgroundColor().toString()))); - divider2.setBackgroundColor(Color.parseColor(encodeColor( - board.getBackgroundColor().toString()))); - divider3.setBackgroundColor(Color.parseColor(encodeColor( - board.getBackgroundColor().toString()))); + divider1.setBackgroundColor(boardColor); + divider2.setBackgroundColor(boardColor); + divider3.setBackgroundColor(boardColor); + ArrayList labelsTitle = new ArrayList<>(); for (int i=0; i>() { @Override diff --git a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java index 11dd361..ab6045f 100644 --- a/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java +++ b/app/src/main/java/it/unisannio/ding/ids/wedroid/app/view/adapter/WListsAdapter.java @@ -1,30 +1,47 @@ package it.unisannio.ding.ids.wedroid.app.view.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ListView; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; import java.util.List; import it.unisannio.ding.ids.wedroid.app.R; import it.unisannio.ding.ids.wedroid.app.data.entity.WList; +import it.unisannio.ding.ids.wedroid.app.util.ServicesFactory; +import it.unisannio.ding.ids.wedroid.app.util.SharedPreferenceHelper; +import it.unisannio.ding.ids.wedroid.wrapper.entity.Card; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; public class WListsAdapter extends RecyclerView.Adapter { private final LayoutInflater mInflater; private List mWLists; // Cached copy of words - public WListsAdapter(Context context) { mInflater = LayoutInflater.from(context); } + private Context mContext; + + public WListsAdapter(Context context){ + mInflater = LayoutInflater.from(context); + mContext=context; + } class WListViewHolder extends RecyclerView.ViewHolder{ private final TextView wListItemView; + ListView listView; private WListViewHolder(View itemView){ super(itemView); wListItemView= itemView.findViewById(R.id.wListTitle); + listView = itemView.findViewById(R.id.listViewCard); } } @@ -35,11 +52,33 @@ public class WListsAdapter extends RecyclerView.Adapter cardTitle = new ArrayList<>(); + SharedPreferenceHelper sp = new SharedPreferenceHelper(mContext); + ServicesFactory service = new ServicesFactory(sp); + service.getCardService().getAllCards(sp.getBoardId(), current.getId()).enqueue( + new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + for(int i=0; i adapter = new ArrayAdapter<>(mContext, + android.R.layout.simple_list_item_1, cardTitle); + holder.listView.setAdapter(adapter); + holder.wListItemView.setText(current.getTitle()); + } + @Override + public void onFailure(Call> call, Throwable t) { + } + }); + + /*position of the old content holder**/ + } else { // Covers the case of data not being ready yet. holder.wListItemView.setText("No wList"); @@ -57,43 +96,4 @@ public class WListsAdapter extends RecyclerView.Adapter wLists; - private Context context; - - public WListsAdapter(Context context, List wLists){ - this.wLists = wLists; - this.context = context; - } - - public class WListViewHolder extends RecyclerView.ViewHolder { - private TextView title; - public WListViewHolder(View itemView) { - super(itemView); - title = (TextView) itemView.findViewById(R.id.zWListTitle); - } - } - - @NonNull - @Override - public WListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View itemView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.z_wlist_recycle_item, parent, false); - return new WListViewHolder(itemView); - } - - @Override - public void onBindViewHolder(@NonNull WListViewHolder holder, int position) { - WList wList = wLists.get(position); - holder.title.setText(wList.getTitle()); - - } - - @Override - public int getItemCount() { - return 0; - } - **/ diff --git a/app/src/main/res/layout/activity_wlists_view.xml b/app/src/main/res/layout/activity_wlists_view.xml index a0480ed..264cbb4 100644 --- a/app/src/main/res/layout/activity_wlists_view.xml +++ b/app/src/main/res/layout/activity_wlists_view.xml @@ -6,15 +6,28 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + \ No newline at end of file diff --git a/app/src/main/res/layout/wlist_recyclerview_item.xml b/app/src/main/res/layout/wlist_recyclerview_item.xml index 607cf71..e4b05b3 100644 --- a/app/src/main/res/layout/wlist_recyclerview_item.xml +++ b/app/src/main/res/layout/wlist_recyclerview_item.xml @@ -1,12 +1,23 @@ + android:layout_height="match_parent" + android:background="#BBDEFB" + android:orientation="horizontal" + android:textAlignment="center" + android:textSize="24sp" + android:textStyle="bold" /> + + + \ No newline at end of file