[알림][Common] 파일명 Alarm -> Noti 로 변경

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/BasicFragmentFactory.java

@@ -6,7 +6,6 @@ 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.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;
@@ -26,6 +25,7 @@ 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.notification.NotiFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.onboarding.OnBoardingFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.pin.PinConfirmFragment;
 import kr.co.zumo.app.lifeplus.view.fragment.pin.PinResetFragment;
@@ -156,7 +156,7 @@ public class BasicFragmentFactory extends FragmentFactory {
         fragment = new FifthCategoryMainFragment();
         break;
       case ScreenID.NOTIFICATION:
-        fragment = new AlarmFragment();
+        fragment = new NotiFragment();
         break;
       default:
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmExpandableViewHolder.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -18,7 +18,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-25]   [최초 작성]
  * @since 2018-10-25
  */
-public class AlarmExpandableViewHolder extends RecyclerView.ViewHolder {
+public class NotiExpandableViewHolder extends RecyclerView.ViewHolder {
   private TextView textViewAlarmCategory;
   private TextView textViewAlarmTitle;
   private TextView textViewAlarmDate;
@@ -26,7 +26,7 @@ public class AlarmExpandableViewHolder extends RecyclerView.ViewHolder {
   private ImageView imageViewOpenArrow;
   private RelativeLayout relativeLayoutDetailContents;
 
-  public AlarmExpandableViewHolder(View itemView) {
+  public NotiExpandableViewHolder(View itemView) {
     super(itemView);
     textViewAlarmCategory = itemView.findViewById(R.id.text_view_alarm_category);
     textViewAlarmTitle = itemView.findViewById(R.id.text_view_alarm_title);

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmFragment.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -15,7 +15,7 @@ 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;
+import kr.co.zumo.app.lifeplus.view.presenter.NotiPresenter;
 
 /**
  * AlarmFragment
@@ -27,7 +27,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.AlarmPresenter;
  * @history 하세미   [2018-10-24]   [최초 작성]
  * @since 2018-10-24
  */
-public class AlarmFragment extends FragmentBase<AlarmPresenter> {
+public class NotiFragment extends FragmentBase<NotiPresenter> {
 
   public static final String CATEGORY_ALL = "전체";
   public static final String CATEGORY_NEWS = "소식";
@@ -37,7 +37,7 @@ public class AlarmFragment extends FragmentBase<AlarmPresenter> {
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_alarm, container, false);
+    return inflater.inflate(R.layout.fragment_noti, container, false);
   }
 
   @Override
@@ -46,10 +46,10 @@ public class AlarmFragment extends FragmentBase<AlarmPresenter> {
     viewPagerAlarm = findViewById(R.id.alarm_view_pager);
     tabLayoutAlarm.setTabGravity(TabLayout.GRAVITY_FILL);
     String[] tab = {CATEGORY_ALL, CATEGORY_NEWS, CATEGORY_NOTICE};
-    AlarmPagerAdapter alarmPagerAdapter = new AlarmPagerAdapter(getChildFragmentManager(), tab);
+    NotiPagerAdapter notiPagerAdapter = new NotiPagerAdapter(getChildFragmentManager(), tab);
     tabLayoutAlarm.setupWithViewPager(viewPagerAlarm, true);
-    viewPagerAlarm.setAdapter(alarmPagerAdapter);
-    alarmPagerAdapter.notifyDataSetChanged();
+    viewPagerAlarm.setAdapter(notiPagerAdapter);
+    notiPagerAdapter.notifyDataSetChanged();
   }
 
   @Override
@@ -70,7 +70,7 @@ public class AlarmFragment extends FragmentBase<AlarmPresenter> {
 
 
   @Override
-  protected AlarmPresenter definePresenter() {
-    return new AlarmPresenter(getModel(BlankModel.class), this);
+  protected NotiPresenter definePresenter() {
+    return new NotiPresenter(getModel(BlankModel.class), this);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmImageTextViewHolder.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -17,7 +17,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-25]   [최초 작성]
  * @since 2018-10-25
  */
-public class AlarmImageTextViewHolder extends RecyclerView.ViewHolder {
+public class NotiImageTextViewHolder extends RecyclerView.ViewHolder {
 
 
   private TextView textViewAlarmCategory;
@@ -29,7 +29,7 @@ public class AlarmImageTextViewHolder extends RecyclerView.ViewHolder {
   private TextView textViewShowContents;
 
 
-  public AlarmImageTextViewHolder(View itemView) {
+  public NotiImageTextViewHolder(View itemView) {
     super(itemView);
     textViewAlarmCategory = itemView.findViewById(R.id.text_view_category);
     textViewAlarmTitle = itemView.findViewById(R.id.text_view_title);

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmListAdapter.java

@@ -1,5 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
-
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -9,6 +8,8 @@ import android.view.ViewGroup;
 
 import kr.co.zumo.app.R;
 
+
+
 /**
  * AlarmListAdapter
  * <pre>
@@ -19,7 +20,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-25]   [최초 작성]
  * @since 2018-10-25
  */
-public class AlarmListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class NotiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
   private Context context;
   private LayoutInflater inflater;
@@ -29,7 +30,7 @@ public class AlarmListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
   private static final int TEXT_LINK_TYPE = 3;
 
 
-  public AlarmListAdapter(Context context) {
+  public NotiListAdapter(Context context) {
     this.context = context;
     this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
   }
@@ -40,15 +41,15 @@ public class AlarmListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
     View view;
     switch (viewType) {
       case TEXT_EXPANDABLE_TYPE:
-        view = inflater.inflate(R.layout.alarm_expandable_contents, parent, false);
-        return new AlarmExpandableViewHolder(view);
+        view = inflater.inflate(R.layout.noti_expandable_contents, parent, false);
+        return new NotiExpandableViewHolder(view);
       case IMAGE_TEXT_TYPE:
-        view = inflater.inflate(R.layout.alarm_image_text_contents, parent, false);
-        return new AlarmImageTextViewHolder(view);
+        view = inflater.inflate(R.layout.noti_image_text_contents, parent, false);
+        return new NotiImageTextViewHolder(view);
       case TEXT_TYPE:
       case TEXT_LINK_TYPE:
-        view = inflater.inflate(R.layout.alarm_text_contents, parent, false);
-        return new AlarmTextViewHolder(view);
+        view = inflater.inflate(R.layout.noti_text_contents, parent, false);
+        return new NotiTextViewHolder(view);
       default:
         break;
     }
@@ -59,14 +60,14 @@ public class AlarmListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
   public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
     switch (getItemViewType(position)) {
       case TEXT_EXPANDABLE_TYPE:
-        ((AlarmExpandableViewHolder) holder).doDataSetting();
+        ((NotiExpandableViewHolder) holder).doDataSetting();
         break;
       case IMAGE_TEXT_TYPE:
-        ((AlarmImageTextViewHolder) holder).doDataSetting();
+        ((NotiImageTextViewHolder) holder).doDataSetting();
         break;
       case TEXT_TYPE:
       case TEXT_LINK_TYPE:
-        ((AlarmTextViewHolder) holder).doDataSetting();
+        ((NotiTextViewHolder) holder).doDataSetting();
         break;
       default:
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmListFragment.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -14,7 +14,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
-import kr.co.zumo.app.lifeplus.view.presenter.AlarmListPresenter;
+import kr.co.zumo.app.lifeplus.view.presenter.NotiListPresenter;
 
 /**
  * AlarmListFragment
@@ -26,19 +26,19 @@ import kr.co.zumo.app.lifeplus.view.presenter.AlarmListPresenter;
  * @history 하세미   [2018-10-24]   [최초 작성]
  * @since 2018-10-24
  */
-public class AlarmListFragment extends FragmentBase<AlarmListPresenter> {
+public class NotiListFragment extends FragmentBase<NotiListPresenter> {
 
   private RecyclerView recyclerViewAlarmList;
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_alarm_list, container, false);
+    View view = inflater.inflate(R.layout.fragment_noti_list, container, false);
     return view;
   }
 
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     recyclerViewAlarmList = findViewById(R.id.recycler_view_alarm_list);
-    AlarmListAdapter alarmListAdapter = new AlarmListAdapter(getActivity());
+    NotiListAdapter notiListAdapter= new NotiListAdapter(getActivity());
     recyclerViewAlarmList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
     recyclerViewAlarmList.addItemDecoration(new RecyclerView.ItemDecoration() {
       @Override
@@ -47,7 +47,7 @@ public class AlarmListFragment extends FragmentBase<AlarmListPresenter> {
         outRect.bottom = ResourceUtil.dpToPx(12);
       }
     });
-    recyclerViewAlarmList.setAdapter(alarmListAdapter);
+    recyclerViewAlarmList.setAdapter(notiListAdapter);
 
 
 
@@ -59,7 +59,7 @@ public class AlarmListFragment extends FragmentBase<AlarmListPresenter> {
   }
 
   @Override
-  protected AlarmListPresenter definePresenter() {
-    return new AlarmListPresenter(getModel(BlankModel.class), this);
+  protected NotiListPresenter definePresenter() {
+    return new NotiListPresenter(getModel(BlankModel.class), this);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmPagerAdapter.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -6,6 +6,7 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 
+
 /**
  * AlarmPagerAdapter
  * <pre>
@@ -16,20 +17,20 @@ import android.support.v4.app.FragmentStatePagerAdapter;
  * @history 하세미   [2018-10-24]   [최초 작성]
  * @since 2018-10-24
  */
-public class AlarmPagerAdapter extends FragmentStatePagerAdapter {
+public class NotiPagerAdapter extends FragmentStatePagerAdapter {
 
   private static final int PAGE_COUNT = 3;
   private String[] tabs;
 
-  public AlarmPagerAdapter(FragmentManager fm, String[] tabs) {
+  public NotiPagerAdapter(FragmentManager fm, String[] tabs) {
     super(fm);
     this.tabs = tabs;
   }
 
   @Override
   public Fragment getItem(int position) {
-    AlarmListFragment alarmListFragment = new AlarmListFragment();
-    return alarmListFragment;
+    NotiListFragment notiFragment = new NotiListFragment();
+    return notiFragment;
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/alarm/AlarmTextViewHolder.java

@@ -1,4 +1,4 @@
-package kr.co.zumo.app.lifeplus.view.fragment.alarm;
+package kr.co.zumo.app.lifeplus.view.fragment.notification;
 
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -18,7 +18,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-25]   [최초 작성]
  * @since 2018-10-25
  */
-public class AlarmTextViewHolder extends RecyclerView.ViewHolder {
+public class NotiTextViewHolder extends RecyclerView.ViewHolder {
 
   private static final int TEXT_TYPE = 2;
   private static final int TEXT_LINK_TYPE = 3;
@@ -29,7 +29,7 @@ public class AlarmTextViewHolder extends RecyclerView.ViewHolder {
   private TextView textViewShowContents;
   private ImageView imageViewOpenArrow;
 
-  public AlarmTextViewHolder(View itemView) {
+  public NotiTextViewHolder(View itemView) {
     super(itemView);
     textViewAlarmCategory = itemView.findViewById(R.id.text_view_category);
     textViewAlarmTitle = itemView.findViewById(R.id.text_view_title);

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/AlarmListPresenter.java

@@ -14,10 +14,10 @@ import kr.co.zumo.app.lifeplus.view.IView;
  * @history 하세미   [2018-10-25]   [최초 작성]
  * @since 2018-10-25
  */
-public class AlarmListPresenter extends Presenter<BlankModel, IView> {
+public class NotiListPresenter extends Presenter<BlankModel, IView> {
 
 
-  public AlarmListPresenter(BlankModel model, IView view) {
+  public NotiListPresenter(BlankModel model, IView view) {
     super(model, view);
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/AlarmPresenter.java

@@ -16,10 +16,10 @@ import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
  * @history 하세미   [2018-10-24]   [최초 작성]
  * @since 2018-10-24
  */
-public class AlarmPresenter extends Presenter<BlankModel, IView> {
+public class NotiPresenter extends Presenter<BlankModel, IView> {
 
 
-  public AlarmPresenter(BlankModel model, IView view) {
+  public NotiPresenter(BlankModel model, IView view) {
     super(model, view);
   }