다이얼로그 위치 수정 및 코스 리사이클러뷰 수정

seoulsanta · Sep 30, 2019 · 321b7ad · 321b7ad
1 parent 6703585
commit 321b7ad
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/SeoulSantaAndroid/app/src/main/java/com/yamgang/seoulsantaandroid/ui/map/SafetyTipsDialog.kt b/SeoulSantaAndroid/app/src/main/java/com/yamgang/seoulsantaandroid/ui/map/SafetyTipsDialog.kt
@@ -2,14 +2,19 @@ package com.yamgang.seoulsantaandroid.ui.map
 
 import android.app.Dialog
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import com.yamgang.seoulsantaandroid.R
+import com.yamgang.seoulsantaandroid.ui.map.detail.CourseMapActivity
 import kotlinx.android.synthetic.main.dialog_safety_tips.*
 
-class SafetyTipsDialog(context: Context) : Dialog(context)  {
+class SafetyTipsDialog(context: Context,course_idx: Int,name : String, badge:Int) : Dialog(context)  {
 
     var isChecked: Boolean = false
+    var course_idx = course_idx
+    var name = name
+    var badge = badge
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -32,6 +37,11 @@ class SafetyTipsDialog(context: Context) : Dialog(context)  {
         }
 
         btn_dialog_safety_selected.setOnClickListener {
+            val intent = Intent(context, CourseMapActivity::class.java)
+            intent.putExtra("course_idx",course_idx)
+            intent.putExtra("name",name)
+            intent.putExtra("badge",0)
+            context.startActivity(intent)
             dismiss()
         }
     }

diff --git a/...oid/app/src/main/java/com/yamgang/seoulsantaandroid/ui/map/detail/CourseDetailActivity.kt b/...oid/app/src/main/java/com/yamgang/seoulsantaandroid/ui/map/detail/CourseDetailActivity.kt
@@ -45,16 +45,16 @@ class CourseDetailActivity : AppCompatActivity() {
         getKeyhash()
 
         btn_start_course.setOnClickListener {
-            var safetyTipsDialog = SafetyTipsDialog(this)
+            var safetyTipsDialog = SafetyTipsDialog(this,course_idx,name,0)
             safetyTipsDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
             safetyTipsDialog.setCanceledOnTouchOutside(false)
             safetyTipsDialog.show()
 
-            val intent = Intent(applicationContext,CourseMapActivity::class.java)
-            intent.putExtra("course_idx",course_idx)
-            intent.putExtra("name",name)
-            intent.putExtra("badge",0)
-            startActivity(intent)
+//            val intent = Intent(applicationContext,CourseMapActivity::class.java)
+//            intent.putExtra("course_idx",course_idx)
+//            intent.putExtra("name",name)
+//            intent.putExtra("badge",0)
+//            startActivity(intent)
         }
     }
 

diff --git a/SeoulSantaAndroid/app/src/main/res/layout/activity_course_detail.xml b/SeoulSantaAndroid/app/src/main/res/layout/activity_course_detail.xml
@@ -12,8 +12,8 @@
             android:layout_alignParentTop="true"
             android:id="@+id/img_mt_present"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/mountain_img"/>
+            android:layout_height="341dp"
+            android:background="#ffffff"/>
 
     <LinearLayout
             android:id="@+id/text_layout"
@@ -84,7 +84,7 @@
                     android:fontFamily="@font/kopubworlddotumbold"
                     android:text="2코스"/>
             <RelativeLayout
-                    android:layout_width="100dp"
+                    android:layout_width="185dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
                 <TextView
@@ -107,7 +107,7 @@
 
             <RelativeLayout
 
-                    android:layout_width="100dp"
+                    android:layout_width="185dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
                 <TextView
@@ -146,7 +146,7 @@
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="20sp"
+                android:textSize="18sp"
                 android:textColor="#ffffff"
                 android:fontFamily="@font/kopubworlddotummedium"
                 android:text="코스 시작하기"/>

diff --git a/SeoulSantaAndroid/app/src/main/res/layout/item_rcv_map.xml b/SeoulSantaAndroid/app/src/main/res/layout/item_rcv_map.xml
@@ -2,13 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="wrap_content"
+              android:layout_height="90dp"
                 android:background="#ffffff">
     <RelativeLayout
-            android:layout_marginTop="21dp"
+            android:layout_marginTop="8dp"
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
             android:layout_width="match_parent"
+
             android:layout_height="70dp">
         <ImageView
                 android:layout_centerVertical="true"
@@ -43,7 +44,7 @@
                     android:fontFamily="@font/kopubworlddotumbold"
                     android:text="2코스"/>
             <RelativeLayout
-                    android:layout_width="100dp"
+                    android:layout_width="185dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
                 <TextView
@@ -65,7 +66,7 @@
             </RelativeLayout>
 
             <RelativeLayout
-                    android:layout_width="100dp"
+                    android:layout_width="185dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
                 <TextView