Skip to content

Commit 55a9634

Browse files
author
김영래
committed
[UPDATE] Add server
1 parent 9b52338 commit 55a9634

15 files changed

+280
-22
lines changed

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
## 팀원
77
* 김영래
88
* 송진우
9+
* 권하경
910

1011
# 영래와 진우가 함께 만드는 SNS
1112
## 1. 기능 명세
1213
### 초기 화면
1314
* 회원가입, 로그인
1415
* 개인정보 초기 설정(이름, 아이디, 생년월일, 프로필사진, 성별)
16+
* 회원가입 & 로그인 이메일로(추가))
17+
* 이메일로 회원가입 할 때 인증 받기
1518
* 자동로그인 기능
1619
----
1720

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</activity>
2424
<activity android:name=".Activity.MainActivity"/>
2525
<activity android:name=".Activity.SignUpActivity"/>
26+
<activity android:name=".Activity.ProfileEditActivity"/>
27+
<activity android:name=".Activity.FollowerActivity"/>
2628
</application>
2729

2830
</manifest>

‎app/src/main/java/com/gram/pictory/Activity/PostNextActivity.kt

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ import android.net.Uri
55
import android.os.Bundle
66
import android.support.v7.app.AppCompatActivity
77
import android.view.WindowManager
8+
import com.gram.pictory.Connect.Connecter
89
import kotlinx.android.synthetic.main.activity_post_next.*
910
import kotlinx.android.synthetic.main.snippet_top_postbar.*
11+
import org.jetbrains.anko.image
1012
import org.jetbrains.anko.imageBitmap
1113
import org.jetbrains.anko.imageURI
14+
import retrofit2.Call
15+
import retrofit2.Callback
16+
import retrofit2.Response
1217

1318

1419
class PostNextActivity : AppCompatActivity() {
@@ -27,9 +32,37 @@ class PostNextActivity : AppCompatActivity() {
2732

2833
imageView2.imageBitmap = (imageView2.drawable as BitmapDrawable).bitmap
2934

30-
tvPost.setOnClickListener {
35+
tvPrev.setOnClickListener {
3136
finish()
3237
}
38+
39+
tvPost.setOnClickListener {
40+
Connecter.api.post(hashMapOf(
41+
//"id" to idSignUpEditText.text,
42+
"imgURL" to imageView2.image,
43+
"postText" to postEditText.text
44+
)).enqueue(object: Callback<Unit> {
45+
override fun onResponse(call: Call<Unit>?, response: Response<Unit>?) {
46+
successPost()
47+
//Toast.makeText(this, "게시물을 올렸습니다", Toast.LENGTH_SHORT).show()
48+
finish()
49+
}
50+
51+
override fun onFailure(call: Call<Unit>?, t: Throwable?) {
52+
failPost()
53+
//Toast.makeText(this, "게시물을 올리지 못했습니다", Toast.LENGTH_SHORT).show()
54+
finish()
55+
}
56+
})
57+
}
58+
}
59+
60+
fun successPost(){
61+
// 토큰 저장
62+
}
63+
64+
fun failPost(){
65+
// 토큰
3366
}
3467

3568
}

‎app/src/main/java/com/gram/pictory/Activity/ProfileEditActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@ class ProfileEditActivity: AppCompatActivity() {
2323
"birth" to birthEditText.text
2424
))
2525
}
26+
27+
profileEditBtn.setOnClickListener {
28+
finish()
29+
}
2630
}
2731
}

‎app/src/main/java/com/gram/pictory/Activity/SignUpActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.gram.pictory.Activity
22

3+
import android.app.Activity
4+
import android.content.Intent
5+
import android.graphics.BitmapFactory
36
import android.os.Bundle
47
import android.support.v7.app.AppCompatActivity
58
import com.gram.pictory.Connect.Connecter
@@ -10,9 +13,6 @@ import org.jetbrains.anko.toast
1013
import retrofit2.Call
1114
import retrofit2.Callback
1215
import retrofit2.Response
13-
import android.content.Intent
14-
import android.graphics.BitmapFactory
15-
import android.app.Activity
1616

1717

1818
class SignUpActivity: AppCompatActivity() {
@@ -36,7 +36,7 @@ class SignUpActivity: AppCompatActivity() {
3636
"password" to pwSignUpEditText.text,
3737
"name" to nameEditText.text,
3838
"birth" to birthEditText.text
39-
)).enqueue(object: Callback<Unit>{
39+
)).enqueue(object: Callback<Unit>{
4040

4141
override fun onResponse(call: Call<Unit>?, response: Response<Unit>?) {
4242
successSignUp()

‎app/src/main/java/com/gram/pictory/Connect/API.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ interface API {
4444
@Headers("Content-Type:application/json")
4545
fun postReply(@Path("postCode") postCode: Int, @Body body: Any?): Call<Unit>
4646

47-
@PATCH("/signup/")
47+
@PATCH("/postEdit/")
4848
@Headers("Content-Type:application/json")
4949
fun signEdit(@Body body: Any?): Call<Unit>
50+
51+
5052
}

‎app/src/main/java/com/gram/pictory/Fragment/FeedFragment.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ package com.gram.pictory.Fragment
22

33
import android.os.Bundle
44
import android.support.v4.app.Fragment
5-
import android.support.v7.widget.LinearLayoutManager
65
import android.view.LayoutInflater
76
import android.view.View
87
import android.view.ViewGroup
98
import com.gram.pictory.Activity.ReplyActivity
10-
import com.gram.pictory.Adapter.FeedAdapter
119
import com.gram.pictory.Connect.Connecter.api
1210
import com.gram.pictory.Model.FeedModel
1311
import com.gram.pictory.R
1412
import com.gram.pictory.Util.FeedClickCallback
15-
import kotlinx.android.synthetic.main.fragment_feed.*
1613
import org.jetbrains.anko.support.v4.startActivity
1714
import org.jetbrains.anko.support.v4.toast
1815
import retrofit2.Call
@@ -24,8 +21,8 @@ class FeedFragment: Fragment(), FeedClickCallback {
2421
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
2522
super.onCreateView(inflater, container, savedInstanceState)
2623
val view = inflater.inflate(R.layout.fragment_feed, container, false)
27-
feed_recyclerview.layoutManager = LinearLayoutManager(activity)
28-
feed_recyclerview.adapter = FeedAdapter(setAdapterData(), this)
24+
//feed_recyclerview.layoutManager = LinearLayoutManager(activity)
25+
//feed_recyclerview.adapter = FeedAdapter(setAdapterData(), this)
2926
return view
3027
}
3128

‎app/src/main/java/com/gram/pictory/Fragment/MyLikeFragment.kt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.gram.pictory.Fragment
2+
3+
import android.os.Bundle
4+
import android.support.v4.app.Fragment
5+
import android.view.LayoutInflater
6+
import android.view.View
7+
import android.view.ViewGroup
8+
import com.gram.pictory.R
9+
10+
class MyLikeFragment : Fragment() {
11+
12+
override fun onCreate(savedInstanceState: Bundle?) {
13+
super.onCreate(savedInstanceState)
14+
}
15+
16+
override fun onCreateView(
17+
inflater: LayoutInflater, container: ViewGroup?,
18+
savedInstanceState: Bundle?
19+
): View? {
20+
// Inflate the layout for this fragment
21+
return inflater.inflate(R.layout.fragment_my_like, container, false)
22+
}
23+
}

‎app/src/main/java/com/gram/pictory/Fragment/MyPostFragment.kt

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
package com.gram.pictory.Fragment
2+
3+
import android.content.Context
4+
import android.net.Uri
5+
import android.os.Bundle
6+
import android.support.v4.app.Fragment
7+
import android.view.LayoutInflater
8+
import android.view.View
9+
import android.view.ViewGroup
10+
11+
import com.gram.pictory.R
12+
13+
// TODO: Rename parameter arguments, choose names that match
14+
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
15+
private const val ARG_PARAM1 = "param1"
16+
private const val ARG_PARAM2 = "param2"
17+
18+
/**
19+
* A simple [Fragment] subclass.
20+
* Activities that contain this fragment must implement the
21+
* [MyPostFragment.OnFragmentInteractionListener] interface
22+
* to handle interaction events.
23+
* Use the [MyPostFragment.newInstance] factory method to
24+
* create an instance of this fragment.
25+
*
26+
*/
27+
class MyPostFragment : Fragment() {
28+
// TODO: Rename and change types of parameters
29+
private var param1: String? = null
30+
private var param2: String? = null
31+
private var listener: OnFragmentInteractionListener? = null
32+
33+
override fun onCreate(savedInstanceState: Bundle?) {
34+
super.onCreate(savedInstanceState)
35+
arguments?.let {
36+
param1 = it.getString(ARG_PARAM1)
37+
param2 = it.getString(ARG_PARAM2)
38+
}
39+
}
40+
41+
override fun onCreateView(
42+
inflater: LayoutInflater, container: ViewGroup?,
43+
savedInstanceState: Bundle?
44+
): View? {
45+
// Inflate the layout for this fragment
46+
return inflater.inflate(R.layout.fragment_my_post, container, false)
47+
}
48+
49+
// TODO: Rename method, update argument and hook method into UI event
50+
fun onButtonPressed(uri: Uri) {
51+
listener?.onFragmentInteraction(uri)
52+
}
53+
54+
override fun onAttach(context: Context) {
55+
super.onAttach(context)
56+
if (context is OnFragmentInteractionListener) {
57+
listener = context
58+
} else {
59+
throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
60+
}
61+
}
62+
63+
override fun onDetach() {
64+
super.onDetach()
65+
listener = null
66+
}
67+
68+
/**
69+
* This interface must be implemented by activities that contain this
70+
* fragment to allow an interaction in this fragment to be communicated
71+
* to the activity and potentially other fragments contained in that
72+
* activity.
73+
*
74+
*
75+
* See the Android Training lesson [Communicating with Other Fragments]
76+
* (http://developer.android.com/training/basics/fragments/communicating.html)
77+
* for more information.
78+
*/
79+
interface OnFragmentInteractionListener {
80+
// TODO: Update argument type and name
81+
fun onFragmentInteraction(uri: Uri)
82+
}
83+
84+
companion object {
85+
/**
86+
* Use this factory method to create a new instance of
87+
* this fragment using the provided parameters.
88+
*
89+
* @param param1 Parameter 1.
90+
* @param param2 Parameter 2.
91+
* @return A new instance of fragment MyPostFragment.
92+
*/
93+
// TODO: Rename and change types and number of parameters
94+
@JvmStatic
95+
fun newInstance(param1: String, param2: String) =
96+
MyPostFragment().apply {
97+
arguments = Bundle().apply {
98+
putString(ARG_PARAM1, param1)
99+
putString(ARG_PARAM2, param2)
100+
}
101+
}
102+
}
103+
}

‎app/src/main/java/com/gram/pictory/Fragment/MypageFragment.kt

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,73 @@ import android.support.v4.app.Fragment
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8+
import com.gram.pictory.Activity.FollowerActivity
9+
import com.gram.pictory.Activity.ProfileEditActivity
810
import com.gram.pictory.R
11+
import kotlinx.android.synthetic.main.fragment_mypage.*
12+
import org.jetbrains.anko.support.v4.startActivity
913

1014
class MypageFragment : Fragment() {
1115

1216
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
1317
super.onCreateView(inflater, container, savedInstanceState)
1418
val view = inflater.inflate(R.layout.fragment_mypage, container, false)
19+
1520
return view
1621
}
22+
23+
24+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
25+
super.onViewCreated(view, savedInstanceState)
26+
27+
button2.setOnClickListener {
28+
startActivity<ProfileEditActivity>()
29+
}
30+
31+
see_follower.setOnClickListener {
32+
startActivity<FollowerActivity>()
33+
}
34+
35+
// fragmentManager?.beginTransaction().run {
36+
// this!!.replace(R.id.myPageFrame, MyPostFragment())
37+
// commit()
38+
// }
39+
40+
//myPageNavigationView.setOnNavigationItemSelectedListener(navigationItemSelectedListener)
41+
}
42+
43+
// private val navigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
44+
// val transaction = fragmentManager?.beginTransaction()
45+
// when (item.itemId) {
46+
// R.id.mypost -> {
47+
// transaction?.replace(R.id.myPageFrame, MyPostFragment())
48+
// transaction?.commit()
49+
// return@OnNavigationItemSelectedListener true
50+
// }
51+
// R.id.like -> {
52+
// transaction?.replace(R.id.myPageFrame, MyLikeFragment())
53+
// transaction?.commit()
54+
// return@OnNavigationItemSelectedListener true
55+
// }
56+
// }
57+
// false
58+
// }
59+
60+
// override fun onCreateContextMenu(menu: ContextMenu?, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) {
61+
// super.onCreateContextMenu(menu, v, menuInfo)
62+
// }
63+
//
64+
// override fun onContextItemSelected(item: MenuItem?): Boolean {
65+
// when(item?.itemId) {
66+
// R.id.mypost -> {
67+
// fragmentManager?.beginTransaction()?.replace(R.id.myPageFrame, MyPostFragment())?.commit()
68+
// }
69+
// R.id.like -> {
70+
// fragmentManager?.beginTransaction()?.replace(R.id.myPageFrame, MyLikeFragment())?.commit()
71+
// }
72+
// }
73+
// return super.onContextItemSelected(item)
74+
// }
75+
76+
1777
}

‎app/src/main/res/layout/activity_profile_edit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:layout_width="match_parent"
99
android:layout_height="0dp"
1010
android:layout_weight="18"
11-
android:background="#2096BA"
11+
android:background="@color/colorAccent"
1212
android:orientation="vertical">
1313

1414
<View android:layout_width="match_parent"
@@ -129,7 +129,7 @@
129129
android:text="수정"
130130
android:textColor="#FFFFFF"
131131
android:elevation="4dp"
132-
android:id="@+id/signUpBtn"/>
132+
android:id="@+id/profileEditBtn"/>
133133

134134
<View android:layout_width="match_parent"
135135
android:layout_height="0dp"

0 commit comments

Comments
 (0)