Browse Source

[알림][Bug] 액션 버튼이 사라지는 현상 수정

hyodong.min 7 years ago
parent
commit
02d68709ed

+ 3 - 3
app/build.gradle

@@ -116,9 +116,9 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     implementation('com.squareup.retrofit2:converter-gson:2.3.0')
-    {
-        exclude group: 'com.google.code.gson', module: 'gson'
-    }
+            {
+                exclude group: 'com.google.code.gson', module: 'gson'
+            }
 
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
     implementation "android.arch.lifecycle:extensions:1.1.1"

+ 0 - 7
app/src/main/java/kr/co/zumo/app/lifeplus/manager/ActionButtonManager.java

@@ -28,8 +28,6 @@ public class ActionButtonManager {
 
   private FloatingActionButton floatingActionButton;
 
-  private Builder builder;
-
   private IActionButtonListener listener;
 
   private View.OnClickListener onClickListener = new View.OnClickListener() {
@@ -67,9 +65,6 @@ public class ActionButtonManager {
   }
 
   private void set(Builder newBuilder) {
-    if (null == builder) {
-      builder = new Builder();
-    }
 
     switch (newBuilder.type) {
       case Builder.TYPE_PENCIL:
@@ -88,8 +83,6 @@ public class ActionButtonManager {
 
     this.listener = newBuilder.listener;
 
-    builder = newBuilder;
-
   }
 
   private void replaceIcon(@DrawableRes int icon) {

+ 8 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/FragmentBase.java

@@ -6,6 +6,7 @@ package kr.co.zumo.app.lifeplus.view.fragment;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.CallSuper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -87,7 +88,13 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
     Log.e("APP# FragmentBase | onActivityCreated", "| >>>>>>>>>>>> " + this.getClass().getSimpleName());
     super.onActivityCreated(savedInstanceState);
 
-    onAfterActivityCreated(savedInstanceState);
+
+    final Handler handler = new Handler();
+    new Thread(() -> {
+      handler.post(() -> {
+        onAfterActivityCreated(savedInstanceState);
+      });
+    }).start();
   }
 
   @CallSuper

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/notification/NotiFragment.java

@@ -45,6 +45,7 @@ public class NotiFragment extends FragmentBase<NotiPresenter> {
     tabLayoutAlarm = findViewById(R.id.alarm_tab_layout);
     viewPagerAlarm = findViewById(R.id.alarm_view_pager);
     tabLayoutAlarm.setTabGravity(TabLayout.GRAVITY_FILL);
+
     String[] tab = {CATEGORY_ALL, CATEGORY_NEWS, CATEGORY_NOTICE};
     NotiPagerAdapter notiPagerAdapter = new NotiPagerAdapter(getChildFragmentManager(), tab);
     tabLayoutAlarm.setupWithViewPager(viewPagerAlarm, true);

+ 9 - 20
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/notification/NotiListFragment.java

@@ -4,6 +4,7 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -11,10 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 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.NotiListPresenter;
 
 /**
  * AlarmListFragment
@@ -26,19 +24,22 @@ import kr.co.zumo.app.lifeplus.view.presenter.NotiListPresenter;
  * @history 하세미   [2018-10-24]   [최초 작성]
  * @since 2018-10-24
  */
-public class NotiListFragment extends FragmentBase<NotiListPresenter> {
+public class NotiListFragment extends Fragment {
 
   private RecyclerView recyclerViewAlarmList;
+
   @Override
-  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
     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);
-    NotiListAdapter notiListAdapter= new NotiListAdapter(getActivity());
+  public void onActivityCreated(Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+    
+    recyclerViewAlarmList = getView().findViewById(R.id.recycler_view_alarm_list);
+    NotiListAdapter notiListAdapter = new NotiListAdapter(getActivity());
     recyclerViewAlarmList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
     recyclerViewAlarmList.addItemDecoration(new RecyclerView.ItemDecoration() {
       @Override
@@ -48,18 +49,6 @@ public class NotiListFragment extends FragmentBase<NotiListPresenter> {
       }
     });
     recyclerViewAlarmList.setAdapter(notiListAdapter);
-
-
-
-  }
-
-  @Override
-  protected void defineActionBar() {
-
   }
 
-  @Override
-  protected NotiListPresenter definePresenter() {
-    return new NotiListPresenter(getModel(BlankModel.class), this);
-  }
 }

+ 0 - 63
app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/NotiListPresenter.java

@@ -1,63 +0,0 @@
-package kr.co.zumo.app.lifeplus.view.presenter;
-
-import kr.co.zumo.app.lifeplus.model.BlankModel;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IView;
-
-/**
- * AlarmListPresenter
- * <pre>
- * </pre>
- *
- * @author 하세미
- * @version 1.0
- * @history 하세미   [2018-10-25]   [최초 작성]
- * @since 2018-10-25
- */
-public class NotiListPresenter extends Presenter<BlankModel, IView> {
-
-
-  public NotiListPresenter(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() {
-    return false;
-  }
-
-  @Override
-  protected void onEventInternal(Event event) {
-
-  }
-
-  @Override
-  public void onResult(Event event) {
-
-  }
-}

+ 21 - 6
app/src/main/res/drawable/icon_floating_trash.xml

@@ -1,7 +1,22 @@
-<vector android:height="44dp" android:viewportHeight="174"
-    android:viewportWidth="174" android:width="44dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M87,0L87,0A87,87 0,0 1,174 87L174,87A87,87 0,0 1,87 174L87,174A87,87 0,0 1,0 87L0,87A87,87 0,0 1,87 0z"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M105,114V69a2,2 0,1 1,4 0v47a2,2 0,0 1,-2 2H68a2,2 0,0 1,-2 -2V69a2,2 0,1 1,4 0v45h35z"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M79,80a2,2 0,1 1,4 0v26a2,2 0,1 1,-4 0V80zM92,80a2,2 0,1 1,4 0v26a2,2 0,1 1,-4 0V80zM78.708,67.326a2,2 0,1 1,-4 0v-8a2,2 0,0 1,2 -2h21a2,2 0,0 1,2 2v8a2,2 0,1 1,-4 0v-6h-17v6z"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M62,71a2,2 0,1 1,0 -4h51a2,2 0,1 1,0 4H62z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="44dp"
+        android:height="44dp"
+        android:viewportWidth="174"
+        android:viewportHeight="174">
+  <path
+    android:fillColor="#000"
+    android:fillType="evenOdd"
+    android:pathData="M87,0L87,0A87,87 0,0 1,174 87L174,87A87,87 0,0 1,87 174L87,174A87,87 0,0 1,0 87L0,87A87,87 0,0 1,87 0z"/>
+  <path
+    android:fillColor="#FFF"
+    android:fillType="nonZero"
+    android:pathData="M105,114V69a2,2 0,1 1,4 0v47a2,2 0,0 1,-2 2H68a2,2 0,0 1,-2 -2V69a2,2 0,1 1,4 0v45h35z"/>
+  <path
+    android:fillColor="#FFF"
+    android:fillType="nonZero"
+    android:pathData="M79,80a2,2 0,1 1,4 0v26a2,2 0,1 1,-4 0V80zM92,80a2,2 0,1 1,4 0v26a2,2 0,1 1,-4 0V80zM78.708,67.326a2,2 0,1 1,-4 0v-8a2,2 0,0 1,2 -2h21a2,2 0,0 1,2 2v8a2,2 0,1 1,-4 0v-6h-17v6z"/>
+  <path
+    android:fillColor="#FFF"
+    android:fillType="nonZero"
+    android:pathData="M62,71a2,2 0,1 1,0 -4h51a2,2 0,1 1,0 4H62z"/>
 </vector>