Skip to content

Commit 4b5bcf3

Browse files
eshc123eshc123
authored
Merge pull request #70 from Nexters/dev
Release 1.0.2
2 parents 8244b78 + 00cc90b commit 4b5bcf3

File tree

262 files changed

+3142
-1383
lines changed

Some content is hidden

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

262 files changed

+3142
-1383
lines changed

‎LICENSE‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2024 Team Goalpanzi
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
![Mission Mate](https://github.com/user-attachments/assets/531b3c01-0b03-4694-997f-b702dd7e5c66)
2+
3+
***Achieving goals with friends!***
4+
5+
<a href="https://play.google.com/store/apps/details?id=com.goalpanzi.mission_mate"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="70"></a>
6+
7+
8+
# Mission Mate App
9+
10+
[![Kotlin](https://img.shields.io/badge/Kotlin-2.0.0%2B-purple?logo=kotlin)](https://kotlinlang.org)
11+
[![api](https://img.shields.io/badge/API-26%2B-green?logo=android)](https://developer.android.com/distribute/best-practices/develop/target-sdk)
12+
[![apache](https://img.shields.io/badge/License-Apache2.0-blue?logo=apache)]()
13+
14+
![screen shots](https://github.com/user-attachments/assets/0a90af95-75fd-4ef8-96c2-f84ccdf84ccd)
15+
16+
*1. Create a mission!*
17+
18+
*2. Invite friends!*
19+
20+
*3. Achieve goals on the board!!*
21+
22+
## Architecture
23+
![Architecture](https://github.com/user-attachments/assets/82c34ea9-c6ff-4cf8-a327-9917cbcf28ad)
24+
> Mission Mate App Architecture based on the Clean Architecture
25+
26+
27+
## Modularization
28+
![Module](https://github.com/user-attachments/assets/3dfd0d61-2f5f-4d60-81a4-6440898a6cb1)
29+
30+
31+
## Stack & Libraries
32+
- Kotlin & Coroutine
33+
- Jetpack Compose
34+
- DataStore
35+
- Hilt
36+
- Retrofit2, OkHttp3
37+
- Coil
38+
- Baloon
39+
- Lottie
40+
41+
## Contributors
42+
| eshc123 | bywindow |
43+
| :------: | :------: |
44+
| <img src="https://avatars.githubusercontent.com/u/50227341?v=4" width="180"/> | <img src="https://avatars.githubusercontent.com/u/45834367?v=4" width="180px"/> |
45+
| Seokjoon Jung | Changyeop Lee |
46+
47+
## License
48+
49+
Copyright 2024 Team Goalpanzi
50+
51+
Licensed under the Apache License, Version 2.0 (the "License");
52+
you may not use this file except in compliance with the License.
53+
You may obtain a copy of the License at
54+
55+
http://www.apache.org/licenses/LICENSE-2.0
56+
57+
Unless required by applicable law or agreed to in writing, software
58+
distributed under the License is distributed on an "AS IS" BASIS,
59+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
60+
See the License for the specific language governing permissions and
61+
limitations under the License.

‎app/build.gradle.kts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId = "com.goalpanzi.mission_mate"
1717
minSdk = 26
1818
targetSdk = 34
19-
versionCode = 4
20-
versionName = "1.0.1"
19+
versionCode = 5
20+
versionName = "1.0.2"
2121

2222
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2323
vectorDrawables {
@@ -74,5 +74,11 @@ dependencies {
7474
implementation(project(":feature:main"))
7575
implementation(project(":feature:login"))
7676
implementation(project(":core:designsystem"))
77-
implementation(project(":core:data"))
77+
78+
implementation(project(":core:data:auth"))
79+
implementation(project(":core:data:common"))
80+
implementation(project(":core:data:mission"))
81+
implementation(project(":core:data:onboarding"))
82+
implementation(project(":core:data:setting"))
83+
implementation(project(":core:data:user"))
7884
}

core/data/.gitignore renamed to core/data/auth/.gitignore

File renamed without changes.

‎core/data/auth/build.gradle.kts‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
3+
plugins {
4+
alias(libs.plugins.android.library)
5+
alias(libs.plugins.jetbrains.kotlin.android)
6+
alias(libs.plugins.hilt.android)
7+
alias(libs.plugins.kotlin.ksp)
8+
}
9+
10+
android {
11+
namespace = "com.goalpanzi.mission_mate.core.data.auth"
12+
compileSdk = 34
13+
14+
defaultConfig {
15+
minSdk = 26
16+
17+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
}
19+
20+
buildTypes {
21+
release {
22+
proguardFiles(
23+
getDefaultProguardFile("proguard-android-optimize.txt"),
24+
"proguard-rules.pro"
25+
)
26+
}
27+
}
28+
compileOptions {
29+
sourceCompatibility = JavaVersion.VERSION_17
30+
targetCompatibility = JavaVersion.VERSION_17
31+
}
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget.set(JvmTarget.JVM_17)
35+
}
36+
}
37+
}
38+
39+
dependencies {
40+
41+
implementation(libs.bundles.test)
42+
implementation(libs.bundles.coroutines)
43+
implementation(libs.retrofit)
44+
45+
ksp(libs.hilt.compiler)
46+
implementation(libs.hilt.android)
47+
48+
implementation(project(":core:data:common"))
49+
implementation(project(":core:domain:common"))
50+
implementation(project(":core:domain:auth"))
51+
implementation(project(":core:network"))
52+
implementation(project(":core:datastore"))
53+
implementation(project(":core:navigation"))
54+
}

‎core/data/auth/consumer-rules.pro‎

Whitespace-only changes.

core/domain/proguard-rules.pro renamed to core/data/auth/proguard-rules.pro

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,4 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
22-
23-
-keep class * { *; }
24-
-keep interface * { *; }
25-
26-
# Keep Dependency Injection Framework related classes and methods
27-
-keep class dagger.hilt.** { *; }
28-
-keep class javax.inject.** { *; }
29-
-keep class javax.annotation.** { *; }
21+
#-renamesourcefileattribute SourceFile

core/domain/src/main/AndroidManifest.xml renamed to core/data/auth/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
</manifest>
4+
</manifest>

‎core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/AuthTokenExpirationHandler.kt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.goalpanzi.mission_mate.core.data.auth
2+
3+
import com.goalpanzi.mission_mate.core.datastore.datasource.AuthDataSource
4+
import com.goalpanzi.mission_mate.core.datastore.datasource.DefaultDataSource
5+
import com.goalpanzi.mission_mate.core.datastore.datasource.MissionDataSource
6+
import com.goalpanzi.mission_mate.core.navigation.NavigationEventHandler
7+
import com.goalpanzi.mission_mate.core.navigation.di.AuthNavigation
8+
import com.goalpanzi.mission_mate.core.network.TokenExpirationHandler
9+
import kotlinx.coroutines.flow.collect
10+
import javax.inject.Inject
11+
12+
class AuthTokenExpirationHandler @Inject constructor(
13+
private val authDataSource: AuthDataSource,
14+
private val defaultDataSource: DefaultDataSource,
15+
private val missionDataSource: MissionDataSource,
16+
@AuthNavigation private val authNavigationEventHandler: NavigationEventHandler
17+
) : TokenExpirationHandler {
18+
19+
override suspend fun handleRefreshTokenExpiration() {
20+
clearCachedData()
21+
authNavigationEventHandler.triggerRouteToNavigate("RouteModel.Login")
22+
}
23+
24+
private suspend fun clearCachedData(){
25+
authDataSource.setAccessToken("")
26+
authDataSource.setRefreshToken("")
27+
defaultDataSource.clearUserData().collect()
28+
missionDataSource.clearMissionData().collect()
29+
}
30+
}

0 commit comments

Comments
 (0)