Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import java.util.Properties

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.crashlytics)
alias(libs.plugins.hilt.android)
id("kotlin-parcelize")
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
id("kotlin-android")
id("kotlin-kapt")
id("dagger.hilt.android.plugin")
id("com.google.android.gms.oss-licenses-plugin")
}

android {
Expand Down Expand Up @@ -54,6 +55,7 @@ android {

debug {
// applicationIdSuffix = ".debug"
// isDebuggable = false

val p = Properties()
p.load(project.rootProject.file("local.properties").reader())
Expand Down Expand Up @@ -150,6 +152,9 @@ dependencies {

// Timber for logging
implementation(libs.timber)

// OSS
implementation(libs.oss.licenses)
}

kapt {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
android:theme="@style/Theme.EatSSUAndroid"
android:usesCleartextTraffic="true"
tools:targetApi="31">

<meta-data
android:name="com.google.android.gms.oss.licenses.enabled"
android:value="true" />
<receiver
android:name=".alarm.NotificationReceiver"
android:enabled="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.eatssu.android.presentation.mypage.myreview.MyReviewListActivity
import com.eatssu.android.presentation.mypage.terms.WebViewActivity
import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeActivity
import com.eatssu.android.presentation.util.showToast
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import com.eatssu.android.presentation.util.startActivity
import com.google.android.material.snackbar.Snackbar
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -124,6 +125,10 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
startActivity<DeveloperActivity>()
}

binding.llOss.setOnClickListener {
startActivity<OssLicensesMenuActivity>()
}

binding.llAppVersion.setOnClickListener {
moveToPlayStore()
}
Expand Down
35 changes: 35 additions & 0 deletions app/src/main/res/layout/activity_my_page.xml
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,41 @@
app:tint="@color/gray300" />
</LinearLayout>

<!-- 오픈소스 라이브러리 -->
<LinearLayout
android:id="@+id/ll_oss"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingStart="24dp"
android:paddingTop="18dp"
android:paddingEnd="24dp"
android:paddingBottom="18dp">

<TextView
style="@style/Body1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/oss_licenses"
android:textColor="@color/black" />

<android.widget.Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />

<ImageButton
android:id="@+id/btn_oss"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:scaleType="fitCenter"
android:src="@drawable/ic_arrow_right"
app:tint="@color/gray300" />
</LinearLayout>

<!-- 탈퇴하기 -->
<TextView
android:id="@+id/tv_logout"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,6 @@
<string name="policy_url">https://github.com/EAT-SSU/Docs/wiki/EAT%E2%80%90SSU-%EA%B0%9C%EC%9D%B8%EC%A0%95%EB%B3%B4%EC%B2%98%EB%A6%AC%EB%B0%A9%EC%B9%A8</string>
<string name="terms_url">https://github.com/EAT-SSU/Docs/wiki/EAT%E2%80%90SSU-%EC%84%9C%EB%B9%84%EC%8A%A4-%EC%9D%B4%EC%9A%A9%EC%95%BD%EA%B4%80</string>
<string name="kakao_talk_channel_url">http://pf.kakao.com/_ZlVAn</string>

<string name="oss_licenses">오픈소스 라이브러리</string>
</resources>
6 changes: 6 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ plugins {
alias(libs.plugins.firebase.crashlytics) apply false
alias(libs.plugins.hilt.android) apply false
}

buildscript {
dependencies {
classpath(libs.oss.licenses.plugin)
}
}
7 changes: 6 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ firebase-crashlytics = "2.9.9"
timber = "5.0.1"
google-services = "4.4.2"
kotlin-android = "1.8.10"
ossLicenses = "17.1.0"
ossLicensesPlugin = "0.10.4"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
Expand Down Expand Up @@ -81,6 +83,9 @@ firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }

timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "ossLicenses" }
oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "ossLicensesPlugin" }




Expand All @@ -90,4 +95,4 @@ android-library = { id = "com.android.library", version.ref = "android" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-android" }
google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ pluginManagement {
google()
mavenCentral()
maven { url='https://jitpack.io'}
// maven { url 'https://devrepo.kakao.com/nexus/content/groups/public/' }

}
}
dependencyResolutionManagement {
Expand Down