[공통][Common] 앱리뷰 팝업 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/AppReviewDialog.java

@@ -1,11 +1,10 @@
 package kr.co.zumo.app.lifeplus.view.dialog;
 
+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
+import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 
 import kr.co.zumo.app.R;
@@ -23,19 +22,29 @@ import kr.co.zumo.app.lifeplus.view.Event;
  */
 public class AppReviewDialog extends DialogBase<ICustomDialogListener<AppReviewDialog>> {
 
-  @Nullable
+  @NonNull
   @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.dialog_app_review, container, false);
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    Log.e("APP#  AppReivewDialog | onCreateDialog", "|" + "----------------------------------------------------------------------");
+    android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(getActivity());
+    View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_app_review, null);
+    setupView(view);
+
+    builder.setView(view);
+    Dialog dialog = builder.create();
+
+    // alert 의 기본 흰 배경 제거
+    dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+
+    return dialog;
   }
 
-  @Override
-  protected void onActivityCreatedInternal() {
+  private void setupView(View view){
     Window window = getDialog().getWindow();
     window.setBackgroundDrawableResource(R.color.C99000000);
 
     //다음기회에 클릭
-    getView().findViewById(R.id.text_view_next_time).setOnClickListener(view -> {
+    view.findViewById(R.id.text_view_next_time).setOnClickListener(view1 -> {
       if(null!= getCustomListener()){
         getCustomListener().onDialogCanceled(AppReviewDialog.this);
       }
@@ -43,8 +52,20 @@ public class AppReviewDialog extends DialogBase<ICustomDialogListener<AppReviewD
     });
 
     //앱리뷰 쓰기
-    getView().findViewById(R.id.text_view_write_app_review).setOnClickListener(view -> {
+    view.findViewById(R.id.text_view_write_app_review).setOnClickListener(view1 -> {
       getCustomListener().onDialogResult(AppReviewDialog.this, new Event.Builder(Event.ADD).build());
     });
+
+
+    //닫기버튼 클릭
+    view.findViewById(R.id.image_view_close).setOnClickListener(view1 -> {
+      getCustomListener().onDialogCanceled(AppReviewDialog.this);
+    });
+
+  }
+
+  @Override
+  protected void onActivityCreatedInternal() {
+
   }
 }

app/src/main/res/drawable/icon_h_close.xml

@@ -1,6 +1,6 @@
-<vector android:height="18dp" android:viewportHeight="71"
+<vector android:height="18dp" android:viewportHeight="70"
     android:viewportWidth="70" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M10.5,8.167l49.93,53.937M8.167,60.43L62.104,10.5"
-        android:strokeColor="#222" android:strokeWidth="6.957"/>
+        android:pathData="M10,8l50,54M8,60l54,-50"
+        android:strokeColor="#222" android:strokeWidth="6"/>
 </vector>

app/src/main/res/drawable/rectangle_radius_4.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+  <solid android:color="@color/CFFFFFF"/>
+  <corners
+    android:radius="4dp"/>
+</shape>

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

@@ -3,13 +3,14 @@
   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:layout_width="wrap_content"
+  tools:background="@color/C888888"
+  android:layout_height="wrap_content">
 
   <android.support.constraint.ConstraintLayout
-    android:layout_width="273dp"
-    android:layout_height="274dp"
-    android:background="@color/CFFFFFF"
+    android:background="@drawable/rectangle_radius_4"
+    android:layout_width="287dp"
+    android:layout_height="221dp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
@@ -21,12 +22,24 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="35dp"
       android:lineSpacingExtra="7sp"
-      android:text="@string/notification"
+      android:text="@string/app_review_title"
       android:textColor="@color/C000000"
       android:textSize="18sp"
+      android:textStyle="bold"
       app:layout_constraintStart_toStartOf="@+id/text_view_dialog_message"
       app:layout_constraintTop_toTopOf="parent"/>
 
+    <ImageView
+      android:id="@+id/image_view_close"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="22dp"
+      android:layout_marginEnd="22dp"
+      android:padding="10dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/icon_h_close"/>
+
     <TextView
       android:id="@+id/text_view_dialog_message"
       android:layout_width="wrap_content"
@@ -35,25 +48,12 @@
       android:lineSpacingExtra="6sp"
       android:text="@string/app_review_message"
       android:textColor="@color/C000000"
+      android:layout_marginStart="31dp"
       android:textSize="14sp"
-      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/text_view_title"
       />
 
-    <RatingBar
-      android:id="@+id/ratingBar"
-      style="@style/Widget.AppCompat.RatingBar.Indicator"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="24dp"
-      android:clickable="true"
-      android:focusable="true"
-      android:numStars="5"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/text_view_dialog_message"/>
-
     <TextView
       android:id="@+id/text_view_next_time"
       android:layout_width="wrap_content"
@@ -63,9 +63,10 @@
       android:gravity="center_horizontal"
       android:lineSpacingExtra="6sp"
       android:padding="10dp"
-      android:text="@string/next_time"
-      android:textColor="@color/C999999"
+      android:text="@string/go_faq"
+      android:textColor="@color/C000000"
       android:textSize="14sp"
+      android:textStyle="bold"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
 
@@ -83,6 +84,7 @@
       android:text="@string/app_review_write"
       android:textColor="@color/C000000"
       android:textSize="14sp"
+      android:textStyle="bold"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       />

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

@@ -684,9 +684,7 @@
   <string name="open_app">APP 열기</string>
   <string name="please_install_kakaotalk">카카오톡을 설치해 주세요.</string>
 
-  <string name="app_review_message">Lifeplus에 대해 만족하시나요?\n앱에 대한 별점 리뷰를 남겨주시겠어요?</string>
-  <string name="next_time">다음 기회에</string>
-  <string name="app_review_write">앱 리뷰 쓰기</string>
+
   <string name="app_join_recommend">\n회원가입하시면 특별한 혜택을 드립니다.</string>
   <string name="recommend_code_title">추천인코드</string>
 
@@ -723,6 +721,11 @@
   <string name="lifeplus_app">Lifeplus app</string>
   <string name="list_result">조회결과 %d건</string>
 
+  <string name="app_review_title">앱 별점 리뷰</string>
+  <string name="app_review_message">Lifeplus app을 이용하신 소감이\n어떠세요?</string>
+  <string name="go_faq"><b>문의할래요</b></string>
+  <string name="app_review_write"><b>앱 평가 할래요</b></string>
+
   <!-- 임의 추가 문자열 : 시작 -->
   <string name="undefined_error">알 수 없는 에러</string>
   <string name="undefined_list_type">데이터가 없습니다.</string>