瀏覽代碼

- 관리 : 기본 화면 설정 폰트 적용
- 오늘 할일로 등록한 TASK 삭제 기능 추가

sanghoonkwon 7 年之前
父節點
當前提交
be26f97fee

+ 1 - 1
app/build.gradle

@@ -11,7 +11,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "REVISION", "\"2018052501\""
+        buildConfigField "String", "REVISION", "\"2018052801\""
         buildConfigField "String", "RC", "\"rc5\""
 
         buildConfigField "String", "WEB_REAL_URL", "\"https://qtalk.dreamplus.center/newgw/b/v2\""

+ 1 - 0
app/src/main/java/kr/co/hanwha/hifive/view/HFTaskPopupMenuView.java

@@ -108,6 +108,7 @@ public class HFTaskPopupMenuView extends LinearLayout {
             }
         } else if (data.getStatus() == TaskStatusType.DOING_TODAY.getCode()) {
             if (isReceiver) mTextViewEdit.setVisibility(View.VISIBLE);
+            if (isReceiver && isAuthor) mTextViewDelete.setVisibility(View.VISIBLE);
         } else if (data.getStatus() == TaskStatusType.EVALUATED.getCode()) {
             if (isAuthor) {
                 mTextViewEvalConfirm.setVisibility(View.VISIBLE);

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -96,7 +96,7 @@
     <string name="main_setting_default_tab_dashboard">대시보드</string>
     <string name="main_setting_default_tab_setting">관리</string>
     <string name="main_setting_default_tab_guide_1">로그인 후</string>
-    <string name="main_setting_default_tab_guide_2"><![CDATA[%s 화면이먼저 보입니다.]]></string>
+    <string name="main_setting_default_tab_guide_2"><![CDATA[<font color=\"#6688fc\">%s</font> 화면이<br>먼저 보입니다.]]></string>
     <string name="main_setting_default_tab_message">기본 화면이 변경되었습니다.</string>
     <string name="main_setting_alarm_all">전체 알림</string>
     <string name="main_setting_version">버전</string>