Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] update README.MD #45

Merged
merged 8 commits into from
May 25, 2024
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
45 changes: 44 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,59 @@
> NOW SOPT 34th ํ•ฉ๋™ ์„ธ๋ฏธ๋‚˜ ์•ฑ 4์กฐ AndroidํŒ€ <br>
24.05.11 - 24.05.24

![KREAM](https://github.com/NOW-SOPT-APP4-KREAM/KREAM-Android/assets/103172971/d3d9b1c3-81ef-47ef-8a73-bcbbc48b13e9)

## ๐Ÿจ *****Contributors*****
| ๋ฐฐ์ง€ํ˜„ <br> [@jihyunniiii](https://github.com/jihyunniiii) | ๋ฐ•ํšจ๋นˆ <br> [@Hyobeen-Park](https://github.com/Hyobeen-Park) | ์‹ ๋ฏผ์„ <br>[@t1nm1ksun](https://github.com/t1nm1ksun) |
|:---:|:-----------------------------------------------------------------------------:|:-----------------------------------------------------------------------------:|
| <img width="250" src="https://avatars.githubusercontent.com/u/103172971?v=4"/> | <img width="250" src="https://avatars.githubusercontent.com/u/98209004?v=4"/> | <img width="250" src="https://avatars.githubusercontent.com/u/122257945?v=4"/> |
| `View3 (๊ฒ€์ƒ‰ ํŽ˜์ด์ง€)`,`View4 (์ƒํ’ˆ ์ƒ์„ธ ํŽ˜์ด์ง€)` |`View1 (๋ฐœ๋งค์ •๋ณด ํŽ˜์ด์ง€)`|`View2 (์ถ”์ฒœ ํŽ˜์ด์ง€)`|


## ๐Ÿ“— *****Convention*****
[๐Ÿ“• Git Convention & Branch Strategy](https://jihyunniiii.notion.site/Git-Convention-Branch-Strategy-a524c11f5ea44c74b41177becd945102?pvs=4)
<br>
[๐Ÿ“˜ Android Coding Convention](https://jihyunniiii.notion.site/Android-Coding-Convention-027eef4f49d8434da8e4783b5ff7ce10?pvs=4)
<br>
[๐Ÿ“’ Package Convention](https://jihyunniiii.notion.site/Package-Convention-9f1c20d264b840e6850c48a618dc8b42?pvs=4)
[๐Ÿ“’ Package Convention](https://jihyunniiii.notion.site/Package-Convention-9f1c20d264b840e6850c48a618dc8b42?pvs=4)

## ๐Ÿ“ท *****ScreenShot*****

https://github.com/NOW-SOPT-APP4-KREAM/KREAM-Android/assets/103172971/34d07a0b-2b58-48d2-98ad-c31c63b310a3


## ๐Ÿ“ *****Foldering*****

```
๐Ÿ“‚ org.sopt.kream
โ”ฃ ๐Ÿ“‚ data
โ”ƒ โ”ฃ ๐Ÿ“‚ datasource
โ”ƒ โ”ฃ ๐Ÿ“‚ datasourceimpl
โ”ƒ โ”ฃ ๐Ÿ“‚ mapper
โ”ƒ โ”ฃ ๐Ÿ“‚ model
โ”ƒ โ”ƒ โ”ฃ ๐Ÿ“‚ request
โ”ƒ โ”ƒ โ”ฃ ๐Ÿ“‚ response
โ”ƒ โ”ฃ ๐Ÿ“‚ repository
โ”ƒ โ”ฃ ๐Ÿ“‚ service
โ”ฃ ๐Ÿ“‚ domain
โ”ƒ โ”ฃ ๐Ÿ“‚ model
โ”ƒ โ”ฃ ๐Ÿ“‚ repository
โ”ฃ ๐Ÿ“‚ presentation
โ”ƒ โ”ฃ ๐Ÿ“‚ common
โ”ƒ โ”ฃ ๐Ÿ“‚ model
โ”ƒ โ”ฃ ๐Ÿ“‚ type
โ”ƒ โ”ฃ ๐Ÿ“‚ย ui
โ”ƒ โ”ƒ โ”ฃ ๐Ÿ“‚ main
โ”ƒ โ”ƒ โ”ฃ ๐Ÿ“‚ productdetail
โ”ƒ โ”ƒ โ”ฃ ๐Ÿ“‚ search
โ”ฃ ๐Ÿ“‚ theme
โ”ฃ ๐Ÿ“‚ util
โ”ƒ โ”ฃ ๐Ÿ“‚ base
โ”ƒ โ”ฃ ๐Ÿ“‚ component
โ”ƒ โ”ฃ ๐Ÿ“‚ context
โ”ƒ โ”ฃ ๐Ÿ“‚ fragment
โ”ƒ โ”ฃ ๐Ÿ“‚ int
โ”ƒ โ”ฃ ๐Ÿ“‚ intent
โ”ƒ โ”ฃ ๐Ÿ“‚ modifier
โ”ƒ โ”ฃ ๐Ÿ“‚ modifier
```
2 changes: 0 additions & 2 deletions app/src/main/java/org/sopt/kream/data/ApiFactory.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import org.sopt.kream.BuildConfig
import org.sopt.kream.data.service.DummyService
import org.sopt.kream.data.service.ProductService
import retrofit2.Retrofit

Expand All @@ -30,6 +29,5 @@ object ApiFactory {
}

object ServicePool {
val dummyService = ApiFactory.create<DummyService>()
val productService = ApiFactory.create<ProductService>()
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/java/org/sopt/kream/data/service/DummyService.kt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/java/org/sopt/kream/domain/model/DummyEntity.kt

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@ package org.sopt.kream.presentation.common

import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import org.sopt.kream.data.datasourceimpl.DummyRemoteDataSourceImpl
import org.sopt.kream.data.datasourceimpl.ProductRemoteDataSourceImpl
import org.sopt.kream.data.repository.DummyRepositoryImpl
import org.sopt.kream.data.repository.ProductRepositoryImpl
import org.sopt.kream.presentation.ui.dummy.DummyViewModel
import org.sopt.kream.presentation.ui.main.home.recommend.RecommendViewModel
import org.sopt.kream.presentation.ui.main.home.release.ReleaseProductViewModel
import org.sopt.kream.presentation.ui.productdetail.ProductDetailViewModel
import org.sopt.kream.presentation.ui.search.SearchViewModel

class ViewModelFactory : ViewModelProvider.Factory {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(DummyViewModel::class.java)) {
return DummyViewModel(DummyRepositoryImpl(DummyRemoteDataSourceImpl())) as T
} else if (modelClass.isAssignableFrom(SearchViewModel::class.java)) {
if (modelClass.isAssignableFrom(SearchViewModel::class.java)) {
return SearchViewModel(ProductRepositoryImpl(ProductRemoteDataSourceImpl())) as T
} else if (modelClass.isAssignableFrom(ReleaseProductViewModel::class.java)) {
return ReleaseProductViewModel(ProductRepositoryImpl(ProductRemoteDataSourceImpl())) as T
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.model
package org.sopt.kream.presentation.model

data class Advertisement(
val id: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.sopt.kream.presentation.ui.model
package org.sopt.kream.presentation.model

import org.sopt.kream.presentation.ui.type.ProductDetailInfoType
import org.sopt.kream.presentation.type.ProductDetailInfoType

data class ProductDetailInfo(
val productDetailInfoType: ProductDetailInfoType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import org.sopt.kream.R

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import androidx.annotation.StringRes
import org.sopt.kream.R
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import androidx.annotation.ColorRes
import androidx.annotation.StringRes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import androidx.annotation.StringRes
import org.sopt.kream.R
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import org.sopt.kream.R

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import androidx.annotation.DrawableRes
import org.sopt.kream.R
Expand All @@ -8,43 +8,43 @@ enum class RecommendCircleMenuType(
val menu: Int,
) {
KREAM_CARD(
image = R.drawable.view2_img_cricle_01,
image = R.drawable.img_view2_cricle_01,
menu = R.string.type_circle_menu_kream_card,
),
CREAM_DRAW(
image = R.drawable.view2_img_cricle_02,
image = R.drawable.img_view2_cricle_02,
menu = R.string.type_circle_menu_kream_draw,
),
MAN_RECOMMEND(
image = R.drawable.view2_img_cricle_03,
image = R.drawable.img_view2_cricle_03,
menu = R.string.type_circle_menu_man_recommend,
),
WOMAN_RECOMMEND(
image = R.drawable.view2_img_cricle_04,
image = R.drawable.img_view2_cricle_04,
menu = R.string.type_circle_menu_woman_recommend,
),
NEW_RECOMMEND(
image = R.drawable.view2_img_cricle_05,
image = R.drawable.img_view2_cricle_05,
menu = R.string.type_circle_menu_new_recommend,
),
UNDER_PRICE(
image = R.drawable.view2_img_cricle_06,
image = R.drawable.img_view2_cricle_06,
menu = R.string.type_circle_menu_under_price,
),
SPRING_SALE(
image = R.drawable.view2_img_cricle_07,
image = R.drawable.img_view2_cricle_07,
menu = R.string.type_circle_menu_spring_sale,
),
CHANEL(
image = R.drawable.view2_img_cricle_08,
image = R.drawable.img_view2_cricle_08,
menu = R.string.type_circle_menu_chanel,
),
MAY(
image = R.drawable.view2_img_cricle_09,
image = R.drawable.img_view2_cricle_09,
menu = R.string.type_circle_menu_may,
),
SONY_SUPREME(
image = R.drawable.view2_img_cricle_10,
image = R.drawable.img_view2_cricle_10,
menu = R.string.type_circle_menu_sony_supreme,
),
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.kream.presentation.ui.type
package org.sopt.kream.presentation.type

import androidx.annotation.StringRes
import org.sopt.kream.R
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import org.sopt.kream.R
import org.sopt.kream.databinding.FragmentHomeBinding
import org.sopt.kream.presentation.type.HomeTabBarType
import org.sopt.kream.presentation.ui.main.home.recommend.RecommendFragment
import org.sopt.kream.presentation.ui.main.home.release.ReleaseFragment
import org.sopt.kream.presentation.ui.type.HomeTabBarType
import org.sopt.kream.theme.PinkColor
import org.sopt.kream.util.base.BindingFragment
import org.sopt.kream.util.component.KreamTab
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.ListAdapter
import org.sopt.kream.databinding.ItemRecommendCircleMenuBinding
import org.sopt.kream.presentation.ui.type.RecommendCircleMenuType
import org.sopt.kream.presentation.type.RecommendCircleMenuType
import org.sopt.kream.util.view.ItemDiffCallback

class RecommendCircleMenuAdapter() : ListAdapter<RecommendCircleMenuType, RecommendCircleMenuViewHolder>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.sopt.kream.presentation.ui.main.home.recommend

import androidx.recyclerview.widget.RecyclerView
import org.sopt.kream.databinding.ItemRecommendCircleMenuBinding
import org.sopt.kream.presentation.ui.type.RecommendCircleMenuType
import org.sopt.kream.presentation.type.RecommendCircleMenuType

class RecommendCircleMenuViewHolder(
private val binding: ItemRecommendCircleMenuBinding,
Expand Down
Loading
Loading