Dev

app/build.gradle

@@ -20,17 +20,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
+    implementation "android.arch.lifecycle:extensions:1.1.1"
+    annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
+
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
+
+    kapt "com.android.databinding:compiler:3.0.1"
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.10'
 }

app/src/main/AndroidManifest.xml

@@ -1,35 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mashup.loling">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".drawpaper.LoadImageActivity" />
-        <activity android:name=".drawpaper.DrawPaperActivity" />
-        <activity android:name=".room.AuthorListDetailActivity" />
-        <activity android:name=".room.AuthorListActivity" />
-        <activity android:name=".room.SelectTargetActivity" />
-        <activity android:name=".SelectFriendActivity" />
-
-        <activity android:name=".MainActivity">
+
+        <activity android:name=".IntroActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".LoginActivity" />
-        <activity android:name=".MyPageActivity" />
-        <activity android:name=".SignupPersonalActivity" />
-        <activity android:name=".SignupEntryActivity" />
-        <activity android:name=".SignupPhotoActivity" />
-        <activity android:name=".MyPageSettingActivity" />
-    </application>
+        <activity android:name=".user.view.LoginActivityDataBinding"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".user.view.SignupEntryActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".user.view.SignupPersonalActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".user.view.SignupPhotoActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".mypage.MyPageActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".mypage.MyPageSettingActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".room.view.AuthorListActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".room.view.AuthorListDetailActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".room.view.ReceivedPaperRoomActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".room.view.ReceivedPaperListActivity"
+            android:configChanges="orientation"
+            android:parentActivityName=".main.MainActivity"
+            android:screenOrientation="portrait">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".main.MainActivity" />
+        </activity>
+
+        <activity android:name=".room.view.SelectFriendActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".room.view.CreateRoomActivity"
+            android:theme="@style/Theme.CustomDialogActivity"
+
+            android:screenOrientation="portrait"/>
+        <activity android:name=".drawpaper.view.DrawPaperActivity"
+            android:screenOrientation="portrait"/>
 
+        <activity
+            android:name=".main.PaperNotiActivity"
+            android:theme="@style/Theme.AppCompat.Translucent"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".main.MainActivity"
+            android:screenOrientation="portrait">
+        </activity>
+
+    </application>
 </manifest>

app/src/main/java/mashup/loling/Adapter/AuthorListItemAdapter.kt

@@ -0,0 +1,36 @@
+package mashup.loling.Adapter
+
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import kotlinx.android.synthetic.main.item_author_list.view.*
+import mashup.loling.R
+import mashup.loling.model.Paper
+
+
+class AuthorListItemAdapter(var items : ArrayList<Paper>) : RecyclerView
+.Adapter<AuthorListItemAdapter.ViewHolder>(){
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var authorListItemName : TextView = itemView.tvAuthorListItemName
+        var authorListItemTime : TextView = itemView.tvAuthorListItemDate
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, p1: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_author_list, parent, false)
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val item = items[position]
+        viewHolder.authorListItemName.text = item.name
+        viewHolder.authorListItemTime.text = item.createdAt.toString()+ item.dueDay.toString()
+    }
+}

app/src/main/java/mashup/loling/Adapter/CreateRoomPagerAdapter.kt

@@ -0,0 +1,82 @@
+package mashup.loling.Adapter
+
+import android.content.Context
+import android.support.v4.view.PagerAdapter
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.layout_create_room_calendar.view.*
+import kotlinx.android.synthetic.main.layout_create_room_main.view.*
+import kotlinx.android.synthetic.main.layout_create_room_new_or_enter.view.*
+import mashup.loling.R
+import mashup.loling.room.view.CreateRoomActivity
+import java.util.*
+
+class CreateRoomPagerAdapter(val context: Context,
+                             val createRoomMethods : CreateRoomActivity.Companion
+                             .ICreateRoomMethods, val name : String)
+    : PagerAdapter() {
+
+    companion object {
+        val PAGE_CALENDAR = 0
+        val PAGE_MAIN = 1
+        val PAGE_EXISTED_CHK = 2
+        val PAGE_EXISTED_LOLING_LIST = 3
+    }
+
+    override fun isViewFromObject(p0: View, p1: Any): Boolean {
+        return p0 == p1
+    }
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Any {
+        lateinit var view: ViewGroup
+        val inflater = LayoutInflater.from(context)
+        when(position) {
+            PAGE_CALENDAR -> {
+                view = inflater.inflate(R.layout.layout_create_room_calendar, container, false) as ViewGroup
+                view.btnOkay.setOnClickListener {
+                    val selDate = Date()
+                    selDate.year = view.calSelectDate.year - 1900
+                    selDate.month = view.calSelectDate.month
+                    selDate.date = view.calSelectDate.dayOfMonth
+                    createRoomMethods.onDateSelectedFromCal(selDate)
+                }
+                view.btnCancel.setOnClickListener { createRoomMethods.onCancelFromCal() }
+            }
+
+            PAGE_EXISTED_CHK -> {
+                view = inflater.inflate(R.layout.layout_create_room_new_or_enter, container, false) as ViewGroup
+                view.btnCreateNewLoling.setOnClickListener { createRoomMethods.onCreateNewLolingClicked() }
+                view.btnJoinExistedLoling.setOnClickListener { createRoomMethods.onJoinExitedLolingClicked() }
+            }
+
+            PAGE_EXISTED_LOLING_LIST -> {
+                view = inflater.inflate(R.layout.layout_create_room_existed_loling_list, container, false) as ViewGroup
+
+            }
+            else-> { //PAGE_MAIN
+                view = inflater.inflate(R.layout.layout_create_room_main, container, false) as ViewGroup
+                view.tvRoomDate.setOnClickListener { createRoomMethods.onSelectRoomTextClicked() }
+                view.btnCreateLoling.setOnClickListener { createRoomMethods.onCreateLolingButtonClicked() }
+                view.tvNameAndText.text = String.format(
+                        context.getString(R.string.create_room_ps_type_the_anniversary_date), name)
+
+            }
+        }
+
+        container.addView(view)
+        container.setTag(container.hashCode() + position, view)
+        return view
+    }
+
+
+
+    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+        container.removeView(`object` as View)
+    }
+
+    override fun getCount(): Int {
+        return 4    //only 4 items
+    }
+
+}

app/src/main/java/mashup/loling/Adapter/FriendItemAdapter.kt

@@ -1,22 +1,27 @@
 package mashup.loling.Adapter
 
+import android.content.Context
+import android.content.Intent
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import kotlinx.android.synthetic.main.item_friend_day_list.view.*
-import mashup.loling.model.FriendItem
 import mashup.loling.R
+import mashup.loling.model.ERoom
+import mashup.loling.room.view.CreateRoomActivity
 
-class FriendItemAdapter(var items : ArrayList<FriendItem>) : RecyclerView.Adapter<FriendItemAdapter.ViewHolder>(){
+class FriendItemAdapter(val context : Context ,var items : ArrayList<ERoom>) : RecyclerView
+.Adapter<FriendItemAdapter.ViewHolder>(){
 
     public class ViewHolder : RecyclerView.ViewHolder{
         constructor(itemView: View) : super(itemView)
 
         var friendItemName : TextView = itemView.tvFriendItemName
         var friendItemBday : TextView = itemView.tvFriendItemBday
         var friendItemDday : TextView = itemView.tvFriendItemDday
+        var friendItemBtn  = itemView.btnFriendItem
 
     }
 
@@ -32,8 +37,16 @@ class FriendItemAdapter(var items : ArrayList<FriendItem>) : RecyclerView.Adapte
 
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
         val item = items[position]
-        viewHolder.friendItemName.text = item.friendItemName
-        viewHolder.friendItemBday.text = item.friendItemBday
-        viewHolder.friendItemDday.text = item.friendItemDday
+        viewHolder.friendItemName.text = item.name
+        viewHolder.friendItemBday.text = item.date
+        viewHolder.friendItemDday.text = "D-" + item.Dday
+
+        viewHolder.friendItemBtn.setOnClickListener {
+            val intent = Intent(context, CreateRoomActivity::class.java)
+            intent.putExtra("name",item.name)
+            intent.putExtra("phoneNum",item.phone)
+            context.startActivity(intent)
+        }
+
     }
 }

app/src/main/java/mashup/loling/Adapter/LolingItemAdapter.kt

@@ -1,29 +1,41 @@
 package mashup.loling.Adapter
 
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.support.v7.app.AlertDialog
 import android.support.v7.widget.RecyclerView
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageButton
 import android.widget.TextView
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_select_friend.view.*
+import kotlinx.android.synthetic.main.dialog_delete_list.view.*
 import kotlinx.android.synthetic.main.item_loling_list.view.*
 import mashup.loling.model.FriendItem
 import mashup.loling.R
 
 
 class LolingItemAdapter(var items : ArrayList<FriendItem>) : RecyclerView.Adapter<LolingItemAdapter.ViewHolder>(){
 
-    public class ViewHolder : RecyclerView.ViewHolder{
+    var papa : ViewGroup? = null
+    class ViewHolder : RecyclerView.ViewHolder{
         constructor(itemView: View) : super(itemView)
 
         var friendItemName : TextView = itemView.tvLolingItem
         var friendItemBday : TextView = itemView.tvLolingItemBday
         var friendItemDday : TextView = itemView.tvLolingItemDday
+        var btnDelete: ImageButton = itemView.btnLolingDelete
 
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, p1: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.item_loling_list, parent, false)
+        papa=parent
         return ViewHolder(view)
     }
 
@@ -36,5 +48,18 @@ class LolingItemAdapter(var items : ArrayList<FriendItem>) : RecyclerView.Adapte
         viewHolder.friendItemName.text = item.friendItemName
         viewHolder.friendItemBday.text = item.friendItemBday
         viewHolder.friendItemDday.text = item.friendItemDday
+
+        viewHolder.btnDelete.setOnClickListener { v ->
+            var builder = AlertDialog.Builder(v!!.context)
+            var mView = LayoutInflater.from(v.context)
+                    .inflate(R.layout.dialog_delete_list, papa, false)
+            builder.setView(mView)
+            var dialog = builder.create()
+            dialog.window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            dialog.show()
+
+        }
+
     }
+
 }