Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8cb1d19
Remove un-used resources, specify resources name
DongJun-H Nov 16, 2025
aa6e181
#704 [layout] Replace Surface with Box in ConfirmDialog
yuni-ju Nov 18, 2025
3bb6712
#704 [layout] Use “Delete” instead of “Confirm” in folder deletion di…
yuni-ju Nov 18, 2025
1457aad
#704 [feature] Add PostDeleteAlertDialog
yuni-ju Nov 18, 2025
71dd15e
#704 [feature] Show loading indicator when deleting post
yuni-ju Nov 18, 2025
103188a
#705 [layout] Remove email display in profile
yuni-ju Nov 19, 2025
abaca2f
Remove Sentry
DongJun-H Nov 19, 2025
8505b9f
Update Library versions, remove un-used/duplicate library, update tar…
DongJun-H Nov 19, 2025
bd39a69
Remove unused resources
DongJun-H Nov 19, 2025
4f299af
Merge remote-tracking branch 'origin/develop' into enhancement/issue-699
DongJun-H Nov 19, 2025
7c9aeb9
Merge pull request #708 from Daily-DAYO/enhancement/issue-699
DongJun-H Nov 25, 2025
4bdcd5f
[layout] Add Transparent Color
yuni-ju Nov 25, 2025
1466410
#707 [refactor] Replace BottomSheetScaffold with ModalBottomSheet
yuni-ju Nov 25, 2025
a31544b
#707 [refactor] Move bottom sheet handling from FeedPostView to FeedS…
yuni-ju Nov 25, 2025
e29f8bc
#707 [refactor] BottomSheetDialogState to BottomSheetController in Ma…
yuni-ju Nov 25, 2025
20671b1
#707 [refactor] BottomSheetDialogState to BottomSheetController in Ac…
yuni-ju Nov 25, 2025
af56644
Merge pull request #710 from Daily-DAYO/feature/issue-705
yuni-ju Nov 30, 2025
5f8f659
Merge pull request #711 from Daily-DAYO/bug/issue-707
yuni-ju Nov 30, 2025
9e2c2ac
Merge branch 'develop' into feature/issue-704
yuni-ju Nov 30, 2025
dced96c
Merge pull request #709 from Daily-DAYO/feature/issue-704
yuni-ju Nov 30, 2025
7715aee
[release] v2.1.2
yuni-ju Nov 30, 2025
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git

## Application Version
- minSdkVersion : 26<br>
- targetSdkVersion : 35
- targetSdkVersion : 36

## Git Convention
- Create issue<br>
Expand Down
42 changes: 14 additions & 28 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
id 'io.sentry.android.gradle'
}

Properties properties = new Properties()
Expand All @@ -14,16 +15,11 @@ def NATIVE_APP_KEY = properties.getProperty('NATIVE_APP_KEY')
def ADS_APPLICATION_ID = properties.getProperty('ADS_APPLICATION_ID')
def keystorePropertiesFile = rootProject.file("app/keystore-release.properties")

sentry {
setIncludeProguardMapping(true)
setAutoUploadProguardMapping(true)
setUploadNativeSymbols(false)
setIncludeNativeSources(false)
setAutoUpload(true)
}

kotlin {
jvmToolchain(17)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

android {
Expand All @@ -33,8 +29,8 @@ android {
applicationId "com.daily.dayo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 21000
versionName "2.1.0"
versionCode 21020
versionName "2.1.2"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -87,12 +83,6 @@ android {
buildConfigField("String", "BASE_URL", properties['BASE_URL_PROD'])
}
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures {
dataBinding true
}
namespace 'com.daily.dayo'
}

Expand All @@ -102,26 +92,22 @@ dependencies {
implementation project(':domain')
implementation project(':data')

def sentry_version = "8.24.0"
def glide_version = "4.15.1"
def glide_version = "5.0.5"

// Hilt
implementation "com.google.dagger:hilt-android:2.44"
kapt "com.google.dagger:hilt-android-compiler:2.44"
implementation "com.google.dagger:hilt-android:2.57.2"
kapt "com.google.dagger:hilt-android-compiler:2.57.2"
// Kakao sdk
implementation "com.kakao.sdk:v2-user:2.9.0"
// Glide
implementation "com.github.bumptech.glide:glide:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version"
// Sentry
implementation platform("io.sentry:sentry-bom:$sentry_version")
implementation('io.sentry:sentry-android')
implementation('io.sentry:sentry-android-fragment')
implementation 'org.slf4j:slf4j-nop:2.0.17'
// Firebase
implementation 'com.google.firebase:firebase-crashlytics-ktx'
implementation 'com.google.firebase:firebase-analytics-ktx'
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation "com.google.firebase:firebase-crashlytics"
implementation "com.google.firebase:firebase-analytics"

// Google Ads
implementation 'com.google.android.gms:play-services-ads:23.6.0'
implementation 'com.google.android.gms:play-services-ads:24.7.0'
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
package com.daily.dayo

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.daily.dayo", appContext.packageName)
}

}
7 changes: 0 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
android:supportsRtl="true"
android:theme="@style/Theme.DAYO"
android:enableOnBackInvokedCallback="true">
<meta-data android:name="io.sentry.dsn" android:value="https://7f03a2b5d1c24582bfca11c28231a45f@o4504230448136192.ingest.sentry.io/4504230448988160" />
<!-- Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
We recommend adjusting this value in production. -->
<meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
<!-- Enable user interaction tracing to capture transactions for various UI events (such as clicks or scrolls). -->
<meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />

<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/ic_dayo_logo" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/daily/dayo/DayoApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.daily.dayo
import android.app.Application
import com.bumptech.glide.Glide
import com.google.android.gms.ads.MobileAds
import com.google.firebase.Firebase
import com.google.firebase.analytics.FirebaseAnalytics
import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.ktx.Firebase
import com.google.firebase.analytics.analytics
import com.kakao.sdk.common.KakaoSdk
import dagger.hilt.android.HiltAndroidApp

Expand Down
10 changes: 0 additions & 10 deletions app/src/main/res/xml/network_security_config.xml

This file was deleted.

7 changes: 0 additions & 7 deletions app/src/test/java/com/daily/dayo/ExampleUnitTest.kt
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package com.daily.dayo

import org.junit.Test

import org.junit.Assert.*

/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}
21 changes: 10 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,25 @@
buildscript {
ext {
javaInjectVersion = '1'
kotlin_version = '1.8.20'
compose_version = '1.4.6'
nav_version = '2.6.0'
paging_version = "3.2.0"
targetSdkVersion = 35
compileSdkVersion = 35
kotlin_version = '2.2.21'
nav_version = '2.9.6'
paging_version = "3.3.6"
targetSdkVersion = 36
compileSdkVersion = 36
minSdkVersion = 26
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.13.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version")
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'io.sentry:sentry-android-gradle-plugin:4.13.0'
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.57.2'
classpath 'com.google.gms:google-services:4.4.4'
classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.6"
classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.2.21"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
42 changes: 21 additions & 21 deletions data/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
Expand All @@ -7,6 +9,9 @@ plugins {

kotlin {
jvmToolchain(17)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

Properties properties = new Properties()
Expand Down Expand Up @@ -49,46 +54,41 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}
}

dependencies {
// multiModule
implementation project(':domain')

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'com.google.android.material:material:1.13.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

// Hilt
implementation "com.google.dagger:hilt-android:2.44"
kapt "com.google.dagger:hilt-android-compiler:2.44"
kapt 'androidx.hilt:hilt-compiler:1.0.0'
implementation "com.google.dagger:hilt-android:2.57.2"
kapt "com.google.dagger:hilt-android-compiler:2.57.2"
kapt 'androidx.hilt:hilt-compiler:1.3.0'

// retrofit2
implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.9.0'
implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.9.0'
implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '2.9.0'
implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '3.0.0'
implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '3.0.0'
implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '3.0.0'
// JSON을 직렬화
implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
// 직렬화된 JSON을 객체로 역직렬화

// OKHttp
implementation "com.squareup.okhttp3:okhttp:4.9.2"
implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.2"
implementation "com.squareup.okhttp3:okhttp:5.3.0"
implementation "com.squareup.okhttp3:okhttp-urlconnection:5.3.0"
// Use for HttpLoggingInterceptor
implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
implementation "com.squareup.okhttp3:logging-interceptor:5.3.0"

// Preference
implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.preference:preference-ktx:1.2.1'

// paging
implementation "androidx.paging:paging-runtime-ktx:$paging_version"
// optional - Jetpack Compose integration
implementation "androidx.paging:paging-compose:3.2.0"
}
7 changes: 0 additions & 7 deletions data/src/test/java/daily/dayo/data/ExampleUnitTest.kt
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package daily.dayo.data

import org.junit.Test

import org.junit.Assert.*

/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}
6 changes: 5 additions & 1 deletion domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ plugins {
id 'kotlin'
}

kotlin {
jvmToolchain(17)
}

dependencies {
// Dependency Injection
implementation "javax.inject:javax.inject:$javaInjectVersion"
// OKHttp
implementation "com.squareup.okhttp3:okhttp:4.9.2"
implementation "com.squareup.okhttp3:okhttp:5.3.0"
// alternatively - without Android dependencies for tests
implementation "androidx.paging:paging-common-ktx:$paging_version"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 02 16:51:40 KST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading