[마이][Common] 마이 코인메인 수정사항 반영

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailFragment.java

@@ -41,6 +41,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
   private RelativeLayout filterDivider;
   private View viewDivider;
   private ImageView imageViewFilter;
+  private ImageView imageViewCoinInformationDialog;
   private List<MyCoinBean> myCoinBeanList;
   private TextView textViewExtinctCoin;
   private ImageView imageViewExtinctCoinArrow;
@@ -58,6 +59,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
     layoutFilterContents = findViewById(R.id.layout_filter_contents);
     viewDivider = findViewById(R.id.view_divider);
     filterDivider = findViewById(R.id.filter_divider);
+    imageViewCoinInformationDialog = findViewById(R.id.image_view_coin_information_pop_up);
 
     textViewExtinctCoin = findViewById(R.id.text_view_extinct_coin);
     imageViewExtinctCoinArrow = findViewById(R.id.image_view_extinct_coin_arrow);
@@ -69,6 +71,9 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
     //조회 필터 클릭
     imageViewFilter.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.TOGGLE).build());});
 
+    //코인정보 다이얼로그 띄우기
+    imageViewCoinInformationDialog.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.DETAIL).build());});
+
     doDummyData();
     recyclerViewCoinList = findViewById(R.id.recycler_view_coin_list);
     MyCoinListViewAdapter adapter = new MyCoinListViewAdapter(getActivity(), myCoinBeanList);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailPresenter.java

@@ -3,6 +3,12 @@ package kr.co.zumo.app.lifeplus.view.screen.my.coin;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.dialog.CoinInformationDialog;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
+import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
+import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
+import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -17,6 +23,8 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class MyCoinDetailPresenter extends Presenter<MyCoinModel, IMyCoinView> {
 
+  private DialogBase alertDialog;
+  
   public MyCoinDetailPresenter(MyCoinModel model, IMyCoinView view) {
     super(model, view);
   }
@@ -61,6 +69,24 @@ public class MyCoinDetailPresenter extends Presenter<MyCoinModel, IMyCoinView> {
       case Event.CLICK:
         go(ScreenID.MY_COIN_EXTINCT);
         break;
+      case Event.DETAIL:
+        alertDialog = new DialogBuilder<CoinInformationDialog, ICustomDialogListener>(DialogID.COIN_INFORMATION)
+          .listener(new ICustomDialogListener<CoinInformationDialog>() {
+            @Override
+            public void onDialogResult(CoinInformationDialog dialog, Event event) {
+
+            }
+
+            @Override
+            public void onDialogCanceled(CoinInformationDialog dialog) {
+              dialog.dispose();
+
+            }
+          })
+          .attribute((IAttribute<CoinInformationDialog>) dialog -> {
+          })
+          .show();
+        break;
       default:
         break;
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinExtinctionFragment.java

@@ -49,7 +49,7 @@ public class MyCoinExtinctionFragment extends FragmentBase<MyCoinExtinctionPrese
 
   @Override
   protected void defineActionBar(ActionBarHelper actionBarHelper) {
-    actionBarHelper.begin().title(R.string.empty_string)
+    actionBarHelper.begin().title(R.string.coin_extinct_action_bar_title)
       .back(actionBar -> presenter.onNavigationClickBack(actionBar))
       .scroll()
       .show();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainFragment.java

@@ -35,7 +35,6 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> {
   private TextView textViewMyCoinDetail;
   private ImageView imageViewArrowMyCoinDetail;
-  private ImageView imageViewCoinInformationDialog;
   private MainBannerView mainBannerViewCoin;
   private List<CategoryBannerBean> imageBeanList;
 
@@ -48,7 +47,6 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> {
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     textViewMyCoinDetail = findViewById(R.id.text_view_my_coin_detail);
     imageViewArrowMyCoinDetail = findViewById(R.id.image_view_arrow_my_colin_detail);
-    imageViewCoinInformationDialog = findViewById(R.id.image_view_coin_information_pop_up);
     mainBannerViewCoin = findViewById(R.id.coin_banner_view);
 
     doBannerDataSetting();
@@ -61,8 +59,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> {
 
     textViewMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
     imageViewArrowMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
-    //코인정보 다이얼로그 띄우기
-    imageViewCoinInformationDialog.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.DETAIL).build());});
+
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainPresenter.java

@@ -5,12 +5,7 @@ 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.dialog.CoinInformationDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
-import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
-import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
-import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -25,7 +20,6 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  */
 public class MyCoinMainPresenter extends Presenter<BlankModel, IView> {
 
-  private DialogBase alertDialog;
 
   public MyCoinMainPresenter(BlankModel model, IView view) {
     super(model, view);
@@ -68,25 +62,6 @@ public class MyCoinMainPresenter extends Presenter<BlankModel, IView> {
       case Event.MY_COIN_DETAIL:
         go(ScreenID.MY_COIN_DETAIL);
         break;
-      case Event.DETAIL:
-        alertDialog = new DialogBuilder<CoinInformationDialog, ICustomDialogListener>(DialogID.COIN_INFORMATION)
-          .listener(new ICustomDialogListener<CoinInformationDialog>() {
-            @Override
-            public void onDialogResult(CoinInformationDialog dialog, Event event) {
-
-            }
-
-            @Override
-            public void onDialogCanceled(CoinInformationDialog dialog) {
-              dialog.dispose();
-
-            }
-          })
-          .attribute((IAttribute<CoinInformationDialog>) dialog -> {
-          })
-          .show();
-        break;
-
       default:
         break;
     }

app/src/main/res/layout/fragment_my_coin_detail.xml

@@ -36,6 +36,7 @@
         />
 
       <ImageView
+        android:id="@+id/image_view_coin1"
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:layout_alignParentTop="true"
@@ -44,6 +45,16 @@
         android:layout_toRightOf="@+id/text_view_coin_detail"
         app:srcCompat="@drawable/icon_coin"/>
 
+      <ImageView
+        android:id="@+id/image_view_coin_information_pop_up"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
+        android:layout_alignTop="@+id/image_view_coin1"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="30dp"
+        app:srcCompat="@drawable/icon_info_popup_btn"/>
+
       <ImageView
         android:id="@+id/image_view_coin"
         android:layout_width="14dp"

app/src/main/res/layout/fragment_my_coin_main.xml

@@ -57,22 +57,12 @@
           android:layout_marginBottom="8dp"
           android:paddingEnd="6dp"
           app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@+id/image_view_coin_information_pop_up"
+          android:layout_marginStart="3dp"
           app:layout_constraintHorizontal_bias="0.5"
           app:layout_constraintStart_toEndOf="@+id/text_view_coin_detail"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/icon_coin"/>
 
-        <ImageView
-          android:id="@+id/image_view_coin_information_pop_up"
-          android:layout_width="14dp"
-          android:layout_height="14dp"
-          android:layout_marginTop="8dp"
-          android:layout_marginBottom="8dp"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/image_view_coin"
-          app:layout_constraintTop_toTopOf="parent"
-          app:srcCompat="@drawable/icon_info_popup_btn"/>
 
         <TextView
           android:id="@+id/text_view_my_coin_detail"

app/src/main/res/values/strings.xml

@@ -565,6 +565,7 @@
 
   <string name="coin_information">코인 정보</string>
   <string name="coin_extinct">소멸예정</string>
+  <string name="coin_extinct_action_bar_title">소멸예정 코인</string>
   <string name="coin_information_title_1">코인이란?</string>
   <string name="coin_information_contents_1">라플앱 내에서 사용 가능한 포인트로\n1coin=1원의 가치를 가집니다.</string>
   <string name="coin_information_contents_2">1일 최대 50코인까지 적립 가능합니다.
\n(단, 구매/프로모션 코인은 제외)</string>
@@ -652,4 +653,7 @@
   <string name="outside">실외</string>
 
   <string name="tag_title">연관태그 추천 콘텐츠 %s개</string>
+
+
+
 </resources>