From 41c5fb01f470ddaf65163f00399c52571ebef108 Mon Sep 17 00:00:00 2001 From: Pasha Shkaran Date: Tue, 14 Nov 2017 16:10:10 +0200 Subject: [PATCH 01/11] local test changes --- .../mvp/presenters/MyProfilePresenter.java | 2 +- .../ui/adapters/MyProfileAdapter.java | 2 +- .../MyProfileScheduledMessageVH.java | 2 +- .../chats/ScheduledMessagesFragment.java | 3 +- .../fragments/profile/MyProfileFragment.java | 7 ++++ .../communicator/ui/views/ICalendarView.java | 36 +++++++++++++++++++ .../main/res/layout/fragment_my_profile.xml | 7 ++++ .../layout/fragment_scheduled_messages.xml | 11 ++++++ app/src/main/res/layout/view_calendar.xml | 12 +++++++ app/src/main/res/values/styles.xml | 9 +++++ 10 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/nynja/mobile/communicator/ui/views/ICalendarView.java create mode 100644 app/src/main/res/layout/fragment_scheduled_messages.xml create mode 100644 app/src/main/res/layout/view_calendar.xml diff --git a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/MyProfilePresenter.java b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/MyProfilePresenter.java index 49568e6867..40f198ecfc 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/MyProfilePresenter.java +++ b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/MyProfilePresenter.java @@ -228,7 +228,7 @@ public class MyProfilePresenter extends BasePresenter { mRouter.replaceScreen(StarredMessagesFragment.class.getSimpleName()); } - private void openScheduledMessages() { + public void openScheduledMessages() { mRouter.replaceScreen(ScheduledMessagesFragment.class.getSimpleName()); } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/MyProfileAdapter.java b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/MyProfileAdapter.java index 8016eaf6ca..33614ba9a9 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/MyProfileAdapter.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/MyProfileAdapter.java @@ -70,7 +70,7 @@ public class MyProfileAdapter extends BaseAdapter> { case CONTACT_REQUEST_TAG: return new MyProfileContactMessageVH(parent, mListener); case SCHEDULED_MESSAGES_TAG: - return new MyProfileScheduledMessageVH(parent); + return new MyProfileScheduledMessageVH(parent, mListener); } return null; } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/MyProfileScheduledMessageVH.java b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/MyProfileScheduledMessageVH.java index 6bd5d8d5a5..63b3444ac2 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/MyProfileScheduledMessageVH.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/adapters/viewholders/MyProfileScheduledMessageVH.java @@ -36,7 +36,7 @@ public class MyProfileScheduledMessageVH extends BaseMyProfileVH { @Override public void setData(VHModel item) { itemView.setOnClickListener(v -> { if (mListener != null) { - mListener.onItemClick(item, -1); + mListener.onItemClick(item, getAdapterPosition()); } }); } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/chats/ScheduledMessagesFragment.java b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/chats/ScheduledMessagesFragment.java index 26dd00a238..efdd38a2bd 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/chats/ScheduledMessagesFragment.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/chats/ScheduledMessagesFragment.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.nynja.mobile.communicator.R; import com.nynja.mobile.communicator.ui.base.BaseFragment; /** @@ -22,6 +23,6 @@ public class ScheduledMessagesFragment extends BaseFragment { } @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return super.onCreateView(inflater, container, savedInstanceState); + return inflater.inflate(R.layout.fragment_scheduled_messages, container, false); } } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/profile/MyProfileFragment.java b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/profile/MyProfileFragment.java index ed55b78209..29b4ca95ca 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/profile/MyProfileFragment.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/profile/MyProfileFragment.java @@ -16,6 +16,7 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import com.arellomobile.mvp.presenter.InjectPresenter; import com.nynja.mobile.communicator.BuildConfig; @@ -47,6 +48,7 @@ import java.util.ArrayList; import java.util.List; import butterknife.BindView; +import butterknife.OnClick; /** * Created by dmitro.boiko on 27/06/2017. @@ -259,4 +261,9 @@ public class MyProfileFragment extends BaseFragment implements MyProfileView, @Override public void onBalanceClick() { mPresenter.clickProfileBalance(); } + + @OnClick(R.id.scheduled_massages) + public void onScheduledMessages() { + mPresenter.openScheduledMessages(); + } } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/views/ICalendarView.java b/app/src/main/java/com/nynja/mobile/communicator/ui/views/ICalendarView.java new file mode 100644 index 0000000000..e13dcb2ca5 --- /dev/null +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/views/ICalendarView.java @@ -0,0 +1,36 @@ +package com.nynja.mobile.communicator.ui.views; + +import android.content.Context; +import android.os.Build; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; +import android.util.AttributeSet; +import android.widget.CalendarView; +import android.widget.LinearLayout; + +/** + * Created by pavel on 11/14/17. + */ + +public class ICalendarView extends LinearLayout { + + public ICalendarView(@NonNull Context context) { + super(context); + } + + public ICalendarView(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public ICalendarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + public ICalendarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + +} diff --git a/app/src/main/res/layout/fragment_my_profile.xml b/app/src/main/res/layout/fragment_my_profile.xml index 346a9a08cf..ea0ffcc160 100644 --- a/app/src/main/res/layout/fragment_my_profile.xml +++ b/app/src/main/res/layout/fragment_my_profile.xml @@ -11,6 +11,13 @@ android:clipToPadding="false" android:paddingBottom="@dimen/circle.button.size"/> +