ソースを参照

#2019-06-12 15:18
- 4.0.8 스토어 배포
- 카테고리 배너 딤 조절(50% -> 15%)
- 컨텐츠 상세 '함께보면 좋은 컨텐츠' 상단 네비게이션 딤영역 제거
- 리스트 탑버튼 이미지 변경

yeongyun 6 年 前
コミット
7ebec9ac19

+ 1 - 1
app/build.gradle

@@ -44,7 +44,7 @@ android {
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
         versionCode 178
-        versionName "4.0.8.002"
+        versionName "4.0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/bean/HtmlBean.java

@@ -19,8 +19,8 @@ public class HtmlBean extends JsonBeanBase {
 
   /*
   type
-  1:인앱
-  2:아웃링크
+  2:인앱
+  1:아웃링크
 
   key
   로그키값

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionNoticeView.java

@@ -2,6 +2,8 @@ package kr.co.zumo.app.lifeplus.view.screen.event.entry;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -41,6 +43,7 @@ class EventQuestionNoticeView extends RecyclerView.ViewHolder {
             View contentsView = inflater.inflate(R.layout.event_notice_view, null);
             textViewContents = contentsView.findViewById(R.id.text_view_contents);
             textViewContents.setText(contentsArray[i]);
+//            textViewContents.setMovementMethod(LinkMovementMethod.getInstance());
             layoutContainer.addView(contentsView);
 
             if (i == contentsArray.length - 1) {

BIN
app/src/main/res/drawable-xxxhdpi/btn_up.png


+ 1 - 1
app/src/main/res/drawable/rectangle_dim_black_50.xml

@@ -1,6 +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="#80000000"/>
+   <solid android:color="#25000000"/>
     <corners
       android:radius="0dp"/>
   </shape>

+ 19 - 19
app/src/main/res/layout/contents_detail_with_shown.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@color/CFFFFFF">
-
-  <kr.co.zumo.app.lifeplus.view.custom.recommend.RecommendContentsView
-    android:id="@+id/recommend_contents_view"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent"
+    android:background="@color/CFFFFFF">
 
-  <View
-    android:id="@+id/view_dim_0"
-    android:layout_width="match_parent"
-    android:layout_height="235dp"
-    android:background="@drawable/card_cover_dim_top"
-    android:rotation="180"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    <kr.co.zumo.app.lifeplus.view.custom.recommend.RecommendContentsView
+        android:id="@+id/recommend_contents_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <View
+        android:id="@+id/view_dim_0"
+        android:layout_width="match_parent"
+        android:layout_height="235dp"
+        android:background="@drawable/card_cover_dim_top"
+        android:rotation="180"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </android.support.constraint.ConstraintLayout>

+ 32 - 31
app/src/main/res/layout/event_notice_view.xml

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-  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="wrap_content"
-  android:layout_height="wrap_content">
+<android.support.constraint.ConstraintLayout 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="wrap_content"
+    android:layout_height="wrap_content">
 
-  <View
-    android:id="@+id/rectangle"
-    android:layout_width="2dp"
-    android:layout_height="2dp"
-    android:layout_marginTop="12dp"
-    android:background="@color/C666666"
-    app:layout_constraintEnd_toStartOf="@+id/text_view_contents"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    <View
+        android:id="@+id/rectangle"
+        android:layout_width="2dp"
+        android:layout_height="2dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/C666666"
+        app:layout_constraintEnd_toStartOf="@+id/text_view_contents"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-  <TextView
-    android:id="@+id/text_view_contents"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="5dp"
-    android:lineSpacingExtra="4sp"
-    android:paddingTop="5dp"
-    android:paddingBottom="5dp"
-    android:textColor="@color/C666666"
-    android:textSize="12sp"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toEndOf="@+id/rectangle"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintVertical_bias="0"
-    tools:text="해당 이벤트는 ID당 1회에 한해 참여\n가능합니다."/>
+    <TextView
+        android:textColorLink="#0000FF"
+        android:id="@+id/text_view_contents"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:autoLink="all"
+        android:lineSpacingExtra="4sp"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:textColor="@color/C666666"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/rectangle"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        tools:text="해당 이벤트는 ID당 1회에 한해 참여\n가능합니다." />
 </android.support.constraint.ConstraintLayout>