Prechádzať zdrojové kódy

[알림]New] 알림 페이지 구현 중

Hasemi 7 rokov pred
rodič
commit
8b34491e3f

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenID.java

@@ -53,6 +53,7 @@ public class ScreenID {
   public static final int THIRD_CATEGORY = 33;
   public static final int FOURTH_CATEGORY = 34;
   public static final int FIFTH_CATEGORY = 35;
+  public static final int ALARM = 36;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -60,7 +61,7 @@ public class ScreenID {
     SIGN_UP_START, SIGN_UP_MOBILE_AUTHORIZATION, SIGN_UP_ALREADY_MEMBER, SIGN_UP_NEED_FOR_30DAYS, SIGN_UP_PIN, SIGN_UP_AGREE,
     SIGN_UP_COMPLETED, SIGN_UP_UNDER_14_YEARS, REST_MEMBER_START, REST_MEMBER_ACTIVE_COMPLETED, MEMBER_BLOCK, SIGN_UP_FROM_ON_BOARDING,
     BUCKET, MY_COIN, ALL_MENU, MY_BUCKET, ADD_MY_BUCKET, FAQ_WRITE ,BUCKET_HASH_TAG , FIRST_CATEGORY, SECOND_CATEGORY ,THIRD_CATEGORY,
-    FOURTH_CATEGORY, FIFTH_CATEGORY
+    FOURTH_CATEGORY, FIFTH_CATEGORY, ALARM
 
   })
   public @interface FragmentID {}

+ 66 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmFragment.java

@@ -0,0 +1,66 @@
+package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
+import kr.co.zumo.app.lifeplus.manager.ActionButtonManager;
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
+import kr.co.zumo.app.lifeplus.view.presenter.AlarmPresenter;
+
+/**
+ * AlarmFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-24]   [최초 작성]
+ * @since 2018-10-24
+ */
+public class AlarmFragment extends FragmentBase<AlarmPresenter> {
+  private TabLayout tabLayoutAlarm;
+  private ViewPager viewPagerAlarm;
+
+  @Override
+  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.fragment_alarm, container, false);
+  }
+
+  @Override
+  protected void onAfterActivityCreated(Bundle savedInstanceState) {
+    tabLayoutAlarm = findViewById(R.id.alarm_tab_layout);
+    viewPagerAlarm = findViewById(R.id.alarm_view_pager);
+    tabLayoutAlarm.setTabGravity(TabLayout.GRAVITY_FILL);
+  }
+
+  @Override
+  protected void defineActionBar() {
+    ActionBarManager.getInstance().begin().title(R.string.alarm)
+      .menu(actionBar -> presenter.onClickMenu(actionBar))
+      .search(actionBar -> presenter.onClickSearch(actionBar))
+      .back(actionBar -> presenter.onClickBack(actionBar))
+      .show();
+  }
+
+  @Override
+  protected void defineActionButton() {
+    ActionButtonManager.getInstance().begin().trash(floatingActionButton -> {
+      presenter.onEvent(new Event.Builder(Event.CLICK).build());
+    }).show();
+  }
+
+  @Override
+  protected AlarmPresenter definePresenter() {
+    return new AlarmPresenter(getModel(BlankModel.class), this);
+  }
+}

+ 29 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmListFragment.java

@@ -0,0 +1,29 @@
+package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * AlarmListFragment
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-24]   [최초 작성]
+ * @since 2018-10-24
+ */
+public class AlarmListFragment extends Fragment {
+
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return super.onCreateView(inflater, container, savedInstanceState);
+  }
+}

+ 41 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmPagerAdapter.java

@@ -0,0 +1,41 @@
+package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+/**
+ * AlarmPagerAdapter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-24]   [최초 작성]
+ * @since 2018-10-24
+ */
+public class AlarmPagerAdapter extends FragmentStatePagerAdapter {
+
+  private static final int PAGE_COUNT = 3;
+
+
+  public AlarmPagerAdapter(FragmentManager fm) {
+    super(fm);
+  }
+
+  @Override
+  public Fragment getItem(int position) {
+    return null;
+  }
+
+  @Override
+  public int getCount() {
+    return PAGE_COUNT;
+  }
+
+  @Override
+  public int getItemPosition(@NonNull Object object) {
+    return POSITION_NONE;
+  }
+}

+ 13 - 9
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/BasicFragmentFactory.java

@@ -6,24 +6,25 @@ package kr.co.zumo.app.lifeplus.view.fragment.factory;
 import android.support.v4.app.Fragment;
 
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.fragment.main.category.FifthCategoryMainFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.main.category.FirstCategoryMainFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.main.category.FourthCategoryMainFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.main.category.SecondCategoryMainFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.main.category.ThirdCategoryMainFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.AddMyBucketListFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.BucketListFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.MyBucketListFragment;
-import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.MyBucketListRelatedTagFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.alarm.AlarmFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.error.NetworkErrorFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.faq.FAQFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.faq.FAQWriteFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.info.PermissionInfoFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.main.MainFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.FifthCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.FirstCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.FourthCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.SecondCategoryMainFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.ThirdCategoryMainFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberBlockFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberRestActiveCompletedFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.member.MemberRestStartFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.menu.AllMenuFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.AddMyBucketListFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.BucketListFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.MyBucketListFragment;
+import kr.co.zumo.app.lifeplus.view.fragment.my.bucketlist.MyBucketListRelatedTagFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.my.coin.MyCoinFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.pin.PinConfirmFragment;
@@ -154,6 +155,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.FIFTH_CATEGORY:
         fragment = new FifthCategoryMainFragment();
         break;
+      case ScreenID.ALARM:
+        fragment = new AlarmFragment();
+        break;
       default:
         break;
     }

+ 66 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/AlarmPresenter.java

@@ -0,0 +1,66 @@
+package kr.co.zumo.app.lifeplus.view.presenter;
+
+import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
+
+/**
+ * AlarmPersenter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-24]   [최초 작성]
+ * @since 2018-10-24
+ */
+public class AlarmPresenter extends Presenter<BlankModel, IView> {
+
+
+  public AlarmPresenter(BlankModel model, IView view) {
+    super(model, view);
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  @Override
+  public boolean onBackPressed() {
+    onCommand(new FragmentBackStackChangeCommand(ScreenID.MAIN, ScreenID.DIRECTION_BACK));
+    return true;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+
+  }
+
+  @Override
+  public void onResult(Event event) {
+
+  }
+}

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/menu/AllMenuPresenter.java

@@ -93,7 +93,7 @@ public class AllMenuPresenter extends Presenter<AllMenuModel, IView> {
 
   @Override
   public void onClickAlarm(ActionBar actionBar) {
-    Log.i("APP# AllMenuPresenter | onClickAlarm", "|" + "==========================");
+    onCommand(new FragmentBackStackChangeCommand(ScreenID.ALARM, ScreenID.DIRECTION_NEXT));
   }
 
   @Override

+ 35 - 0
app/src/main/res/layout/fragment_alarm.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/main_content"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
+  android:orientation="vertical">
+
+  <android.support.design.widget.TabLayout
+    android:id="@+id/alarm_tab_layout"
+    android:layout_width="match_parent"
+    android:layout_height="55dp"
+    android:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:background="@color/CFFFFFF"
+    app:tabBackground="@drawable/tab_indicator"
+    app:tabGravity="center"
+    app:tabIndicatorColor="@color/C000000"/>
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+      android:id="@+id/alarm_view_pager"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+
+  </RelativeLayout>
+
+
+</LinearLayout>

+ 25 - 0
app/src/main/res/layout/fragment_alarm_list.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
+  android:orientation="vertical">
+
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/list_view_alarm_contents"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dp"
+    android:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:layout_marginTop="26dp"
+    android:divider="@color/CFFFFFF"
+    android:dividerHeight="50dp">
+
+  </android.support.v7.widget.RecyclerView>
+
+
+</RelativeLayout>

+ 3 - 0
app/src/main/res/values/strings.xml

@@ -397,4 +397,7 @@
   <string name="main_second_category_title">디즈니랜드 여행</string>
 
 
+  <string name="alarm">알림</string>
+
+
 </resources>