From c909dee4ba1362b75063b58522628ac944a34ecf Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Wed, 26 Jul 2023 15:44:23 +0900 Subject: [PATCH 01/14] create Mypage Dataclass --- .../funcy_portfolio_android/model/data/MyPageData.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt new file mode 100644 index 0000000..25228fb --- /dev/null +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt @@ -0,0 +1,12 @@ +package com.example.funcy_portfolio_android.model.data + +data class MyPageData( + val icon: String, + val header: String, + val user_description: String, + val sns: List, + val group: List, + val skills: List, + val displayName: String, + val works: List +) \ No newline at end of file From e9166ef1954a26b3e147c958d347ed053b2c1b84 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Wed, 26 Jul 2023 15:47:18 +0900 Subject: [PATCH 02/14] fix data class key name --- .../funcy_portfolio_android/model/data/AuthData.kt | 4 ++-- .../model/data/SignupData.kt | 10 +++++----- .../model/data/WorkDataList.kt | 6 ++++-- .../model/data/{WorkData.kt => WorkDetails.kt} | 13 ++++++++----- 4 files changed, 19 insertions(+), 14 deletions(-) rename app/src/main/java/com/example/funcy_portfolio_android/model/data/{WorkData.kt => WorkDetails.kt} (57%) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/AuthData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/AuthData.kt index d2c1e6e..f9164d0 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/AuthData.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/AuthData.kt @@ -1,8 +1,8 @@ package com.example.funcy_portfolio_android.model.data data class AuthData( - val code: String, - val userID: String + val userID: String, + val code: String ) data class UserIdData( diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt index 947196c..a00e139 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt @@ -1,12 +1,12 @@ package com.example.funcy_portfolio_android.model.data data class SignupData( + val icon: String, val familyName: String, - val course: String, - val displayName: String, val firstName: String, - val grade: String, - val icon: String, val mail: String, - val password: String + val password: String, + val grade: String, + val course: String, + val displayName: String ) \ No newline at end of file diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt index d9345b6..827b54e 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt @@ -1,7 +1,9 @@ package com.example.funcy_portfolio_android.model.data data class WorkDataList( - val work_id: Int, + val workID: Int, val title: String, - val images: String + val thumbnail: String, + val description: String, + val icon: String, ) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt similarity index 57% rename from app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkData.kt rename to app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt index 57c1f66..72e8661 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkData.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt @@ -1,20 +1,23 @@ package com.example.funcy_portfolio_android.model.data -data class WorkData( +data class WorkDetails( val title: String, val description: String, + val thumbnail: String, + val user_icon: String, + val user_name: String, val images: List, - val URL: String, + val work_url: String, val movie_url: String, val tags: List, - val group: String?, + val groupID: String?, val security: Int, ) data class ImageData( - val Image: String + val image: String ) data class TagData( - val Tag: String + val tag: String ) \ No newline at end of file From 1db6c7230ea31292d61dbccf9fa65ac7f49fd16a Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Wed, 26 Jul 2023 15:50:54 +0900 Subject: [PATCH 03/14] apply new key variable --- .../ui/main/CardAdapter.kt | 25 ++++---- .../ui/workDetail/WorkDetailViewModel.kt | 10 ++-- app/src/main/res/layout/create_card.xml | 60 +++++++++---------- 3 files changed, 46 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/main/CardAdapter.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/main/CardAdapter.kt index f452e73..28b7b18 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/main/CardAdapter.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/main/CardAdapter.kt @@ -8,23 +8,23 @@ import androidx.recyclerview.widget.RecyclerView import com.example.funcy_portfolio_android.databinding.CreateCardBinding import com.example.funcy_portfolio_android.model.data.WorkDataList -class CardAdapter:ListAdapter(DiffCallBack){ +class CardAdapter : ListAdapter(DiffCallBack) { - class WorkDataViewHolder(private var binding: CreateCardBinding): - RecyclerView.ViewHolder(binding.root){ - fun bind(workDataList: WorkDataList){ - binding.work = workDataList - binding.executePendingBindings() - } - } + class WorkDataViewHolder(private var binding: CreateCardBinding) : + RecyclerView.ViewHolder(binding.root) { + fun bind(workDataList: WorkDataList) { + binding.work = workDataList + binding.executePendingBindings() + } + } - companion object DiffCallBack : DiffUtil.ItemCallback(){ + companion object DiffCallBack : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: WorkDataList, newItem: WorkDataList): Boolean { - return oldItem.work_id == newItem.work_id + return oldItem.workID == newItem.workID } override fun areContentsTheSame(oldItem: WorkDataList, newItem: WorkDataList): Boolean { - return oldItem.images == newItem.images + return oldItem.thumbnail == newItem.thumbnail } } @@ -45,9 +45,6 @@ class CardAdapter:ListAdapter(Diff } - - - //@BindingAdapter //fun bindArticle(article: ImageView, articleUrl: String?){ // articleUrl?.let{ diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailViewModel.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailViewModel.kt index 1f6b8d0..13c9385 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailViewModel.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailViewModel.kt @@ -12,7 +12,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.funcy_portfolio_android.model.data.ImageData import com.example.funcy_portfolio_android.model.data.TagData -import com.example.funcy_portfolio_android.model.data.WorkData +import com.example.funcy_portfolio_android.model.data.WorkDetails import com.example.funcy_portfolio_android.model.repository.WorkRepository import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup @@ -29,8 +29,8 @@ class WorkDetailViewModel : ViewModel() { val userName: LiveData = _userName //ここから作品詳細 - private val _work = MutableLiveData() - val work: LiveData = _work + private val _work = MutableLiveData() + val work: LiveData = _work private val _workDetailStatus = MutableLiveData() val workDetailStatus: LiveData = _workDetailStatus @@ -79,7 +79,7 @@ class WorkDetailViewModel : ViewModel() { chipGroup.removeAllViews() _tagList.value?.forEach { tag -> val chip = Chip(context) - chip.text = tag.Tag + chip.text = tag.tag chipGroup.addView(chip) } } @@ -91,7 +91,7 @@ class WorkDetailViewModel : ViewModel() { _explanation.value = workValue.description _tagList.value = workValue.tags _youtubeUrl.value = workValue.movie_url - _githubUrl.value = workValue.URL + _githubUrl.value = workValue.work_url } //Web遷移系の処理////////////////////////////////// diff --git a/app/src/main/res/layout/create_card.xml b/app/src/main/res/layout/create_card.xml index 589119e..609968f 100644 --- a/app/src/main/res/layout/create_card.xml +++ b/app/src/main/res/layout/create_card.xml @@ -3,43 +3,43 @@ + + type="com.example.funcy_portfolio_android.model.data.WorkDataList" /> - - - - - + android:layout_height="wrap_content" + app:cardCornerRadius="12dp" + app:cardElevation="6dp" + app:cardUseCompatPadding="true"> - - - + android:layout_height="wrap_content"> + + + + + + From cf3ee7c353ac955dc0417efd7049be8e87a191a7 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Wed, 26 Jul 2023 15:51:22 +0900 Subject: [PATCH 04/14] apply Work repository --- .../ui/main/MainViewModel.kt | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/main/MainViewModel.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/main/MainViewModel.kt index 2c351d7..cd37671 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/main/MainViewModel.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/main/MainViewModel.kt @@ -1,10 +1,14 @@ package com.example.funcy_portfolio_android.ui.main +import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope import com.example.funcy_portfolio_android.model.data.WorkDataList import com.example.funcy_portfolio_android.model.repository.WorkRepository +import com.example.funcy_portfolio_android.ui.workRegister.WorkRegisterBottomSheet.Companion.TAG +import kotlinx.coroutines.launch /*FUNCYサーバーとの接続を確認するステータスを定義*/ enum class FuncyApiStatus { LOADING, ERROR, DONE } @@ -21,24 +25,24 @@ class MainViewModel : ViewModel() { private val _status = MutableLiveData() val status: LiveData = _status -// init { -// getWorks("Token1") -// } - -// private fun getWorks(token: String) { -// viewModelScope.launch { -// _status.value = FuncyApiStatus.LOADING -// try { -// _works.value = repository.service.getWorks(token) -// _status.value = FuncyApiStatus.DONE -// Log.d(TAG, "通信出来たよ") -// } catch (e: Exception) { -// _status.value = FuncyApiStatus.ERROR -// _works.value = listOf() -// Log.e(TAG, e.message.toString()) -// } -// -// } -// } + init { + getWorks("Token1") + } + + private fun getWorks(token: String) { + viewModelScope.launch { + _status.value = FuncyApiStatus.LOADING + try { + _works.value = WorkRepository().getWork(token) + _status.value = FuncyApiStatus.DONE + Log.d(TAG, "通信出来たよ") + } catch (e: Exception) { + _status.value = FuncyApiStatus.ERROR + _works.value = listOf() + Log.e(TAG, e.message.toString()) + } + + } + } } \ No newline at end of file From 6b6ce50463acb14dd80211079d979f1646673cb7 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Wed, 26 Jul 2023 15:52:24 +0900 Subject: [PATCH 05/14] fix implementation --- app/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 97aaca0..f7d8b5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation "androidx.browser:browser:1.4.0" + implementation 'androidx.browser:browser:1.4.0' implementation 'com.google.android:flexbox:1.1.0' implementation 'com.github.bumptech.glide:glide:4.4.0' kapt 'com.github.bumptech.glide:compiler:4.4.0' @@ -57,7 +57,7 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.google.code.gson:gson:2.9.0' - implementation("com.squareup.okhttp3:logging-interceptor:4.11.0") + implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0' // coroutine implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' @@ -70,9 +70,9 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.13.0' - implementation "com.squareup.moshi:moshi-kotlin:1.12.0" - kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0" + implementation 'com.squareup.moshi:moshi-kotlin:1.12.0' + kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0' //coil - implementation "io.coil-kt:coil:1.1.1" + implementation 'io.coil-kt:coil:1.1.1' } \ No newline at end of file From 660442a582a3dd7a6db00d241baf4f7ec4ed7ed9 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 4 Aug 2023 12:57:11 +0900 Subject: [PATCH 06/14] apply new key variable --- .../model/repository/WorkRepository.kt | 7 ++++--- .../example/funcy_portfolio_android/network/FuncyApi.kt | 6 +++--- .../ui/groupMypage/CardAdapterBefore.kt | 2 +- .../ui/workDetail/WorkDetailFragment.kt | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/repository/WorkRepository.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/repository/WorkRepository.kt index 2a6cfec..eae899a 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/repository/WorkRepository.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/repository/WorkRepository.kt @@ -1,6 +1,6 @@ package com.example.funcy_portfolio_android.model.repository -import com.example.funcy_portfolio_android.model.data.WorkData +import com.example.funcy_portfolio_android.model.data.WorkDetails import com.example.funcy_portfolio_android.network.ApiService import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext @@ -9,7 +9,7 @@ import java.io.IOException class WorkRepository() { private val service = ApiService.service - suspend fun registerWork(work: WorkData): String? { + suspend fun registerWork(work: WorkDetails): String? { val data = work var res = "" @@ -26,7 +26,8 @@ class WorkRepository() { return res } - suspend fun getWorkDetail(token: String, workId:String) = service.getWorkDetail(token = token, workId = workId) + suspend fun getWorkDetail(token: String, workId: String) = + service.getWorkDetail(token = token, workId = workId) suspend fun getWork(token: String) = service.getWorks(token = token) } diff --git a/app/src/main/java/com/example/funcy_portfolio_android/network/FuncyApi.kt b/app/src/main/java/com/example/funcy_portfolio_android/network/FuncyApi.kt index a8bba5e..3a1418a 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/network/FuncyApi.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/network/FuncyApi.kt @@ -3,8 +3,8 @@ package com.example.funcy_portfolio_android.network import com.example.funcy_portfolio_android.model.data.AuthData import com.example.funcy_portfolio_android.model.data.SignupData import com.example.funcy_portfolio_android.model.data.UserIdData -import com.example.funcy_portfolio_android.model.data.WorkData import com.example.funcy_portfolio_android.model.data.WorkDataList +import com.example.funcy_portfolio_android.model.data.WorkDetails import retrofit2.Call import retrofit2.Response import retrofit2.http.* @@ -14,14 +14,14 @@ interface FuncyApi { /* 作品の投稿（個人） */ @Headers("token:Token1") @POST("work") - fun registerWorkData(@Body work: WorkData): Call + fun registerWorkData(@Body work: WorkDetails): Call //作品詳細取得 @GET("work/{workID}") suspend fun getWorkDetail( @Header("token") token: String, @Path("workID") workId: String - ): WorkData + ): WorkDetails //登録データ送信 @POST("sign/up") diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/groupMypage/CardAdapterBefore.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/groupMypage/CardAdapterBefore.kt index 7764cb1..a7aca65 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/groupMypage/CardAdapterBefore.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/groupMypage/CardAdapterBefore.kt @@ -22,7 +22,7 @@ class CardAdapterBefore (private val worklist: List) : RecyclerVie override fun onBindViewHolder(viewHolder: CardAdapterBefore.ViewHolder, position: Int) { val work = worklist[position] - viewHolder.image.setImageResource(work.work_id) + viewHolder.image.setImageResource(work.workID) viewHolder.title.text = work.title } override fun getItemCount() = worklist.size diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailFragment.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailFragment.kt index 2dd10c5..c9a7880 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailFragment.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/workDetail/WorkDetailFragment.kt @@ -57,7 +57,7 @@ class WorkDetailFragment : Fragment() { }) viewModel.images.observe(viewLifecycleOwner, Observer { - Glide.with(this).load(it[0].Image).error(R.drawable.img_work_detail_thumbnail).into(binding.imgThumbnail) + Glide.with(this).load(it[0].image).error(R.drawable.img_work_detail_thumbnail).into(binding.imgThumbnail) }) viewModel.workDetailStatus.observe(viewLifecycleOwner, Observer { status -> From 101f68b77a626bdca79f92fe142ea3a3e9d94ab1 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 14:20:28 +0900 Subject: [PATCH 07/14] [fix] data class WorkDataList --- .../funcy_portfolio_android/model/data/WorkDataList.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt index 827b54e..7c01243 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt @@ -1,7 +1,12 @@ package com.example.funcy_portfolio_android.model.data +/** + * 作品一覧画面(main)のデータクラス + */ data class WorkDataList( - val workID: Int, + val workID: String, + val userID: String, + val user_name: String, val title: String, val thumbnail: String, val description: String, From c362cfe96708365bc2a764009e6f067310a0b7a4 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 14:25:42 +0900 Subject: [PATCH 08/14] [fix] WorkDataList --- .../funcy_portfolio_android/model/data/WorkDataList.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt index 7c01243..ba53a90 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt @@ -3,7 +3,11 @@ package com.example.funcy_portfolio_android.model.data /** * 作品一覧画面(main)のデータクラス */ + data class WorkDataList( + val works: List +) +data class WorkData( val workID: String, val userID: String, val user_name: String, From b850514e99d3f50ad6ace88e6c29355912ea975b Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 14:26:07 +0900 Subject: [PATCH 09/14] [fix] data class WorkDetails --- .../example/funcy_portfolio_android/model/data/WorkDetails.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt index 72e8661..6fe2a59 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt @@ -6,11 +6,12 @@ data class WorkDetails( val thumbnail: String, val user_icon: String, val user_name: String, + val userID: String, val images: List, val work_url: String, val movie_url: String, val tags: List, - val groupID: String?, + val group: String?, val security: Int, ) From fb5c50edf32e714928e94eeeb3f12ad1989d839a Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 14:38:12 +0900 Subject: [PATCH 10/14] [fix] data class MyPageData --- .../funcy_portfolio_android/model/data/MyPageData.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt index 25228fb..543b7ef 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/MyPageData.kt @@ -1,5 +1,9 @@ package com.example.funcy_portfolio_android.model.data +/** + * マイページ (mypage) のデータクラス + * @param works: 中身はWorkDataList.ktを参照してください + */ data class MyPageData( val icon: String, val header: String, @@ -8,5 +12,5 @@ data class MyPageData( val group: List, val skills: List, val displayName: String, - val works: List + val works: WorkDataList ) \ No newline at end of file From 3b53a4d9fe2b01790f0eb0494a322e8729a932ca Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 14:38:50 +0900 Subject: [PATCH 11/14] [fix] add KDoc comment --- .../example/funcy_portfolio_android/model/data/SignupData.kt | 3 +++ .../example/funcy_portfolio_android/model/data/WorkDataList.kt | 2 +- .../example/funcy_portfolio_android/model/data/WorkDetails.kt | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt index a00e139..6ce968e 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/SignupData.kt @@ -1,5 +1,8 @@ package com.example.funcy_portfolio_android.model.data +/** + * サインアップ（ユーザ情報登録） (signup) のデータクラス + */ data class SignupData( val icon: String, val familyName: String, diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt index ba53a90..9e141cc 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDataList.kt @@ -1,7 +1,7 @@ package com.example.funcy_portfolio_android.model.data /** - * 作品一覧画面(main)のデータクラス + * 作品一覧画面 (main) のデータクラス */ data class WorkDataList( diff --git a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt index 6fe2a59..7dfb8dc 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/model/data/WorkDetails.kt @@ -1,5 +1,8 @@ package com.example.funcy_portfolio_android.model.data +/** + * 作品詳細 (workDetail) のデータクラス + */ data class WorkDetails( val title: String, val description: String, From dfa187351bcae5152436636718acdb5b10583285 Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 15:08:16 +0900 Subject: [PATCH 12/14] [fix] AuthData param --- .../ui/authentication/AuthenticationViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/authentication/AuthenticationViewModel.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/authentication/AuthenticationViewModel.kt index 48dc6f0..7746ee1 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/authentication/AuthenticationViewModel.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/authentication/AuthenticationViewModel.kt @@ -24,7 +24,7 @@ class AuthenticationViewModel : ViewModel() { viewModelScope.launch { try { val response = userRepository.userAuthentication( - AuthData(inputCode.value!!, userId) + AuthData(userId, inputCode.value!!) ) if (response.isSuccessful) { Log.i("Authentication", "認証が完了しました${response.body()}") From 2d2eb02694eee8a199f8b4c261a034ffb936cb6e Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 15:08:56 +0900 Subject: [PATCH 13/14] [fix] SignupData param --- .../ui/signup/SignupViewModel.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/signup/SignupViewModel.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/signup/SignupViewModel.kt index a519538..3316ada 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/signup/SignupViewModel.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/signup/SignupViewModel.kt @@ -62,14 +62,14 @@ class SignupViewModel : ViewModel() { try { val res =userRepository.userRegistration( SignupData( + "noIcon", familyName.value!!, - course, - displayName.value!!, firstName.value!!, - grade, - "noIcon", sendMailAddress, - password.value!! + password.value!!, + grade, + course, + displayName.value!!, ) ) if (res.isSuccessful) { From ab05fe761b373c4457bd58e2d1aabb689515364e Mon Sep 17 00:00:00 2001 From: yuhei-yama Date: Fri, 13 Oct 2023 15:12:10 +0900 Subject: [PATCH 14/14] [fix] use data class --- .../ui/workRegister/WorkRegisterViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt b/app/src/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt index aa44f40..fa32f9e 100644 --- a/app/src/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt +++ b/app/src/main/java/com/example/funcy_portfolio_android/ui/workRegister/WorkRegisterViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.funcy_portfolio_android.model.data.ImageData import com.example.funcy_portfolio_android.model.data.TagData -import com.example.funcy_portfolio_android.model.data.WorkData +import com.example.funcy_portfolio_android.model.data.WorkDetails import com.example.funcy_portfolio_android.model.repository.WorkRepository import kotlinx.coroutines.launch @@ -85,7 +85,7 @@ class WorkRegisterViewModel : ViewModel() { viewModelScope.launch { val postTagList = stringTagListToTagList(tags) res = workRepository.registerWork( - WorkData( + WorkDetails( title, description, listOf(ImageData("")),