Skip to content

Commit 2f2346e

Browse files
committed
feature:
- fragment에 데이터 넘기는 중
1 parent c658d63 commit 2f2346e

7 files changed

Lines changed: 37 additions & 8 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
compileSdkVersion 28
1717
defaultConfig {
1818
applicationId "com.seok.gfd"
19-
minSdkVersion 21
19+
minSdkVersion 26
2020
targetSdkVersion 28
2121
versionCode 6
2222
versionName "2.16.6"

app/src/main/java/com/seok/gfd/utils/CommonUtils.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package com.seok.gfd.utils
22

3+
import com.google.gson.Gson
4+
import com.google.gson.GsonBuilder
5+
36
class CommonUtils private constructor(){
47
private object INSTANCE{
58
val instance = CommonUtils()
9+
val gson = GsonBuilder().create()
610
}
711

812
private var screenWidth = 0f
913
private var screenHeight = 0f
1014

1115
companion object{
1216
val instance : CommonUtils by lazy { INSTANCE.instance }
17+
val gson : Gson by lazy { INSTANCE.gson }
1318
}
1419

1520
fun getScreenWidth(): Float {

app/src/main/java/com/seok/gfd/views/LoginActivity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class LoginActivity : AppCompatActivity() {
2525
private lateinit var userViewModel: UserViewModel
2626
private lateinit var sharedPreference: SharedPreference
2727
private lateinit var progressbar: ProgressbarDialog
28-
private var loginButtonClicked: Boolean = true
2928

3029
override fun onCreate(savedInstanceState: Bundle?) {
3130
super.onCreate(savedInstanceState)
@@ -79,7 +78,6 @@ class LoginActivity : AppCompatActivity() {
7978
})
8079
userViewModel.userInfo.observe(this, Observer {
8180
sharedPreference.setValueObject(application.getString(R.string.user_info), it)
82-
userViewModel.signInUserInfo(it)
8381
})
8482
}
8583

app/src/main/java/com/seok/gfd/views/Main2Fragment.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
88
import androidx.fragment.app.Fragment
9+
import com.ogaclejapan.smarttablayout.utils.v4.Bundler
910
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter
1011
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems
1112
import com.seok.gfd.R
13+
import com.seok.gfd.retrofit.domain.User
1214
import com.seok.gfd.utils.CommonUtils
15+
import com.seok.gfd.utils.SharedPreference
1316
import kotlinx.android.synthetic.main.fragment_main2.*
17+
import java.time.LocalDate
1418

1519
class Main2Fragment : Fragment() {
16-
lateinit var commonUtils: CommonUtils
20+
private lateinit var commonUtils: CommonUtils
21+
private lateinit var sharedPreference: SharedPreference
22+
private lateinit var user: User
1723

1824
override fun onCreateView(
1925
inflater: LayoutInflater,
@@ -30,20 +36,25 @@ class Main2Fragment : Fragment() {
3036
}
3137

3238
private fun init() {
39+
sharedPreference = SharedPreference(this.activity!!.application)
40+
user = sharedPreference.getValueObject(getString(R.string.user_info))
3341
commonUtils = CommonUtils.instance
3442

43+
val user = User("test1","test1","test1")
3544
val adapter = FragmentPagerItemAdapter(
3645
activity?.supportFragmentManager, FragmentPagerItems.with(activity)
37-
.add("2020", MainSub1::class.java)
46+
.add("2020", MainSub1::class.java, MainSub1.arguments(user))
3847
.add("2019", MainSub2::class.java)
3948
.add("2018", MainSub3::class.java).create()
4049
)
50+
4151
main_view_pager.adapter = adapter
4252

4353
main_tab_smart_layout.setViewPager(main_view_pager)
4454
}
4555

4656
private fun initSetUI() {
57+
main_tv_today.text = LocalDate.now().toString()
4758
main_top_scalable_layout.scaleWidth = commonUtils.getScreenWidth()
4859
main_top_scalable_layout.scaleHeight = commonUtils.getScreenHeight()
4960
}

app/src/main/java/com/seok/gfd/views/MainSub1.kt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,20 @@ import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
77
import androidx.fragment.app.Fragment
8+
import com.ogaclejapan.smarttablayout.utils.v4.Bundler
89
import com.seok.gfd.R
10+
import com.seok.gfd.retrofit.domain.User
11+
import com.seok.gfd.utils.CommonUtils
912

1013
class MainSub1 : Fragment() {
1114

15+
companion object{
16+
fun arguments(param : User) : Bundle{
17+
val str = CommonUtils.gson.toJson(param)
18+
return Bundler().putString("key", str).get()
19+
}
20+
}
21+
1222
override fun onCreateView(
1323
inflater: LayoutInflater,
1424
container: ViewGroup?,
@@ -19,5 +29,10 @@ class MainSub1 : Fragment() {
1929

2030
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
2131
super.onViewCreated(view, savedInstanceState)
32+
33+
val t = arguments?.getString("key")
34+
val user = CommonUtils.gson.fromJson(t, User::class.java)
35+
user
2236
}
23-
}
37+
38+
}

app/src/main/res/layout/fragment_main2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
android:layout_width="match_parent"
212212
android:layout_height="match_parent"
213213
android:layout_below="@id/main_tab_smart_layout"
214-
app:scale_height="1300"
214+
app:scale_height="1080"
215215
app:scale_top="620"
216216
app:scale_width="1080"/>
217217

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<string name="banner_ad_unit_id_for_test">ca-app-pub-3940256099942544/6300978111</string>
6161

6262

63-
<string name="hello_blank_fragment">Hello blank fragment</string>
63+
<string name="hello_blank_fragment">Hello blank fragmentㅏ어ㅏㅣ엄님어나ㅣ;ㅇㄴㅁㅇ너ㅣㅁㅇ넝ㄴ머ㅣㅇ나멍넝ㅁ나ㅣㅓㅁㅇ니ㅏㅇ너ㅣㅏㅇ나ㅣㅁ어</string>
6464

6565

6666
</resources>

0 commit comments

Comments
 (0)