Skip to content

Commit 4572b9a

Browse files
committed
updated listview layout for all habits
1 parent 16305d4 commit 4572b9a

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

app/src/main/java/com/cmput301f17t11/cupofjava/Views/AllHabitViewActivity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
7575
Log.i("AllHabitViewActivity: Username received: ", userName);
7676
}
7777

78-
79-
80-
8178
//set up TextView and ListView
8279
this.textView = (TextView) view.findViewById(R.id.allHabitHeadingTextView);
8380
this.listView = (ListView) view.findViewById(R.id.allHabitListView);
@@ -142,10 +139,9 @@ private void updateTextView(int habitCount){
142139
* @see Habit
143140
*/
144141
private void updateListView(ArrayList<Habit> habits){
145-
ArrayAdapter<Habit> arrayAdapter = new ArrayAdapter<>(getActivity(),
146-
R.layout.string_only_list_item, habits);
142+
todayViewAdapter adapter = new todayViewAdapter(getActivity(), habits);
147143
synchronized (listView){
148-
this.listView.setAdapter(arrayAdapter);
144+
this.listView.setAdapter(adapter);
149145
this.listView.notify();
150146
}
151147

app/src/main/java/com/cmput301f17t11/cupofjava/Views/TodayViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
8484
HabitDetailViewActivity.class);
8585
Bundle bundle = new Bundle();
8686
bundle.putString("userName", userName);
87-
bundle.putSerializable("habitClicked", habits); //sending today's habitlist
87+
bundle.putSerializable("habitClicked", habits);
8888
bundle.putInt("habitIndex", position);
8989
intent5.putExtras(bundle);
9090

app/src/main/res/layout/habit_list_item.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_marginLeft="60dp"
1212
android:layout_width="30dp"
1313
android:layout_height="30dp"
14-
android:background="@drawable/ic_addlocation"
14+
android:background="@drawable/ic_launcher"
1515
/>
1616

1717
<TextView

0 commit comments

Comments
 (0)