Преглед изворни кода

Task #1012 [android] toast pop-up 컬러 변경

http://www.junstarok.com/redmine/issues/1012

rv 2018042501
sanghoonkwon пре 7 година
родитељ
комит
6e833667a3

+ 1 - 1
app/build.gradle

@@ -10,7 +10,7 @@ android {
         versionName '0.7.1'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        buildConfigField "String", "REVISION", "\"2018042401\""
+        buildConfigField "String", "REVISION", "\"2018042501\""
         buildConfigField "String", "RC", "\"rc4\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""

+ 2 - 1
app/src/main/java/kr/co/hanwha/hifive/screen/intro/AuthNumberActivity.java

@@ -15,6 +15,7 @@ import kr.co.hanwha.hifive.dialog.HFDefaultDialog;
 import kr.co.hanwha.hifive.enums.BaseAnimationType;
 import kr.co.hanwha.hifive.enums.BaseToolbarType;
 import kr.co.hanwha.hifive.screen.intro.contract.AuthNumberContract;
+import kr.co.hanwha.hifive.screen.main.MainActivity;
 import kr.co.hanwha.hifive.util.HFActivityUtil;
 import kr.co.hanwha.hifive.view.HFNumberKeypadView;
 import kr.co.hanwha.hifive.view.HFPasswordEditTextView;
@@ -112,7 +113,7 @@ public class AuthNumberActivity extends BaseActivity implements AuthNumberContra
 
                         @Override
                         public void onPositive() {
-//                            HFActivityUtil.startRootActivity(AuthNumberActivity.this, true);//TODO - CHECK
+                            HFActivityUtil.startRootActivity(AuthNumberActivity.this, true);
                             finish();
                         }
                     });

+ 2 - 1
app/src/main/res/drawable/box_rounded_toast_bg.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#77000000" />
+    <solid android:color="@color/hf_blue04_e6" />
+    <!--#77000000-->
 
     <corners
         android:bottomLeftRadius="@dimen/main_box_corner"

+ 2 - 1
app/src/main/res/layout/view_hf_toast.xml

@@ -16,6 +16,7 @@
         android:orientation="horizontal"
         android:paddingBottom="11.5dp"
         android:paddingLeft="11.5dp"
+        android:minHeight="47dp"
         android:paddingRight="18dp"
         android:paddingTop="11.5dp">
 
@@ -28,7 +29,7 @@
 
         <kr.co.hanwha.hifive.view.FontTextView
             android:id="@+id/message_textView"
-            style="@style/font_notosans_r_12sp_ffffff"
+            style="@style/font_notosans_r_14sp_white01"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"

+ 2 - 0
app/src/main/res/values/colors.xml

@@ -10,6 +10,8 @@
     <color name="hf_blue02">#6688fc</color>
     <color name="hf_blue02_77">#776688fc</color>
     <color name="hf_blue03">#5579fd</color>
+    <color name="hf_blue04">#6e8fff</color>
+    <color name="hf_blue04_e6">#e66e8fff</color>
 
     <color name="hf_olive_green01">#4c7b78</color>
     <color name="hf_olive_green02">#eaf9f7</color>