From baa8cac0e447994d89155466dccc3855a44e9ca9 Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Sat, 15 Dec 2018 17:35:20 +0100 Subject: [PATCH] working dutyhour adapter --- .idea/codeStyles/Project.xml | 56 +++++++------- .../wmi/findmytutor/activity/TutorTab.java | 52 ++++++++++--- .../adapters/DutyHoursAdapter.java | 17 +++-- .../uam/wmi/findmytutor/model/DutyHour.java | 3 + app/src/main/res/layout/content_tutor_tab.xml | 76 ++----------------- app/src/main/res/layout/duty_hour_row.xml | 51 +++++++------ app/src/main/res/values/strings.xml | 13 ++++ 7 files changed, 131 insertions(+), 137 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626..2715a34 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java index 4dd3397..f647bf3 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java @@ -2,16 +2,21 @@ package com.uam.wmi.findmytutor.activity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; import com.annimon.stream.Stream; import com.jakewharton.retrofit2.adapter.rxjava2.HttpException; import com.uam.wmi.findmytutor.R; +import com.uam.wmi.findmytutor.adapters.DutyHoursAdapter; +import com.uam.wmi.findmytutor.model.DutyHour; import com.uam.wmi.findmytutor.model.DutyHourViewModel; import com.uam.wmi.findmytutor.model.TutorTabViewModel; import com.uam.wmi.findmytutor.model.User; @@ -43,27 +48,35 @@ public class TutorTab extends AppCompatActivity { private TextView userEmail; private TextView department; private Button saveButon; + private List dutyHourList; + private RecyclerView dutyHoursRecycller; + private RecyclerView.Adapter dutyHoursAdapter; + private RecyclerView.LayoutManager dutyHoursLayoutManager; private TutorTabViewModel newTab; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - tutorTabService = ApiClient.getClient(getApplicationContext()) - .create(TutorTabApi.class); - userService = ApiClient.getClient(getApplicationContext()) - .create(UserService.class); setContentView(R.layout.content_tutor_tab); + TextView userName = findViewById(R.id.userName); - TextView userDutyHours = findViewById(R.id.userDutyHours); +// TextView userDutyHours = findViewById(R.id.userDutyHours); EditText userNote = findViewById(R.id.userNote); TextView userRoom = findViewById(R.id.userRoom); TextView userEmail = findViewById(R.id.userEmail); TextView department = findViewById(R.id.userDepartment); Button saveButon = findViewById(R.id.saveButon); - findViewById(R.id.contentTutorTabInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v,R.layout.info_popup_tutor_tab)); + dutyHoursRecycller = (RecyclerView) findViewById(R.id.dutyHourView); + dutyHoursLayoutManager = new LinearLayoutManager(this); + dutyHoursRecycller.setLayoutManager(dutyHoursLayoutManager); - userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext()))); + + + tutorTabService = ApiClient.getClient(getApplicationContext()) + .create(TutorTabApi.class); + userService = ApiClient.getClient(getApplicationContext()) + .create(UserService.class); disposable.add( tutorTabService.apiUsersTutorTabByTutorIdGet(PrefUtils.getUserId(getApplicationContext())) .subscribeOn(Schedulers.io()) @@ -71,12 +84,22 @@ public class TutorTab extends AppCompatActivity { .subscribeWith(new DisposableSingleObserver() { @Override public void onSuccess(TutorTabViewModel tutorTabViewModel) { + Log.d("dupa tab", tutorTabViewModel.toString()); - List dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours()) - .map(DutyHourViewModel::getSummary).toList(); + dutyHourList = tutorTabViewModel.getDutyHours(); + if(dutyHourList == null){ + Log.d("dupa godziny","null godziny"); + }else{ - userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom())); - userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab())); + dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList); + dutyHoursRecycller.setAdapter(dutyHoursAdapter); + Log.d("dupa godziny",dutyHourList.toString()); + } +// List dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours()) +// .map(DutyHourViewModel::getSummary).toList(); + + userRoom.setText(String.format("%s", tutorTabViewModel.getRoom())); + userEmail.setText(String.format("%s", tutorTabViewModel.getEmailTutorTab())); if (!tutorTabViewModel.getNote().equals("")) { userNote.setText(String.format("%s", tutorTabViewModel.getNote())); } @@ -89,6 +112,13 @@ public class TutorTab extends AppCompatActivity { showError(e); } })); + + + + findViewById(R.id.contentTutorTabInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v,R.layout.info_popup_tutor_tab)); + + userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext()))); + disposable.add( userService.getUserById(PrefUtils.getUserId(getApplicationContext())) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java index 2b7fe31..43725c2 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java @@ -9,6 +9,9 @@ import android.view.ViewGroup; import android.widget.TextView; import com.uam.wmi.findmytutor.R; import com.uam.wmi.findmytutor.model.DutyHour; +import com.uam.wmi.findmytutor.model.DutyHourViewModel; + +import java.util.ArrayList; import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; @@ -16,11 +19,11 @@ import butterknife.ButterKnife; public class DutyHoursAdapter extends RecyclerView.Adapter { private Context context; - private List hours; + private List hours; -public DutyHoursAdapter(Context context, List hours) { +public DutyHoursAdapter(Context context, List hours) { this.context = context; - this.hours = hours; + this.hours = new ArrayList(hours); } @NonNull @@ -34,7 +37,7 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) @Override public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { - DutyHour duty = hours.get(position); + DutyHourViewModel duty = hours.get(position); holder.dutyDay.setText(duty.getDay()); holder.dutyStart.setText(duty.getStart()); holder.dutyStop.setText(duty.getEnd()); @@ -48,13 +51,13 @@ public int getItemCount() { class MyViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.duty_day) + @BindView(R.id.duty_day_value) TextView dutyDay; - @BindView(R.id.duty_start) + @BindView(R.id.duty_start_value) TextView dutyStart; - @BindView(R.id.duty_stop) + @BindView(R.id.duty_stop_value) TextView dutyStop; MyViewHolder(View view) { diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java index 46cbdb3..3c17824 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java @@ -33,6 +33,9 @@ public class DutyHour extends BaseResponse { public DutyHour dutyHourId(UUID dutyHourId) { this.dutyHourId = dutyHourId; return this; + } + public DutyHour(){ + } /** diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml index 86479bb..4fea9d1 100644 --- a/app/src/main/res/layout/content_tutor_tab.xml +++ b/app/src/main/res/layout/content_tutor_tab.xml @@ -42,7 +42,7 @@ android:lineSpacingExtra="8sp" android:paddingTop="5dp" android:textColor="@color/note_list_text" - android:hint="hint" + android:hint="@string/hint_department" /> @@ -57,7 +57,7 @@ android:lineSpacingExtra="8sp" android:paddingTop="5dp" android:textColor="@color/note_list_text" - android:hint="hint" + android:hint="@string/hint_room" /> @@ -72,78 +72,16 @@ android:lineSpacingExtra="8sp" android:paddingTop="5dp" android:textColor="@color/note_list_text" - android:hint="hint" + android:hint="@string/hint_email" /> - - + android:layout_height="match_parent"/> - - - - - - - - - - - - - - - - - - - - + android:layout_height="100dp"> + android:layout_width="88dp" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:hint="@string/hint_duty_day"> @@ -29,14 +32,16 @@ android:id="@+id/duty_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="50dp" - android:layout_toEndOf="@+id/duty_day"> + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_marginStart="142dp" + android:hint="@string/hint_duty_start"> @@ -44,24 +49,26 @@ android:id="@+id/duty_stop" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="50dp" - android:layout_toEndOf="@+id/duty_start"> + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginEnd="75dp" + android:hint="@string/hint_duty_end"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d51b4a7..bb86d84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -297,4 +297,17 @@ - user is inactive (didn’t share any localization data since 7 days) + + + Day + Start + End + Department + Room + Email + + + + +