Skip to content

Commit 54c4cb5

Browse files
HeonbyeongHeonbyeong
authored
Merge pull request #80 from YAPP-Github/release/release
Release/release -> develop merge
2 parents ee9b5fe + 791696b commit 54c4cb5

150 files changed

Lines changed: 1891 additions & 1128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4+
/keystore.properties
45
/.idea/caches
56
/.idea/libraries
67
/.idea/modules.xml
@@ -13,3 +14,4 @@
1314
.externalNativeBuild
1415
.cxx
1516
local.properties
17+
keystore.properties

‎.idea/deploymentTargetDropDown.xml‎

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

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
# 23rd-Android-Team-2-Android
2+
![screen1](https://github.com/YAPP-Github/23rd-Android-Team-2-Android/assets/64366488/2925d2c6-a53b-41b2-a336-2f950c448d37)

‎app/build.gradle.kts‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
2+
import java.io.FileInputStream
3+
import java.util.Properties
24

35
@Suppress("DSL_SCOPE_VIOLATION")
46
plugins {
@@ -11,19 +13,24 @@ plugins {
1113

1214
}
1315

14-
fun getApiKey(propertyKey : String): String {
15-
return gradleLocalProperties(rootDir).getProperty(propertyKey)
16-
}
17-
1816
android {
17+
signingConfigs {
18+
create("release") {
19+
storeFile =
20+
file(getKeyStore("storeFile"))
21+
storePassword = getKeyStore("storePassword")
22+
keyAlias = getKeyStore("keyAlias")
23+
keyPassword = getKeyStore("keyPassword")
24+
}
25+
}
1926
namespace = "com.moneymong.moneymong"
2027
compileSdk = 34
2128

2229
defaultConfig {
2330
applicationId = "com.moneymong.moneymong"
2431
minSdk = 24
2532
targetSdk = 34
26-
versionCode = 1
33+
versionCode = 5
2734
versionName = "1.0.0"
2835

2936
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -38,11 +45,12 @@ android {
3845

3946
buildTypes {
4047
release {
41-
isMinifyEnabled = false
48+
isMinifyEnabled = true
4249
proguardFiles(
4350
getDefaultProguardFile("proguard-android-optimize.txt"),
4451
"proguard-rules.pro"
4552
)
53+
signingConfig = signingConfigs.getByName("release")
4654
}
4755
}
4856
packaging {
@@ -80,4 +88,24 @@ dependencies {
8088
implementation(libs.orbit.viewModel)
8189

8290
implementation(libs.kakao.v2.user)
91+
92+
testImplementation(libs.junit4)
93+
androidTestImplementation(libs.androidx.junit)
94+
androidTestImplementation(libs.androidx.test.espresso.core)
95+
}
96+
97+
fun keystoreProperties(projectRootDir : File) : Properties {
98+
val keystorePropertiesFile = rootProject.file("keystore.properties")
99+
val keystoreProperties = Properties()
100+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
101+
102+
return keystoreProperties
103+
}
104+
105+
fun getApiKey(propertyKey : String): String {
106+
return gradleLocalProperties(rootDir).getProperty(propertyKey)
107+
}
108+
109+
fun getKeyStore(keystoreKey : String): String {
110+
return keystoreProperties(rootDir).getProperty(keystoreKey)
83111
}

‎app/proguard-rules.pro‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,26 @@
2626
# https://github.com/square/okhttp/pull/6792
2727
-dontwarn org.bouncycastle.jsse.**
2828
-dontwarn org.conscrypt.*
29-
-dontwarn org.openjsse.**
29+
-dontwarn org.openjsse.**
30+
31+
# --- Retrofit ---
32+
# With R8 full mode generic signatures are stripped for classes that are not
33+
# kept. Suspend functions are wrapped in continuations where the type argument
34+
# is used.
35+
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
36+
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
37+
38+
# Kotlin Result Wrapper 예외
39+
-keep class kotlin.Result { *; }
40+
41+
# R8 full mode strips generic signatures from return types if not kept.
42+
-if interface * { @retrofit2.http.* public *** *(...); }
43+
-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
44+
45+
# With R8 full mode generic signatures are stripped for classes that are not kept.
46+
-keep,allowobfuscation,allowshrinking class retrofit2.Response
47+
48+
-keep class com.moneymong.moneymong.network.request.** { *; }
49+
-keep class com.moneymong.moneymong.network.response.** { *; }
50+
-keep class com.moneymong.moneymong.domain.entity.** { *; }
51+
-keep class com.moneymong.moneymong.domain.param.** { *; }

‎app/src/live/google-services.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"project_info": {
3+
"project_number": "1091533625653",
4+
"project_id": "moneymong-9e794",
5+
"storage_bucket": "moneymong-9e794.appspot.com"
6+
},
7+
"client": [
8+
{
9+
"client_info": {
10+
"mobilesdk_app_id": "1:1091533625653:android:f8c3edecf6f6108fad547c",
11+
"android_client_info": {
12+
"package_name": "com.moneymong.moneymong.live"
13+
}
14+
},
15+
"oauth_client": [],
16+
"api_key": [
17+
{
18+
"current_key": "AIzaSyAb9dOMs-B-u9YynEWdtV9nrq_VbMpAXtg"
19+
}
20+
],
21+
"services": {
22+
"appinvite_service": {
23+
"other_platform_oauth_client": []
24+
}
25+
}
26+
},
27+
{
28+
"client_info": {
29+
"mobilesdk_app_id": "1:1091533625653:android:435637da7f3d4352ad547c",
30+
"android_client_info": {
31+
"package_name": "com.moneymong.moneymong.tb"
32+
}
33+
},
34+
"oauth_client": [],
35+
"api_key": [
36+
{
37+
"current_key": "AIzaSyAb9dOMs-B-u9YynEWdtV9nrq_VbMpAXtg"
38+
}
39+
],
40+
"services": {
41+
"appinvite_service": {
42+
"other_platform_oauth_client": []
43+
}
44+
}
45+
}
46+
],
47+
"configuration_version": "1"
48+
}

‎app/src/live/ic_moneymong-playstore.png‎

41.6 KB
Loading

‎app/src/live/res/drawable/ic_moneymong_background.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<vector
3+
android:height="108dp"
4+
android:width="108dp"
5+
android:viewportHeight="108"
6+
android:viewportWidth="108"
7+
xmlns:android="http://schemas.android.com/apk/res/android">
8+
<path android:fillColor="#3DDC84"
9+
android:pathData="M0,0h108v108h-108z"/>
10+
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
11+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
12+
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
13+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
14+
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
15+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
16+
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
17+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
18+
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
19+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
20+
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
21+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
22+
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
23+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
24+
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
25+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
26+
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
27+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
28+
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
29+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
30+
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
31+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
32+
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
33+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
34+
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
35+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
36+
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
37+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
38+
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
39+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
40+
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
41+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
42+
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
43+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
44+
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
45+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
46+
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
47+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
48+
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
49+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
50+
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
51+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
52+
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
53+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
54+
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
55+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
56+
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
57+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
58+
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
59+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
60+
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
61+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
62+
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
63+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
64+
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
65+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
66+
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
67+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
68+
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
69+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
70+
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
71+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
72+
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
73+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
74+
</vector>

‎app/src/live/res/mipmap-anydpi-v26/ic_moneymong.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@drawable/ic_moneymong_background"/>
4+
<foreground android:drawable="@mipmap/ic_moneymong_foreground"/>
5+
</adaptive-icon>

‎app/src/live/res/mipmap-anydpi-v26/ic_moneymong_round.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@drawable/ic_moneymong_background"/>
4+
<foreground android:drawable="@mipmap/ic_moneymong_foreground"/>
5+
</adaptive-icon>

0 commit comments

Comments
 (0)