Skip to content

Commit 6252e4a

Browse files
authored
Merge pull request #143 from TeamSeeMeet/fix/detailView-ossLicenses
Fix/detail view oss licenses
2 parents c92911f + a8ff6f6 commit 6252e4a

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

app/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id 'kotlin-android'
44
id 'kotlin-kapt'
55
id 'com.google.gms.google-services'
6+
id 'com.google.android.gms.oss-licenses-plugin'
67
}
78

89
Properties properties = new Properties()
@@ -122,4 +123,6 @@ dependencies {
122123
implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
123124
implementation("com.squareup.okhttp3:okhttp-urlconnection:4.9.1")
124125

126+
// oss licenses plugin
127+
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
125128
}

app/src/main/java/org/seemeet/seemeet/ui/detail/DetailActivity.kt

+10-5
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,25 @@ class DetailActivity : AppCompatActivity() {
3030
viewModel.requestInvitationId(id)
3131
viewModel.requestInvitationDetail(id)
3232
initClickListener()
33-
setListObserver()
33+
planDetailObserver()
34+
canceledDetailObserver()
3435
}
3536

36-
private fun setListObserver() {
37+
private fun planDetailObserver() {
38+
val planId = intent.getIntExtra("planId", -1)
39+
if(planId != 0){
40+
onConfirmed()
41+
}
42+
}
43+
44+
private fun canceledDetailObserver(){
3745
viewModel.canceledDetail.observe(this, Observer { canceledDetail ->
3846
canceledDetail.forEach {
3947
if(it.data.isCanceled) {
4048
onCanceled()
41-
} else {
42-
onConfirmed()
4349
}
4450
}
4551
})
46-
4752
}
4853

4954
private fun initClickListener() {

app/src/main/java/org/seemeet/seemeet/ui/main/home/HomeFragment.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.databinding.DataBindingUtil
1515
import androidx.fragment.app.Fragment
1616
import androidx.fragment.app.activityViewModels
1717
import com.bumptech.glide.Glide
18+
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
1819
import org.seemeet.seemeet.R
1920
import org.seemeet.seemeet.data.SeeMeetSharedPreference
2021
import org.seemeet.seemeet.data.SeeMeetSharedPreference.getLogin
@@ -144,12 +145,7 @@ class HomeFragment : Fragment() {
144145
}
145146

146147
nvMypage.tvMypageOpenSource.setOnClickListener {
147-
startActivity(
148-
Intent(
149-
Intent.ACTION_VIEW,
150-
Uri.parse("https://be-simon.notion.site/Seemeet-a1bd07c318d14a4e981ea047e1d450cc")
151-
)
152-
)
148+
startActivity(Intent(requireContext(), OssLicensesMenuActivity::class.java))
153149
}
154150

155151
nvMypage.swPush.setOnClickListener {

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ buildscript {
1111
classpath "com.android.tools.build:gradle:7.0.2"
1212
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
1313
classpath 'com.google.gms:google-services:4.3.10'
14+
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4' // oss licenses plugin 추가
1415
// NOTE: Do not place your application dependencies here; they belong
1516
// in the individual module build.gradle files
1617
}

0 commit comments

Comments
 (0)