diff --git a/app/build.gradle b/app/build.gradle index 8b5b3d0..30bace4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { compileSdk 31 defaultConfig { - applicationId "com.example.infraandroid" + applicationId "com.infra.infraandroid" minSdk 23 targetSdk 31 versionCode 1 diff --git a/app/google-services.json b/app/google-services.json index 55cfcad..52bcb32 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,6 +1,7 @@ { "project_info": { "project_number": "953936170275", + "firebase_url": "https://infra-android-default-rtdb.firebaseio.com", "project_id": "infra-android", "storage_bucket": "infra-android.appspot.com" }, @@ -9,20 +10,20 @@ "client_info": { "mobilesdk_app_id": "1:953936170275:android:0dc856e100ebdcdec0d096", "android_client_info": { - "package_name": "com.example.infraandroid" + "package_name": "com.infra.infraandroid" } }, "oauth_client": [ { - "client_id": "953936170275-art9r0se8n5ig5265h568lvep25obbog.apps.googleusercontent.com", + "client_id": "953936170275-rv5dsh3apqp5ap7sna4sh849bmmprf5t.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.example.infraandroid", + "package_name": "com.infra.infraandroid", "certificate_hash": "497910e3f5063321272fbe99384cf526f513774c" } }, { - "client_id": "953936170275-k6niv00fsbh65cmcense9op8f9946h46.apps.googleusercontent.com", + "client_id": "953936170275-n0h7o7932npcdaa9n0e97ihuruugspeg.apps.googleusercontent.com", "client_type": 3 } ], @@ -35,7 +36,36 @@ "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "953936170275-k6niv00fsbh65cmcense9op8f9946h46.apps.googleusercontent.com", + "client_id": "953936170275-n0h7o7932npcdaa9n0e97ihuruugspeg.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:953936170275:android:8278a0c3d0755249c0d096", + "android_client_info": { + "package_name": "com.infra.infraandroid" + } + }, + "oauth_client": [ + { + "client_id": "953936170275-n0h7o7932npcdaa9n0e97ihuruugspeg.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBUazxwVGvEySsRxYAk9n60RbANLDO3Naw" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "953936170275-n0h7o7932npcdaa9n0e97ihuruugspeg.apps.googleusercontent.com", "client_type": 3 } ] diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..c8bf9f4 Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/androidTest/java/com/example/infraandroid/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/infra/infraandroid/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/com/example/infraandroid/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/infra/infraandroid/ExampleInstrumentedTest.kt index cca781d..bb664e3 100644 --- a/app/src/androidTest/java/com/example/infraandroid/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/infra/infraandroid/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid +package com.infra.infraandroid import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d02799b..0dc378e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.infra.infraandroid"> @@ -11,7 +11,7 @@ diff --git a/app/src/main/java/com/example/infraandroid/id/model/NaverLogin.kt b/app/src/main/java/com/example/infraandroid/id/model/NaverLogin.kt deleted file mode 100644 index b54a44c..0000000 --- a/app/src/main/java/com/example/infraandroid/id/model/NaverLogin.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.infraandroid.id.model - -class NaverLogin { -} - diff --git a/app/src/main/java/com/example/infraandroid/myinfo/history/view/HistoryFragment.kt b/app/src/main/java/com/example/infraandroid/myinfo/history/view/HistoryFragment.kt deleted file mode 100644 index 5e83338..0000000 --- a/app/src/main/java/com/example/infraandroid/myinfo/history/view/HistoryFragment.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.infraandroid.myinfo.history.view - -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentHistoryBinding -import com.example.infraandroid.databinding.FragmentScrapBinding -import com.example.infraandroid.util.BaseFragment - -class HistoryFragment : BaseFragment(R.layout.fragment_history){ - override fun FragmentHistoryBinding.onCreateView(){ - } - - override fun FragmentHistoryBinding.onViewCreated(){ - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt deleted file mode 100644 index 555cb98..0000000 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.infraandroid.myinfo.myideamanage.model - -data class RequestTeamMemberData( - val pj_num: Int? -) \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/scrap/view/ScrapFragment.kt b/app/src/main/java/com/example/infraandroid/myinfo/scrap/view/ScrapFragment.kt deleted file mode 100644 index e9884a5..0000000 --- a/app/src/main/java/com/example/infraandroid/myinfo/scrap/view/ScrapFragment.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.infraandroid.myinfo.scrap.view - -import android.util.Log -import android.widget.Toast -import androidx.navigation.fragment.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentScrapBinding -import com.example.infraandroid.id.model.RequestLoginData -import com.example.infraandroid.id.model.ResponseLoginData -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class ScrapFragment : BaseFragment(R.layout.fragment_scrap){ - override fun FragmentScrapBinding.onCreateView(){ - - } - - override fun FragmentScrapBinding.onViewCreated(){ - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt b/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt deleted file mode 100644 index e3c38f5..0000000 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.infraandroid.myinfo.teammembereval.view.fragment - -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentApplicationStatusBinding -import com.example.infraandroid.databinding.FragmentTeamEvaluationEditBinding -import com.example.infraandroid.util.BaseFragment - -class TeamMemberEvalEditFragment : BaseFragment(R.layout.fragment_team_evaluation_edit){ - - override fun FragmentTeamEvaluationEditBinding.onCreateView(){ - } - - override fun FragmentTeamEvaluationEditBinding.onViewCreated(){ - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/MainActivity.kt b/app/src/main/java/com/infra/infraandroid/MainActivity.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/MainActivity.kt rename to app/src/main/java/com/infra/infraandroid/MainActivity.kt index db0b5f3..5fbc6d2 100644 --- a/app/src/main/java/com/example/infraandroid/MainActivity.kt +++ b/app/src/main/java/com/infra/infraandroid/MainActivity.kt @@ -1,19 +1,13 @@ -package com.example.infraandroid +package com.infra.infraandroid -import android.content.Intent import android.os.Bundle -import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.NavigationUI -import com.example.infraandroid.databinding.ActivityMainBinding +import com.infra.infraandroid.databinding.ActivityMainBinding import android.view.View -import android.widget.Toast import androidx.fragment.app.FragmentManager -import com.example.infraandroid.myinfo.MyInfoFragment -import com.google.android.material.snackbar.Snackbar -import com.kakao.sdk.common.util.Utility class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/infraandroid/category/model/CategoryFindTeamMemberInfo.kt b/app/src/main/java/com/infra/infraandroid/category/model/CategoryFindTeamMemberInfo.kt similarity index 78% rename from app/src/main/java/com/example/infraandroid/category/model/CategoryFindTeamMemberInfo.kt rename to app/src/main/java/com/infra/infraandroid/category/model/CategoryFindTeamMemberInfo.kt index b9535e5..5b7cc80 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/CategoryFindTeamMemberInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/CategoryFindTeamMemberInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model data class CategoryFindTeamMemberInfo ( var profileImg : String, diff --git a/app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt b/app/src/main/java/com/infra/infraandroid/category/model/ProjectService.kt similarity index 86% rename from app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt rename to app/src/main/java/com/infra/infraandroid/category/model/ProjectService.kt index 6551929..1564f56 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/ProjectService.kt @@ -1,6 +1,5 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model -import com.example.infraandroid.myinfo.myideamanage.model.ResponseModifyProjectData import retrofit2.Call import retrofit2.http.* diff --git a/app/src/main/java/com/example/infraandroid/category/model/RequestApplyProjectData.kt b/app/src/main/java/com/infra/infraandroid/category/model/RequestApplyProjectData.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/category/model/RequestApplyProjectData.kt rename to app/src/main/java/com/infra/infraandroid/category/model/RequestApplyProjectData.kt index 7ccf217..49e23d3 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/RequestApplyProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/RequestApplyProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/category/model/ResponseApplyProjectData.kt b/app/src/main/java/com/infra/infraandroid/category/model/ResponseApplyProjectData.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/category/model/ResponseApplyProjectData.kt rename to app/src/main/java/com/infra/infraandroid/category/model/ResponseApplyProjectData.kt index 5a2046c..b8f40ee 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/ResponseApplyProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/ResponseApplyProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model data class ResponseApplyProjectData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/category/model/ResponseLookUpAllProjectData.kt b/app/src/main/java/com/infra/infraandroid/category/model/ResponseLookUpAllProjectData.kt similarity index 92% rename from app/src/main/java/com/example/infraandroid/category/model/ResponseLookUpAllProjectData.kt rename to app/src/main/java/com/infra/infraandroid/category/model/ResponseLookUpAllProjectData.kt index 09e92a7..0fad0fc 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/ResponseLookUpAllProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/ResponseLookUpAllProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model data class ResponseLookUpAllProjectData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/category/model/ResponseViewIdeaData.kt b/app/src/main/java/com/infra/infraandroid/category/model/ResponseViewIdeaData.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/category/model/ResponseViewIdeaData.kt rename to app/src/main/java/com/infra/infraandroid/category/model/ResponseViewIdeaData.kt index 0f5ac42..0332eaa 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/ResponseViewIdeaData.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/ResponseViewIdeaData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model data class ResponseViewIdeaData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/category/model/ResponseViewUserProfileData.kt b/app/src/main/java/com/infra/infraandroid/category/model/ResponseViewUserProfileData.kt similarity index 89% rename from app/src/main/java/com/example/infraandroid/category/model/ResponseViewUserProfileData.kt rename to app/src/main/java/com/infra/infraandroid/category/model/ResponseViewUserProfileData.kt index 976d187..6842266 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/ResponseViewUserProfileData.kt +++ b/app/src/main/java/com/infra/infraandroid/category/model/ResponseViewUserProfileData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.model +package com.infra.infraandroid.category.model data class ResponseViewUserProfileData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt b/app/src/main/java/com/infra/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt similarity index 77% rename from app/src/main/java/com/example/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt rename to app/src/main/java/com/infra/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt index b785949..e607316 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/adapter/CategoryFindTeamMemberAdapter.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.view.adapter +package com.infra.infraandroid.category.view.adapter import android.view.LayoutInflater import android.view.ViewGroup @@ -6,14 +6,13 @@ import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.example.infraandroid.R -import com.example.infraandroid.category.model.ResponseViewUserProfileData +import com.infra.infraandroid.R +import com.infra.infraandroid.category.model.ResponseViewUserProfileData //import com.example.infraandroid.UserId -import com.example.infraandroid.databinding.ItemCategoryFindTeamRecyclerviewBinding -import com.example.infraandroid.util.ImageRound +import com.infra.infraandroid.databinding.ItemCategoryFindTeamRecyclerviewBinding +import com.infra.infraandroid.util.ImageRound class CategoryFindTeamMemberAdapter():RecyclerView.Adapter() { @@ -50,9 +49,9 @@ class CategoryFindTeamMemberAdapter():RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryFragment.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryFragment.kt index 5609319..08fd8ac 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment import android.content.ContentValues.TAG import android.os.Bundle @@ -9,9 +9,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.findNavController import androidx.viewpager2.widget.ViewPager2 -import com.example.infraandroid.R -import com.example.infraandroid.category.view.adapter.CategoryPagerAdapter -import com.example.infraandroid.databinding.FragmentCategoryBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.category.view.adapter.CategoryPagerAdapter +import com.infra.infraandroid.databinding.FragmentCategoryBinding import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryIdeaFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryIdeaFragment.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryIdeaFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryIdeaFragment.kt index e5002d2..eefc408 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryIdeaFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryIdeaFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment import android.os.Bundle import android.view.LayoutInflater @@ -7,9 +7,8 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentCategoryIdeaBinding -import com.example.infraandroid.home.view.fragment.HomeFragmentDirections +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentCategoryIdeaBinding // 카테고리의 아이디어 탭 diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryInformationFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryInformationFragment.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryInformationFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryInformationFragment.kt index 02ab669..f1c3482 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryInformationFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryInformationFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment import android.os.Bundle import android.view.LayoutInflater @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import com.bumptech.glide.Glide -import com.example.infraandroid.databinding.CategoryInformationBinding +import com.infra.infraandroid.databinding.CategoryInformationBinding // 팀원 탭에서 팀원 눌렀을 때 팀원의 정보를 자세히 알 수 있는 뷰 diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryTeamFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryTeamFragment.kt similarity index 79% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryTeamFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryTeamFragment.kt index 6180f6c..1eb0497 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryTeamFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryTeamFragment.kt @@ -1,20 +1,13 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment -import android.os.Bundle import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.infraandroid.R -import com.example.infraandroid.category.model.CategoryFindTeamMemberInfo -import com.example.infraandroid.category.model.ResponseViewUserProfileData -import com.example.infraandroid.category.view.adapter.CategoryFindTeamMemberAdapter -import com.example.infraandroid.databinding.FragmentCategoryTeamBinding -import com.example.infraandroid.databinding.FragmentMyInfoModifyBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.category.model.ResponseViewUserProfileData +import com.infra.infraandroid.category.view.adapter.CategoryFindTeamMemberAdapter +import com.infra.infraandroid.databinding.FragmentCategoryTeamBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt index 82c5d3a..418a693 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt @@ -1,25 +1,19 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment -import android.os.Bundle import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import android.widget.Toast -import androidx.appcompat.widget.AppCompatButton import androidx.core.view.isVisible -import androidx.fragment.app.Fragment import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs -import com.example.infraandroid.R -import com.example.infraandroid.category.model.RequestApplyProjectData -import com.example.infraandroid.category.model.ResponseApplyProjectData -import com.example.infraandroid.category.model.ResponseViewIdeaData -import com.example.infraandroid.databinding.FragmentViewIdeaBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.category.model.RequestApplyProjectData +import com.infra.infraandroid.category.model.ResponseApplyProjectData +import com.infra.infraandroid.category.model.ResponseViewIdeaData +import com.infra.infraandroid.databinding.FragmentViewIdeaBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt b/app/src/main/java/com/infra/infraandroid/category/view/fragment/IdeaListFragment.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt rename to app/src/main/java/com/infra/infraandroid/category/view/fragment/IdeaListFragment.kt index 5ec9d86..8a07921 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/category/view/fragment/IdeaListFragment.kt @@ -1,16 +1,16 @@ -package com.example.infraandroid.category.view.fragment +package com.infra.infraandroid.category.view.fragment import android.util.Log import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs -import com.example.infraandroid.R -import com.example.infraandroid.category.model.ResponseLookUpAllProjectData -import com.example.infraandroid.category.view.adapter.IdeaListAdapter -import com.example.infraandroid.databinding.FragmentIdeaListBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.category.model.ResponseLookUpAllProjectData +import com.infra.infraandroid.category.view.adapter.IdeaListAdapter +import com.infra.infraandroid.databinding.FragmentIdeaListBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/chat/model/ChattingRoomInfo.kt b/app/src/main/java/com/infra/infraandroid/chat/model/ChattingRoomInfo.kt similarity index 81% rename from app/src/main/java/com/example/infraandroid/chat/model/ChattingRoomInfo.kt rename to app/src/main/java/com/infra/infraandroid/chat/model/ChattingRoomInfo.kt index 5068eb5..d57577e 100644 --- a/app/src/main/java/com/example/infraandroid/chat/model/ChattingRoomInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/model/ChattingRoomInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.chat.model +package com.infra.infraandroid.chat.model data class ChattingRoomInfo ( var opponentProfileImg : String, diff --git a/app/src/main/java/com/example/infraandroid/chat/model/MessageInfo.kt b/app/src/main/java/com/infra/infraandroid/chat/model/MessageInfo.kt similarity index 81% rename from app/src/main/java/com/example/infraandroid/chat/model/MessageInfo.kt rename to app/src/main/java/com/infra/infraandroid/chat/model/MessageInfo.kt index 1f1a73f..189cbb0 100644 --- a/app/src/main/java/com/example/infraandroid/chat/model/MessageInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/model/MessageInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.chat.model +package com.infra.infraandroid.chat.model data class MessageInfo( var senderId: String = "", diff --git a/app/src/main/java/com/example/infraandroid/chat/view/ChatFragment.kt b/app/src/main/java/com/infra/infraandroid/chat/view/ChatFragment.kt similarity index 97% rename from app/src/main/java/com/example/infraandroid/chat/view/ChatFragment.kt rename to app/src/main/java/com/infra/infraandroid/chat/view/ChatFragment.kt index 46d34c6..b647157 100644 --- a/app/src/main/java/com/example/infraandroid/chat/view/ChatFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/view/ChatFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.chat.view +package com.infra.infraandroid.chat.view import android.os.Bundle import android.util.Log @@ -10,10 +10,10 @@ import android.widget.Toast import androidx.fragment.app.Fragment import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.chat.model.MessageInfo -import com.example.infraandroid.databinding.FragmentChatBinding +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.R +import com.infra.infraandroid.chat.model.MessageInfo +import com.infra.infraandroid.databinding.FragmentChatBinding import com.google.firebase.database.* import com.google.firebase.database.ktx.database import com.google.firebase.database.ktx.getValue diff --git a/app/src/main/java/com/example/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt b/app/src/main/java/com/infra/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt similarity index 86% rename from app/src/main/java/com/example/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt rename to app/src/main/java/com/infra/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt index ead7ddc..d2ef4d0 100644 --- a/app/src/main/java/com/example/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/view/ChatMoreMenuBottomSheetFragment.kt @@ -1,9 +1,9 @@ -package com.example.infraandroid.chat.view +package com.infra.infraandroid.chat.view import android.annotation.SuppressLint import android.app.Dialog import android.view.View -import com.example.infraandroid.R +import com.infra.infraandroid.R import com.google.android.material.bottomsheet.BottomSheetDialogFragment class ChatMoreMenuBottomSheetFragment:BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/example/infraandroid/chat/view/ChatMultiViewAdapter.kt b/app/src/main/java/com/infra/infraandroid/chat/view/ChatMultiViewAdapter.kt similarity index 92% rename from app/src/main/java/com/example/infraandroid/chat/view/ChatMultiViewAdapter.kt rename to app/src/main/java/com/infra/infraandroid/chat/view/ChatMultiViewAdapter.kt index 230a375..8eb8778 100644 --- a/app/src/main/java/com/example/infraandroid/chat/view/ChatMultiViewAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/view/ChatMultiViewAdapter.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.chat.view +package com.infra.infraandroid.chat.view import android.content.ContentValues.TAG import android.util.Log @@ -7,11 +7,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.chat.model.MessageInfo -import com.example.infraandroid.databinding.ItemChatRecyclerviewBinding -import com.example.infraandroid.databinding.ItemMyChatRecyclerviewBinding +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.R +import com.infra.infraandroid.chat.model.MessageInfo +import com.infra.infraandroid.databinding.ItemChatRecyclerviewBinding +import com.infra.infraandroid.databinding.ItemMyChatRecyclerviewBinding class ChatMultiViewAdapter() : RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomAdapter.kt b/app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomAdapter.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomAdapter.kt rename to app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomAdapter.kt index 146afd2..73623cf 100644 --- a/app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomAdapter.kt @@ -1,14 +1,13 @@ -package com.example.infraandroid.chat.view +package com.infra.infraandroid.chat.view import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.chat.model.ChattingRoomInfo -import com.example.infraandroid.databinding.ItemChattingRoomListRecyclerviewBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.chat.model.ChattingRoomInfo +import com.infra.infraandroid.databinding.ItemChattingRoomListRecyclerviewBinding import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomListFragment.kt b/app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomListFragment.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomListFragment.kt rename to app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomListFragment.kt index 1701433..fb44f65 100644 --- a/app/src/main/java/com/example/infraandroid/chat/view/ChattingRoomListFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/chat/view/ChattingRoomListFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.chat.view +package com.infra.infraandroid.chat.view import android.annotation.SuppressLint import android.content.ContentValues.TAG @@ -8,9 +8,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.chat.model.ChattingRoomInfo -import com.example.infraandroid.databinding.FragmentChattingRoomListBinding +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.chat.model.ChattingRoomInfo +import com.infra.infraandroid.databinding.FragmentChattingRoomListBinding import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.ValueEventListener diff --git a/app/src/main/java/com/example/infraandroid/home/model/CreateProjectService.kt b/app/src/main/java/com/infra/infraandroid/home/model/CreateProjectService.kt similarity index 78% rename from app/src/main/java/com/example/infraandroid/home/model/CreateProjectService.kt rename to app/src/main/java/com/infra/infraandroid/home/model/CreateProjectService.kt index dccdfb5..faefba1 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/CreateProjectService.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/CreateProjectService.kt @@ -1,8 +1,6 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model -import com.example.infraandroid.category.model.ResponseLookUpAllProjectData -import com.example.infraandroid.id.model.RequestLoginData -import com.example.infraandroid.id.model.ResponseLoginData +import com.infra.infraandroid.category.model.ResponseLookUpAllProjectData import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Call diff --git a/app/src/main/java/com/example/infraandroid/home/model/HotProject.kt b/app/src/main/java/com/infra/infraandroid/home/model/HotProject.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/home/model/HotProject.kt rename to app/src/main/java/com/infra/infraandroid/home/model/HotProject.kt index 9c57556..dc0e33a 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/HotProject.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/HotProject.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model data class HotProject( var group: String? = "", diff --git a/app/src/main/java/com/example/infraandroid/home/model/RecommedProject.kt b/app/src/main/java/com/infra/infraandroid/home/model/RecommedProject.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/home/model/RecommedProject.kt rename to app/src/main/java/com/infra/infraandroid/home/model/RecommedProject.kt index 5663f4a..a5d1989 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/RecommedProject.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/RecommedProject.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model data class RecommedProject( var group: String? = "", diff --git a/app/src/main/java/com/example/infraandroid/home/model/ResponseCreateProjectData.kt b/app/src/main/java/com/infra/infraandroid/home/model/ResponseCreateProjectData.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/home/model/ResponseCreateProjectData.kt rename to app/src/main/java/com/infra/infraandroid/home/model/ResponseCreateProjectData.kt index 526b090..eb3d2f0 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/ResponseCreateProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/ResponseCreateProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/home/model/ResponseHotProjectData.kt b/app/src/main/java/com/infra/infraandroid/home/model/ResponseHotProjectData.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/home/model/ResponseHotProjectData.kt rename to app/src/main/java/com/infra/infraandroid/home/model/ResponseHotProjectData.kt index e5024d9..c9497c8 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/ResponseHotProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/ResponseHotProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model data class ResponseHotProjectData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/home/model/ResponseSearchProjectData.kt b/app/src/main/java/com/infra/infraandroid/home/model/ResponseSearchProjectData.kt similarity index 92% rename from app/src/main/java/com/example/infraandroid/home/model/ResponseSearchProjectData.kt rename to app/src/main/java/com/infra/infraandroid/home/model/ResponseSearchProjectData.kt index 563519d..5c3081d 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/ResponseSearchProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/ResponseSearchProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model data class ResponseSearchProjectData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/home/model/SelfDevelope.kt b/app/src/main/java/com/infra/infraandroid/home/model/SelfDevelope.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/home/model/SelfDevelope.kt rename to app/src/main/java/com/infra/infraandroid/home/model/SelfDevelope.kt index c3deaf2..f192b9f 100644 --- a/app/src/main/java/com/example/infraandroid/home/model/SelfDevelope.kt +++ b/app/src/main/java/com/infra/infraandroid/home/model/SelfDevelope.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.model +package com.infra.infraandroid.home.model data class SelfDevelope( var group: String? = "", diff --git a/app/src/main/java/com/example/infraandroid/home/view/adapter/HotProjectRVAdapter.kt b/app/src/main/java/com/infra/infraandroid/home/view/adapter/HotProjectRVAdapter.kt similarity index 72% rename from app/src/main/java/com/example/infraandroid/home/view/adapter/HotProjectRVAdapter.kt rename to app/src/main/java/com/infra/infraandroid/home/view/adapter/HotProjectRVAdapter.kt index c2ea495..64cb379 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/adapter/HotProjectRVAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/adapter/HotProjectRVAdapter.kt @@ -1,17 +1,13 @@ -package com.example.infraandroid.home.view.adapter +package com.infra.infraandroid.home.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.example.infraandroid.util.ImageRound -import com.example.infraandroid.R -import com.example.infraandroid.category.view.fragment.IdeaListFragmentDirections -import com.example.infraandroid.databinding.ItemProjectBinding -import com.example.infraandroid.home.model.HotProject -import com.example.infraandroid.home.model.ResponseHotProjectData -import com.example.infraandroid.home.view.fragment.HomeFragmentDirections +import com.infra.infraandroid.util.ImageRound +import com.infra.infraandroid.databinding.ItemProjectBinding +import com.infra.infraandroid.home.model.ResponseHotProjectData +import com.infra.infraandroid.home.view.fragment.HomeFragmentDirections class HotProjectRVAdapter (): RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/example/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt b/app/src/main/java/com/infra/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt rename to app/src/main/java/com/infra/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt index 1eee0b2..a2fd453 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/adapter/RecomProjectRVAdapter.kt @@ -1,14 +1,14 @@ -package com.example.infraandroid.home.view.adapter +package com.infra.infraandroid.home.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.infraandroid.util.ImageRound -import com.example.infraandroid.R -import com.example.infraandroid.databinding.ItemProjectBinding -import com.example.infraandroid.home.model.RecommedProject +import com.infra.infraandroid.util.ImageRound +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.ItemProjectBinding +import com.infra.infraandroid.home.model.RecommedProject class RecomProjectRVAdapter(): RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/example/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt b/app/src/main/java/com/infra/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt rename to app/src/main/java/com/infra/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt index 82faffa..7ecd259 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/adapter/SelfDevelopeRVAdapter.kt @@ -1,14 +1,14 @@ -package com.example.infraandroid.home.view.adapter +package com.infra.infraandroid.home.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.infraandroid.util.ImageRound -import com.example.infraandroid.R -import com.example.infraandroid.databinding.ItemProjectBinding -import com.example.infraandroid.home.model.SelfDevelope +import com.infra.infraandroid.util.ImageRound +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.ItemProjectBinding +import com.infra.infraandroid.home.model.SelfDevelope class SelfDevelopeRVAdapter (): RecyclerView.Adapter(){ val selfdevelopeList = mutableListOf() diff --git a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt b/app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectFragment.kt similarity index 96% rename from app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt rename to app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectFragment.kt index 45ba23d..ad39a2e 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.home.view.fragment +package com.infra.infraandroid.home.view.fragment import android.Manifest import android.annotation.SuppressLint @@ -28,18 +28,16 @@ import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider -import androidx.navigation.NavArgs import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.example.infraandroid.R -import com.example.infraandroid.category.view.fragment.CategoryViewIdeaFragmentArgs -import com.example.infraandroid.databinding.FragmentCreateProjectBinding -import com.example.infraandroid.home.model.ResponseCreateProjectData -import com.example.infraandroid.home.viewmodel.CreateProjectViewModel -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentCreateProjectBinding +import com.infra.infraandroid.home.model.ResponseCreateProjectData +import com.infra.infraandroid.home.viewmodel.CreateProjectViewModel +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody @@ -50,7 +48,6 @@ import retrofit2.Response import java.io.File import java.io.IOException import java.time.LocalDate -import java.time.Month import java.util.* diff --git a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt b/app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt rename to app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt index afe8e53..941fea2 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/fragment/CreateProjectSelectCategoryFragment.kt @@ -1,16 +1,14 @@ -package com.example.infraandroid.home.view.fragment +package com.infra.infraandroid.home.view.fragment import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentCreateProjectSelectCategoryBinding -import com.example.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaManageFragmentDirections +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentCreateProjectSelectCategoryBinding // 프로젝트의 종류를 선택하는 spinner와 관련된 .kt파일 // 작성자 : 신승민 diff --git a/app/src/main/java/com/example/infraandroid/home/view/fragment/HomeFragment.kt b/app/src/main/java/com/infra/infraandroid/home/view/fragment/HomeFragment.kt similarity index 89% rename from app/src/main/java/com/example/infraandroid/home/view/fragment/HomeFragment.kt rename to app/src/main/java/com/infra/infraandroid/home/view/fragment/HomeFragment.kt index 39eb20c..272b427 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/fragment/HomeFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/home/view/fragment/HomeFragment.kt @@ -1,20 +1,20 @@ -package com.example.infraandroid.home.view.fragment +package com.infra.infraandroid.home.view.fragment import android.widget.Toast import androidx.navigation.findNavController import com.bumptech.glide.Glide -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentHomeBinding -import com.example.infraandroid.home.model.HotProject -import com.example.infraandroid.home.model.RecommedProject -import com.example.infraandroid.home.model.ResponseHotProjectData -import com.example.infraandroid.home.model.SelfDevelope -import com.example.infraandroid.home.view.adapter.HotProjectRVAdapter -import com.example.infraandroid.home.view.adapter.RecomProjectRVAdapter -import com.example.infraandroid.home.view.adapter.SelfDevelopeRVAdapter -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentHomeBinding +import com.infra.infraandroid.home.model.HotProject +import com.infra.infraandroid.home.model.RecommedProject +import com.infra.infraandroid.home.model.ResponseHotProjectData +import com.infra.infraandroid.home.model.SelfDevelope +import com.infra.infraandroid.home.view.adapter.HotProjectRVAdapter +import com.infra.infraandroid.home.view.adapter.RecomProjectRVAdapter +import com.infra.infraandroid.home.view.adapter.SelfDevelopeRVAdapter +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt b/app/src/main/java/com/infra/infraandroid/home/viewmodel/CreateProjectViewModel.kt similarity index 97% rename from app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt rename to app/src/main/java/com/infra/infraandroid/home/viewmodel/CreateProjectViewModel.kt index 4ac9eb0..6e0b338 100644 --- a/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt +++ b/app/src/main/java/com/infra/infraandroid/home/viewmodel/CreateProjectViewModel.kt @@ -1,9 +1,8 @@ -package com.example.infraandroid.home.viewmodel +package com.infra.infraandroid.home.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import java.lang.reflect.Array.get class CreateProjectViewModel : ViewModel() { private val hashTagArrayList = ArrayList() diff --git a/app/src/main/java/com/example/infraandroid/id/model/LoginService.kt b/app/src/main/java/com/infra/infraandroid/id/model/LoginService.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/id/model/LoginService.kt rename to app/src/main/java/com/infra/infraandroid/id/model/LoginService.kt index 470508d..5bbdcd5 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/LoginService.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/LoginService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import retrofit2.Call import retrofit2.http.Body diff --git a/app/src/main/java/com/infra/infraandroid/id/model/NaverLogin.kt b/app/src/main/java/com/infra/infraandroid/id/model/NaverLogin.kt new file mode 100644 index 0000000..4ea20de --- /dev/null +++ b/app/src/main/java/com/infra/infraandroid/id/model/NaverLogin.kt @@ -0,0 +1,5 @@ +package com.infra.infraandroid.id.model + +class NaverLogin { +} + diff --git a/app/src/main/java/com/example/infraandroid/id/model/PWService.kt b/app/src/main/java/com/infra/infraandroid/id/model/PWService.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/id/model/PWService.kt rename to app/src/main/java/com/infra/infraandroid/id/model/PWService.kt index 3b8fac7..8d2db62 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/PWService.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/PWService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import retrofit2.Call import retrofit2.http.Body diff --git a/app/src/main/java/com/example/infraandroid/id/model/RequestLoginData.kt b/app/src/main/java/com/infra/infraandroid/id/model/RequestLoginData.kt similarity index 82% rename from app/src/main/java/com/example/infraandroid/id/model/RequestLoginData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/RequestLoginData.kt index 3df7052..f334880 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/RequestLoginData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/RequestLoginData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/id/model/RequestPWData.kt b/app/src/main/java/com/infra/infraandroid/id/model/RequestPWData.kt similarity index 77% rename from app/src/main/java/com/example/infraandroid/id/model/RequestPWData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/RequestPWData.kt index a5b76dd..296d32d 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/RequestPWData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/RequestPWData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/id/model/RequestSMSData.kt b/app/src/main/java/com/infra/infraandroid/id/model/RequestSMSData.kt similarity index 73% rename from app/src/main/java/com/example/infraandroid/id/model/RequestSMSData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/RequestSMSData.kt index c5419b1..6e5f911 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/RequestSMSData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/RequestSMSData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model data class RequestSMSData( val recipientPhoneNumber : String, diff --git a/app/src/main/java/com/example/infraandroid/id/model/RequestUserData.kt b/app/src/main/java/com/infra/infraandroid/id/model/RequestUserData.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/id/model/RequestUserData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/RequestUserData.kt index e4ff699..18a8933 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/RequestUserData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/RequestUserData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/id/model/ResponseCheckUserIdData.kt b/app/src/main/java/com/infra/infraandroid/id/model/ResponseCheckUserIdData.kt similarity index 76% rename from app/src/main/java/com/example/infraandroid/id/model/ResponseCheckUserIdData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/ResponseCheckUserIdData.kt index 5721d55..7ba36ae 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/ResponseCheckUserIdData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/ResponseCheckUserIdData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model data class ResponseCheckUserIdData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/id/model/ResponseLoginData.kt b/app/src/main/java/com/infra/infraandroid/id/model/ResponseLoginData.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/id/model/ResponseLoginData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/ResponseLoginData.kt index 1b6b7d8..12531c1 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/ResponseLoginData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/ResponseLoginData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/id/model/ResponsePWData.kt b/app/src/main/java/com/infra/infraandroid/id/model/ResponsePWData.kt similarity index 75% rename from app/src/main/java/com/example/infraandroid/id/model/ResponsePWData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/ResponsePWData.kt index d2254c1..7f94e2c 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/ResponsePWData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/ResponsePWData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model data class ResponsePWData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/id/model/ResponseSMSData.kt b/app/src/main/java/com/infra/infraandroid/id/model/ResponseSMSData.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/id/model/ResponseSMSData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/ResponseSMSData.kt index 2b9e6f7..5fdbe54 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/ResponseSMSData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/ResponseSMSData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model data class ResponseSMSData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/id/model/ResponseUserData.kt b/app/src/main/java/com/infra/infraandroid/id/model/ResponseUserData.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/id/model/ResponseUserData.kt rename to app/src/main/java/com/infra/infraandroid/id/model/ResponseUserData.kt index 8775a07..1b79523 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/ResponseUserData.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/ResponseUserData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/id/model/SMSService.kt b/app/src/main/java/com/infra/infraandroid/id/model/SMSService.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/id/model/SMSService.kt rename to app/src/main/java/com/infra/infraandroid/id/model/SMSService.kt index 044f13b..dcdc8f2 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/SMSService.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/SMSService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import retrofit2.Call import retrofit2.http.Body diff --git a/app/src/main/java/com/example/infraandroid/id/model/SignUpService.kt b/app/src/main/java/com/infra/infraandroid/id/model/SignUpService.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/id/model/SignUpService.kt rename to app/src/main/java/com/infra/infraandroid/id/model/SignUpService.kt index a31059c..4380dd7 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/SignUpService.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/SignUpService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import retrofit2.Call import retrofit2.http.Body diff --git a/app/src/main/java/com/example/infraandroid/id/model/UserDoubleCheckService.kt b/app/src/main/java/com/infra/infraandroid/id/model/UserDoubleCheckService.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/id/model/UserDoubleCheckService.kt rename to app/src/main/java/com/infra/infraandroid/id/model/UserDoubleCheckService.kt index 049210c..3ecc1b6 100644 --- a/app/src/main/java/com/example/infraandroid/id/model/UserDoubleCheckService.kt +++ b/app/src/main/java/com/infra/infraandroid/id/model/UserDoubleCheckService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.model +package com.infra.infraandroid.id.model import retrofit2.Call import retrofit2.http.GET diff --git a/app/src/main/java/com/example/infraandroid/id/view/FindPWFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/FindPWFragment.kt similarity index 83% rename from app/src/main/java/com/example/infraandroid/id/view/FindPWFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/FindPWFragment.kt index e2aacc1..01852ad 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/FindPWFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/FindPWFragment.kt @@ -1,25 +1,21 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log -import android.widget.EditText import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.category.model.ResponseViewIdeaData -import com.example.infraandroid.databinding.FragmentFindPwBinding -import com.example.infraandroid.id.model.RequestPWData -import com.example.infraandroid.id.model.ResponsePWData -import com.example.infraandroid.id.viewmodel.SignUpViewModel -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentFindPwBinding +import com.infra.infraandroid.id.model.RequestPWData +import com.infra.infraandroid.id.model.ResponsePWData +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.http.Tag import java.util.regex.Pattern class FindPWFragment : BaseFragment(R.layout.fragment_find_pw){ diff --git a/app/src/main/java/com/example/infraandroid/id/view/FindPWSecondFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/FindPWSecondFragment.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/id/view/FindPWSecondFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/FindPWSecondFragment.kt index 111d6d9..373b076 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/FindPWSecondFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/FindPWSecondFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.ImageView import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSecondFindPwBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSecondFindPwBinding class FindPWSecondFragment : Fragment() { private var mBinding : FragmentSecondFindPwBinding? = null diff --git a/app/src/main/java/com/example/infraandroid/id/view/LoginFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/LoginFragment.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/id/view/LoginFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/LoginFragment.kt index 1f2c8c6..fe0dbaf 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/LoginFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/LoginFragment.kt @@ -1,27 +1,19 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.content.Context -import android.content.Intent -import android.content.IntentSender import android.util.Log -import android.widget.Button import android.widget.Toast import androidx.navigation.findNavController -import androidx.navigation.fragment.findNavController //import com.example.infraandroid.BuildConfig -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentLoginBinding -import com.example.infraandroid.id.model.RequestLoginData -import com.example.infraandroid.id.model.ResponseLoginData -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentLoginBinding +import com.infra.infraandroid.id.model.RequestLoginData +import com.infra.infraandroid.id.model.ResponseLoginData +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.ServiceCreator import com.google.android.gms.auth.api.identity.BeginSignInRequest -import com.google.android.gms.auth.api.identity.Identity import com.google.android.gms.auth.api.identity.SignInClient -import com.google.android.gms.common.api.ApiException -import com.google.android.gms.common.api.CommonStatusCodes import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/id/view/SignUpFirstFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/SignUpFirstFragment.kt similarity index 95% rename from app/src/main/java/com/example/infraandroid/id/view/SignUpFirstFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/SignUpFirstFragment.kt index 419c9cb..e227c25 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/SignUpFirstFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/SignUpFirstFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.text.Editable @@ -17,16 +17,16 @@ import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSignUpFirstBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.id.model.ResponseCheckUserIdData -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSignUpFirstBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.id.model.ResponseCheckUserIdData +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response import java.util.regex.Pattern -import com.example.infraandroid.id.viewmodel.SignUpViewModel +import com.infra.infraandroid.id.viewmodel.SignUpViewModel // 회원가입 first depth 페이지 diff --git a/app/src/main/java/com/example/infraandroid/id/view/SignUpFourthFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/SignUpFourthFragment.kt similarity index 90% rename from app/src/main/java/com/example/infraandroid/id/view/SignUpFourthFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/SignUpFourthFragment.kt index 977fce2..49eba89 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/SignUpFourthFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/SignUpFourthFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import androidx.appcompat.widget.AppCompatButton import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSignUpFourthBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSignUpFourthBinding // 회원가입 fourth depth 페이지 (회원 가입 완료 페이지) diff --git a/app/src/main/java/com/example/infraandroid/id/view/SignUpSecondFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/SignUpSecondFragment.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/id/view/SignUpSecondFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/SignUpSecondFragment.kt index 019bb73..aef5df9 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/SignUpSecondFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/SignUpSecondFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.text.Editable @@ -16,13 +16,13 @@ import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSignUpSecondBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.id.model.RequestSMSData -import com.example.infraandroid.id.model.ResponseSMSData -import com.example.infraandroid.util.ServiceCreator -import com.example.infraandroid.id.viewmodel.SignUpViewModel +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSignUpSecondBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.id.model.RequestSMSData +import com.infra.infraandroid.id.model.ResponseSMSData +import com.infra.infraandroid.util.ServiceCreator +import com.infra.infraandroid.id.viewmodel.SignUpViewModel import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/id/view/SignUpThirdFragment.kt b/app/src/main/java/com/infra/infraandroid/id/view/SignUpThirdFragment.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/id/view/SignUpThirdFragment.kt rename to app/src/main/java/com/infra/infraandroid/id/view/SignUpThirdFragment.kt index 62079b9..09a1b7b 100644 --- a/app/src/main/java/com/example/infraandroid/id/view/SignUpThirdFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/id/view/SignUpThirdFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.view +package com.infra.infraandroid.id.view import android.os.Bundle import android.text.Editable @@ -14,13 +14,13 @@ import androidx.appcompat.widget.AppCompatButton import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSignUpThirdBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.id.model.RequestUserData -import com.example.infraandroid.id.model.ResponseUserData -import com.example.infraandroid.util.ServiceCreator -import com.example.infraandroid.id.viewmodel.SignUpViewModel +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSignUpThirdBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.id.model.RequestUserData +import com.infra.infraandroid.id.model.ResponseUserData +import com.infra.infraandroid.util.ServiceCreator +import com.infra.infraandroid.id.viewmodel.SignUpViewModel import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/id/viewmodel/Prefs.kt b/app/src/main/java/com/infra/infraandroid/id/viewmodel/Prefs.kt similarity index 95% rename from app/src/main/java/com/example/infraandroid/id/viewmodel/Prefs.kt rename to app/src/main/java/com/infra/infraandroid/id/viewmodel/Prefs.kt index 40219bc..9cb2ffb 100644 --- a/app/src/main/java/com/example/infraandroid/id/viewmodel/Prefs.kt +++ b/app/src/main/java/com/infra/infraandroid/id/viewmodel/Prefs.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.id.viewmodel +package com.infra.infraandroid.id.viewmodel import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/com/example/infraandroid/id/viewmodel/SignUpViewModel.kt b/app/src/main/java/com/infra/infraandroid/id/viewmodel/SignUpViewModel.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/id/viewmodel/SignUpViewModel.kt rename to app/src/main/java/com/infra/infraandroid/id/viewmodel/SignUpViewModel.kt index 4e6cccf..cae929c 100644 --- a/app/src/main/java/com/example/infraandroid/id/viewmodel/SignUpViewModel.kt +++ b/app/src/main/java/com/infra/infraandroid/id/viewmodel/SignUpViewModel.kt @@ -1,6 +1,5 @@ -package com.example.infraandroid.id.viewmodel +package com.infra.infraandroid.id.viewmodel -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/example/infraandroid/myinfo/MyInfoFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/MyInfoFragment.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/myinfo/MyInfoFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/MyInfoFragment.kt index 9485afb..ba5c624 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/MyInfoFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/MyInfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo +package com.infra.infraandroid.myinfo import android.content.Intent import android.net.Uri @@ -9,11 +9,10 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import androidx.navigation.fragment.findNavController import com.bumptech.glide.Glide -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentMyInfoBinding +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentMyInfoBinding import com.google.android.gms.oss.licenses.OssLicensesMenuActivity //import com.google.android.gms.oss.licenses.OssLicensesActivity diff --git a/app/src/main/java/com/example/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt similarity index 54% rename from app/src/main/java/com/example/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt index 6e08a3e..eb26f1e 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/applicationstatus/view/ApplicationStatusFragment.kt @@ -1,8 +1,8 @@ -package com.example.infraandroid.myinfo.applicationstatus.view +package com.infra.infraandroid.myinfo.applicationstatus.view -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentApplicationStatusBinding -import com.example.infraandroid.util.BaseFragment +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentApplicationStatusBinding +import com.infra.infraandroid.util.BaseFragment class ApplicationStatusFragment: BaseFragment(R.layout.fragment_application_status){ override fun FragmentApplicationStatusBinding.onCreateView(){ diff --git a/app/src/main/java/com/example/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt index 7a67ed8..93a77fe 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/hashtagalarm/view/HashTagAlarmFragment.kt @@ -1,13 +1,12 @@ -package com.example.infraandroid.myinfo.hashtagalarm.view +package com.infra.infraandroid.myinfo.hashtagalarm.view import android.content.Context.INPUT_METHOD_SERVICE -import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.EditText import androidx.core.view.isVisible -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentHashTagAlarmBinding -import com.example.infraandroid.util.BaseFragment +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentHashTagAlarmBinding +import com.infra.infraandroid.util.BaseFragment import com.google.android.material.chip.Chip // 2022-02-24 해시태크 알람페이지 (작성자 : 신승민) diff --git a/app/src/main/java/com/infra/infraandroid/myinfo/history/view/HistoryFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/history/view/HistoryFragment.kt new file mode 100644 index 0000000..905ea26 --- /dev/null +++ b/app/src/main/java/com/infra/infraandroid/myinfo/history/view/HistoryFragment.kt @@ -0,0 +1,13 @@ +package com.infra.infraandroid.myinfo.history.view + +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentHistoryBinding +import com.infra.infraandroid.util.BaseFragment + +class HistoryFragment : BaseFragment(R.layout.fragment_history){ + override fun FragmentHistoryBinding.onCreateView(){ + } + + override fun FragmentHistoryBinding.onViewCreated(){ + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt index 8ed4b63..b4f54d0 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaListInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class MyIdeaListInfo( diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt similarity index 60% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt index 7ae0d8d..099b346 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberApplyManageInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class MyIdeaMemberApplyManageInfo( var profileImg : Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt similarity index 59% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt index bfc796c..7385ba7 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyIdeaMemberManageInfo.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class MyIdeaMemberManageInfo( var profileImg : Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectService.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectService.kt similarity index 92% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectService.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectService.kt index b74d49b..65a2810 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectService.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectService.kt @@ -1,6 +1,5 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model -import com.example.infraandroid.category.model.ResponseLookUpAllProjectData import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Call diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt similarity index 98% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt index b3df099..dbbd20f 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/MyProjectViewModel.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt similarity index 65% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt index 677a87b..7c39875 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestAcceptData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class RequestAcceptData( val pj_inviteStatus: String, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt similarity index 59% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt index 5fc4fea..a6bf495 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestDeleteProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class RequestDeleteProjectData( val pj_num: Int?, diff --git a/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt new file mode 100644 index 0000000..d43193a --- /dev/null +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/RequestTeamMemberData.kt @@ -0,0 +1,5 @@ +package com.infra.infraandroid.myinfo.myideamanage.model + +data class RequestTeamMemberData( + val pj_num: Int? +) \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt similarity index 76% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt index 3b37558..c57ecdb 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseAcceptData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseAcceptData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt similarity index 76% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt index 48128cf..eda327b 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseDeleteProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseDeleteProjectData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt similarity index 76% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt index e0bec7a..f95b98a 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseModifyProjectData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseModifyProjectData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt index a73096c..f25dd78 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseMyProjectListData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseMyProjectListData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt similarity index 82% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt index 7d78339..6590064 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseTeamMemberData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseTeamMemberData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt index f9451a0..4700414 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/model/ResponseViewProjectApplyData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.model +package com.infra.infraandroid.myinfo.myideamanage.model data class ResponseViewProjectApplyData( val code: Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt index 342c274..4609858 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningAcceptDialog.kt @@ -1,26 +1,21 @@ -package com.example.infraandroid.myinfo.myideamanage.view +package com.infra.infraandroid.myinfo.myideamanage.view -import android.app.Dialog -import android.content.Context import android.content.res.Resources -import android.graphics.Color import android.graphics.Rect -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import android.widget.Toast import androidx.fragment.app.DialogFragment import androidx.lifecycle.ViewModelProvider -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoMyIdeaAcceptWarningBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.model.RequestAcceptData -import com.example.infraandroid.myinfo.myideamanage.model.ResponseAcceptData -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoMyIdeaAcceptWarningBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.myinfo.myideamanage.model.RequestAcceptData +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseAcceptData +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt index 0265ff0..376829d 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view +package com.infra.infraandroid.myinfo.myideamanage.view import android.content.res.Resources import android.graphics.Rect @@ -6,19 +6,16 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.DialogFragment -import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoMyProjectDeleteWarningBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.model.RequestDeleteProjectData -import com.example.infraandroid.myinfo.myideamanage.model.ResponseDeleteProjectData -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoMyProjectDeleteWarningBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.myinfo.myideamanage.model.RequestDeleteProjectData +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseDeleteProjectData +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt index f6ac81c..93eac7e 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningKickOutDialog.kt @@ -1,17 +1,13 @@ -package com.example.infraandroid.myinfo.myideamanage.view +package com.infra.infraandroid.myinfo.myideamanage.view -import android.app.Dialog -import android.content.Context import android.content.res.Resources -import android.graphics.Color import android.graphics.Rect -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoMyIdeaKickOutWarningBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoMyIdeaKickOutWarningBinding // 내 정보 > 내 아이디어 > 팀원 탭 > 신청관리 > 강퇴 시 나오는 dialog class WarningKickOutDialog : DialogFragment() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt index b4e4257..9e115f7 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/WarningRejectDialog.kt @@ -1,26 +1,21 @@ -package com.example.infraandroid.myinfo.myideamanage.view +package com.infra.infraandroid.myinfo.myideamanage.view -import android.app.Dialog -import android.content.Context import android.content.res.Resources -import android.graphics.Color import android.graphics.Rect -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import android.widget.Toast import androidx.fragment.app.DialogFragment import androidx.lifecycle.ViewModelProvider -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoMyIdeaRejectWarningBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.model.RequestAcceptData -import com.example.infraandroid.myinfo.myideamanage.model.ResponseAcceptData -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoMyIdeaRejectWarningBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.myinfo.myideamanage.model.RequestAcceptData +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseAcceptData +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt similarity index 74% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt index a011c61..b0d3690 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaListAdapter.kt @@ -1,16 +1,12 @@ -package com.example.infraandroid.myinfo.myideamanage.view.adapter +package com.infra.infraandroid.myinfo.myideamanage.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.example.infraandroid.util.ImageRound -import com.example.infraandroid.R -import com.example.infraandroid.databinding.ItemMyIdeaListRecyclerviewBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyIdeaListInfo -import com.example.infraandroid.myinfo.myideamanage.model.ResponseMyProjectListData -import com.example.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaManageFragmentDirections +import com.infra.infraandroid.databinding.ItemMyIdeaListRecyclerviewBinding +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseMyProjectListData +import com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaManageFragmentDirections class MyIdeaListAdapter(): RecyclerView.Adapter() { var myIdeaList = mutableListOf() diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt similarity index 78% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt index 2e536df..eeb26a4 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/MyIdeaMemberApplyAdapter.kt @@ -1,20 +1,14 @@ -package com.example.infraandroid.myinfo.myideamanage.view.adapter +package com.infra.infraandroid.myinfo.myideamanage.view.adapter -import android.app.Activity import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.fragment.app.FragmentActivity -import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView -import com.example.infraandroid.R -import com.example.infraandroid.databinding.ItemTeamMemberApplicationRecyclerviewBinding -import com.example.infraandroid.myinfo.myideamanage.view.WarningAcceptDialog -import com.example.infraandroid.myinfo.myideamanage.view.WarningRejectDialog -import com.example.infraandroid.myinfo.myideamanage.model.MyIdeaMemberApplyManageInfo -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.model.ResponseViewProjectApplyData -import com.example.infraandroid.myinfo.myinfomodify.view.MyInfoPhotoMoreMenuBottomSheetFragment +import com.infra.infraandroid.databinding.ItemTeamMemberApplicationRecyclerviewBinding +import com.infra.infraandroid.myinfo.myideamanage.view.WarningAcceptDialog +import com.infra.infraandroid.myinfo.myideamanage.view.WarningRejectDialog +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseViewProjectApplyData //fragmentManager: FragmentManager class MyIdeaMemberApplyAdapter(activity: FragmentActivity?): RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt similarity index 90% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt index 3f488e6..c86a6d2 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/adapter/TeamPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view.adapter +package com.infra.infraandroid.myinfo.myideamanage.view.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt index e8252ed..2ab9cef 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaCategoryModifyFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.os.Bundle import android.util.Log @@ -10,12 +10,9 @@ import androidx.constraintlayout.widget.ConstraintLayoutStates.TAG import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController -import androidx.navigation.fragment.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentModifyCategoryBinding -import com.example.infraandroid.home.view.fragment.CreateProjectSelectCategoryFragmentDirections -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.util.BaseFragment +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentModifyCategoryBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel class MyIdeaCategoryModifyFragment : Fragment(){ private lateinit var viewModel : MyProjectViewModel diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt index 2568c1d..79e7e89 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.content.ContentValues import android.os.Bundle @@ -11,10 +11,10 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import androidx.viewpager2.widget.ViewPager2 -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoTeamIdeaBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.view.adapter.TeamPagerAdapter +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoTeamIdeaBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.myinfo.myideamanage.view.adapter.TeamPagerAdapter import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt similarity index 82% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt index 43d0800..479e396 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaManageFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.os.Bundle import android.view.LayoutInflater @@ -6,13 +6,12 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentMyInfoMyIdeaBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyIdeaListInfo -import com.example.infraandroid.myinfo.myideamanage.model.ResponseMyProjectListData -import com.example.infraandroid.myinfo.myideamanage.view.adapter.MyIdeaListAdapter -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentMyInfoMyIdeaBinding +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseMyProjectListData +import com.infra.infraandroid.myinfo.myideamanage.view.adapter.MyIdeaListAdapter +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt similarity index 86% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt index 9867782..faf75c0 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberFragment.kt @@ -1,20 +1,15 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment -import android.app.Service import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentTeamMemberBinding -import com.example.infraandroid.myinfo.myideamanage.model.* -import com.example.infraandroid.myinfo.myideamanage.view.adapter.MyIdeaMemberApplyAdapter -import com.example.infraandroid.myinfo.teammembereval.view.adapter.TeamMemberAdapter -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentTeamMemberBinding +import com.infra.infraandroid.myinfo.myideamanage.model.* +import com.infra.infraandroid.myinfo.myideamanage.view.adapter.MyIdeaMemberApplyAdapter +import com.infra.infraandroid.myinfo.teammembereval.view.adapter.TeamMemberAdapter +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt index 6d491e2..4bcc577 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaMemberInfoBottomSheetFragment.kt @@ -1,12 +1,12 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.app.Activity import android.app.Dialog import android.os.Bundle import android.util.DisplayMetrics import android.view.View -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyInfoTeamInfoBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoTeamInfoBinding import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt index 7f58f33..56a1e36 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyFragment.kt @@ -1,21 +1,16 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import androidx.core.view.isVisible -import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController -import androidx.navigation.fragment.navArgs -import com.example.infraandroid.R -import com.example.infraandroid.category.model.ResponseViewIdeaData -import com.example.infraandroid.databinding.FragmentTeamIdeaBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.category.model.ResponseViewIdeaData +import com.infra.infraandroid.databinding.FragmentTeamIdeaBinding +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt similarity index 95% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt index d1d11d0..d45ea00 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaModifyPageFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment import android.Manifest import android.annotation.SuppressLint @@ -14,9 +14,6 @@ import android.os.Build import android.os.Bundle import android.provider.MediaStore import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import androidx.lifecycle.Observer import android.widget.TextView import android.widget.Toast @@ -25,23 +22,18 @@ import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.view.isGone import androidx.core.view.isVisible -import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController -import androidx.navigation.fragment.navArgs import com.bumptech.glide.Glide -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentMyInfoProjectModifyBinding -import com.example.infraandroid.home.model.ResponseCreateProjectData -import com.example.infraandroid.home.view.fragment.CreateProjectFragmentArgs -import com.example.infraandroid.id.viewmodel.SignUpViewModel -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myideamanage.model.ResponseModifyProjectData -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentMyInfoProjectModifyBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectViewModel +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseModifyProjectData +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody @@ -51,7 +43,6 @@ import retrofit2.Callback import retrofit2.Response import java.io.File import java.io.IOException -import java.net.URL import java.time.LocalDate import java.util.* diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt similarity index 72% rename from app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt index cafc7dd..c72e726 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt @@ -1,19 +1,13 @@ -package com.example.infraandroid.myinfo.myideamanage.view.fragment +package com.infra.infraandroid.myinfo.myideamanage.view.fragment -import android.annotation.SuppressLint -import android.app.Dialog -import android.content.DialogInterface import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyProjectMoreMenuBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.myinfo.myideamanage.view.WarningDeleteDialog +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyProjectMoreMenuBinding +import com.infra.infraandroid.myinfo.myideamanage.view.WarningDeleteDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment class MyProjectMoreMenuBottomSheetFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt similarity index 86% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt index 1d78717..0688831 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfointerest/MyInfoInterestFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfointerest +package com.infra.infraandroid.myinfo.myinfointerest import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentMyInfoInterestBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentMyInfoInterestBinding //내 정보 > 관심 분야 설정 class MyInfoInterestFragment: Fragment(){ diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt similarity index 91% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt index e298638..9aa1885 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/MyInfoService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model import okhttp3.MultipartBody import okhttp3.RequestBody diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt similarity index 81% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt index 46a8036..4a74dbd 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/NicknameDoubleCheckService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model import retrofit2.Call import retrofit2.http.Body diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt similarity index 72% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt index a129ee4..1318629 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/RequestNicknameCheckData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt similarity index 69% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt index a5ebf60..3977d37 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseModifyMyInfoData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model data class ResponseModifyMyInfoData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt similarity index 69% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt index 14c5d6f..c2710a2 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseNicknameCheckData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model data class ResponseNicknameCheckData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt index ca87490..635ca28 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/model/ResponseViewMyInfoData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.model +package com.infra.infraandroid.myinfo.myinfomodify.model data class ResponseViewMyInfoData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt similarity index 90% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt index 0826bcf..37f7b22 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoModifyFragment.kt @@ -1,30 +1,18 @@ -package com.example.infraandroid.myinfo.myinfomodify.view +package com.infra.infraandroid.myinfo.myinfomodify.view import android.content.ContentValues.TAG -import android.text.Editable -import android.text.TextWatcher import android.util.Log -import android.widget.EditText -import android.widget.ImageView import android.widget.TextView -import android.widget.Toast -import androidx.appcompat.widget.AppCompatButton -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController import com.bumptech.glide.Glide -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentMyInfoModifyBinding -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectViewModel -import com.example.infraandroid.myinfo.myinfomodify.model.RequestNicknameCheckData -import com.example.infraandroid.myinfo.myinfomodify.model.ResponseModifyMyInfoData -import com.example.infraandroid.myinfo.myinfomodify.model.ResponseNicknameCheckData -import com.example.infraandroid.myinfo.myinfomodify.model.ResponseViewMyInfoData -import com.example.infraandroid.myinfo.myinfomodify.viewmodel.MyInfoViewModel -import com.example.infraandroid.util.BaseFragment -import com.example.infraandroid.util.InfraApplication -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentMyInfoModifyBinding +import com.infra.infraandroid.myinfo.myinfomodify.model.ResponseModifyMyInfoData +import com.infra.infraandroid.myinfo.myinfomodify.viewmodel.MyInfoViewModel +import com.infra.infraandroid.util.BaseFragment +import com.infra.infraandroid.util.InfraApplication +import com.infra.infraandroid.util.ServiceCreator import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt similarity index 90% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt index 80f6d3a..f49d40f 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/view/MyInfoPhotoMoreMenuBottomSheetFragment.kt @@ -1,9 +1,8 @@ -package com.example.infraandroid.myinfo.myinfomodify.view +package com.infra.infraandroid.myinfo.myinfomodify.view import android.Manifest import android.annotation.SuppressLint import android.app.Activity -import android.app.Dialog import android.content.Intent import android.content.pm.PackageManager import android.database.Cursor @@ -19,16 +18,9 @@ import android.view.ViewGroup import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import androidx.core.view.isGone -import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider -import androidx.navigation.fragment.findNavController -import com.bumptech.glide.Glide -import com.example.infraandroid.R -import com.example.infraandroid.databinding.MyProjectMoreMenuBinding -import com.example.infraandroid.databinding.PhotoMoreMenuBinding -import com.example.infraandroid.myinfo.myideamanage.view.WarningDeleteDialog -import com.example.infraandroid.myinfo.myinfomodify.viewmodel.MyInfoViewModel +import com.infra.infraandroid.databinding.PhotoMoreMenuBinding +import com.infra.infraandroid.myinfo.myinfomodify.viewmodel.MyInfoViewModel import com.google.android.material.bottomsheet.BottomSheetDialogFragment import okhttp3.MultipartBody import java.io.IOException diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt similarity index 93% rename from app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt index 5afd33b..8cb2d6e 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myinfomodify/viewmodel/MyInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myinfomodify.viewmodel +package com.infra.infraandroid.myinfo.myinfomodify.viewmodel import android.graphics.Bitmap import androidx.lifecycle.LiveData diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt similarity index 77% rename from app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt index 43ebedc..1dcf675 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ProfileViewService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myintroductionpage.model +package com.infra.infraandroid.myinfo.myintroductionpage.model import retrofit2.http.GET import retrofit2.http.Path diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt index de6ceae..c303a95 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/model/ResponseProfileViewData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myintroductionpage.model +package com.infra.infraandroid.myinfo.myintroductionpage.model data class ResponseProfileViewData( val isSuccess: Boolean, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt similarity index 89% rename from app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt index 78ae811..1ffa734 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroPageModifyBottomSheetFragment.kt @@ -1,16 +1,12 @@ -package com.example.infraandroid.myinfo.myintroductionpage.view +package com.infra.infraandroid.myinfo.myintroductionpage.view import android.app.Activity import android.app.Dialog import android.os.Bundle import android.util.DisplayMetrics -import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import com.example.infraandroid.R -import com.example.infraandroid.databinding.CategoryInformationBinding -import com.example.infraandroid.databinding.MyInfoModifyMenuBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.MyInfoModifyMenuBinding import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt similarity index 92% rename from app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt index 0c2b6f9..8949c61 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/myintroductionpage/view/MyIntroductionPageFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.myintroductionpage.view +package com.infra.infraandroid.myinfo.myintroductionpage.view import android.os.Bundle import android.util.Log @@ -7,11 +7,10 @@ import android.view.View import android.view.ViewGroup import android.widget.* import androidx.fragment.app.Fragment -import com.example.infraandroid.databinding.MyInfoInformationBinding -import com.example.infraandroid.id.model.RequestLoginData -import com.example.infraandroid.id.viewmodel.SignUpViewModel -import com.example.infraandroid.myinfo.myintroductionpage.model.ResponseProfileViewData -import com.example.infraandroid.util.ServiceCreator +import com.infra.infraandroid.databinding.MyInfoInformationBinding +import com.infra.infraandroid.id.viewmodel.SignUpViewModel +import com.infra.infraandroid.myinfo.myintroductionpage.model.ResponseProfileViewData +import com.infra.infraandroid.util.ServiceCreator import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/infra/infraandroid/myinfo/scrap/view/ScrapFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/scrap/view/ScrapFragment.kt new file mode 100644 index 0000000..c600906 --- /dev/null +++ b/app/src/main/java/com/infra/infraandroid/myinfo/scrap/view/ScrapFragment.kt @@ -0,0 +1,15 @@ +package com.infra.infraandroid.myinfo.scrap.view + +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentScrapBinding +import com.infra.infraandroid.util.BaseFragment + +class ScrapFragment : BaseFragment(R.layout.fragment_scrap){ + override fun FragmentScrapBinding.onCreateView(){ + + } + + override fun FragmentScrapBinding.onViewCreated(){ + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt similarity index 70% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt index ce45ed7..dd238ba 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/RequestJoinedUserData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model +package com.infra.infraandroid.myinfo.teammembereval.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt similarity index 85% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt index f551ca1..86e0388 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/ResponseJoinedUserData.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model +package com.infra.infraandroid.myinfo.teammembereval.model import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt similarity index 64% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt index 0929382..bd06b15 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalManagementList.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model +package com.infra.infraandroid.myinfo.teammembereval.model data class TeamEvalManagementList( var profileImg : Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt similarity index 57% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt index afbde03..1fdee01 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalMemberList.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model +package com.infra.infraandroid.myinfo.teammembereval.model data class TeamEvalMemberList( var profileImg : Int, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt similarity index 52% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt index 5f02411..c352c34 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamEvalTeamList.kt @@ -1,6 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model - -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalMemberList +package com.infra.infraandroid.myinfo.teammembereval.model data class TeamEvalTeamList( var category : String, diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt index 7ef5ff3..429cee5 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/model/TeamMemberService.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.model +package com.infra.infraandroid.myinfo.teammembereval.model import retrofit2.Call import retrofit2.http.Header diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt similarity index 84% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt index d2ed71f..50b6cb9 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalManagementAdapter.kt @@ -1,10 +1,10 @@ -package com.example.infraandroid.myinfo.teammembereval.view.adapter +package com.infra.infraandroid.myinfo.teammembereval.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.infraandroid.databinding.ItemManagementTeamRecyclerviewBinding -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalManagementList +import com.infra.infraandroid.databinding.ItemManagementTeamRecyclerviewBinding +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalManagementList class TeamEvalManagementAdapter(): RecyclerView.Adapter() { val teamEvalManagementList = mutableListOf() diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt similarity index 79% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt index 82a4bda..70090f7 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalMemberListAdapter.kt @@ -1,14 +1,12 @@ -package com.example.infraandroid.myinfo.teammembereval.view.adapter +package com.infra.infraandroid.myinfo.teammembereval.view.adapter -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView -import com.example.infraandroid.R -import com.example.infraandroid.databinding.ItemEvalTeamMemberListRecyclerviewBinding -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalMemberList +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.ItemEvalTeamMemberListRecyclerviewBinding +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalMemberList //context: Context, val teamEvalMemberList: MutableList class TeamEvalMemberListAdapter(private val itemList : MutableList): RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt similarity index 89% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt index 161da06..f8103e9 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.view.adapter +package com.infra.infraandroid.myinfo.teammembereval.view.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt similarity index 87% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt index 2a8ed0c..2c03b81 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamEvalTeamListAdapter.kt @@ -1,10 +1,10 @@ -package com.example.infraandroid.myinfo.teammembereval.view.adapter +package com.infra.infraandroid.myinfo.teammembereval.view.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.infraandroid.databinding.ItemEvalTeamListRecyclerviewBinding -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalTeamList +import com.infra.infraandroid.databinding.ItemEvalTeamListRecyclerviewBinding +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalTeamList class TeamEvalTeamListAdapter(): RecyclerView.Adapter() { val teamEvalTeamList = mutableListOf() diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt similarity index 80% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt index 04bb191..a1dcb39 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/adapter/TeamMemberAdapter.kt @@ -1,13 +1,11 @@ -package com.example.infraandroid.myinfo.teammembereval.view.adapter +package com.infra.infraandroid.myinfo.teammembereval.view.adapter import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.infraandroid.databinding.ItemTeamMemberRecyclerviewBinding -import com.example.infraandroid.myinfo.myideamanage.view.WarningKickOutDialog -import com.example.infraandroid.myinfo.myideamanage.model.MyIdeaMemberManageInfo -import com.example.infraandroid.myinfo.myideamanage.model.ResponseTeamMemberData +import com.infra.infraandroid.databinding.ItemTeamMemberRecyclerviewBinding +import com.infra.infraandroid.myinfo.myideamanage.model.ResponseTeamMemberData class TeamMemberAdapter(): RecyclerView.Adapter() { var teamMemberList = mutableListOf() diff --git a/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt new file mode 100644 index 0000000..216d810 --- /dev/null +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalEditFragment.kt @@ -0,0 +1,15 @@ +package com.infra.infraandroid.myinfo.teammembereval.view.fragment + +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentTeamEvaluationEditBinding +import com.infra.infraandroid.util.BaseFragment + +class TeamMemberEvalEditFragment : BaseFragment(R.layout.fragment_team_evaluation_edit){ + + override fun FragmentTeamEvaluationEditBinding.onCreateView(){ + } + + override fun FragmentTeamEvaluationEditBinding.onViewCreated(){ + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt index 8b0c3a8..2a7c723 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.myinfo.teammembereval.view.fragment +package com.infra.infraandroid.myinfo.teammembereval.view.fragment import android.content.ContentValues import android.os.Bundle @@ -8,9 +8,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 -import com.example.infraandroid.databinding.MyInfoTeamMemberEvaluationBinding -import com.example.infraandroid.myinfo.myideamanage.view.adapter.TeamPagerAdapter -import com.example.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalPagerAdapter +import com.infra.infraandroid.databinding.MyInfoTeamMemberEvaluationBinding +import com.infra.infraandroid.myinfo.myideamanage.view.adapter.TeamPagerAdapter +import com.infra.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalPagerAdapter import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt similarity index 79% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt index d7e3a05..e63243d 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalManageFragment.kt @@ -1,13 +1,13 @@ -package com.example.infraandroid.myinfo.teammembereval.view.fragment +package com.infra.infraandroid.myinfo.teammembereval.view.fragment import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.infraandroid.databinding.FragmentTeamEvaluationManagementBinding -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalManagementList -import com.example.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalManagementAdapter +import com.infra.infraandroid.databinding.FragmentTeamEvaluationManagementBinding +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalManagementList +import com.infra.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalManagementAdapter //내 정보 > 팀원 평가 관리 > 평가 관리 탭 class TeamMemberEvalManageFragment: Fragment() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt similarity index 81% rename from app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt index 011b9a5..c20a971 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/teammembereval/view/fragment/TeamMemberEvalWriteFragment.kt @@ -1,14 +1,14 @@ -package com.example.infraandroid.myinfo.teammembereval.view.fragment +package com.infra.infraandroid.myinfo.teammembereval.view.fragment import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.infraandroid.databinding.FragmentTeamEvaluationWriteBinding -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalMemberList -import com.example.infraandroid.myinfo.teammembereval.model.TeamEvalTeamList -import com.example.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalTeamListAdapter +import com.infra.infraandroid.databinding.FragmentTeamEvaluationWriteBinding +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalMemberList +import com.infra.infraandroid.myinfo.teammembereval.model.TeamEvalTeamList +import com.infra.infraandroid.myinfo.teammembereval.view.adapter.TeamEvalTeamListAdapter //내 정보>팀원 평가 관리 > 평가 작성 탭 class TeamMemberEvalWriteFragment :Fragment() { diff --git a/app/src/main/java/com/example/infraandroid/myinfo/userguide/view/UserGuideFragment.kt b/app/src/main/java/com/infra/infraandroid/myinfo/userguide/view/UserGuideFragment.kt similarity index 95% rename from app/src/main/java/com/example/infraandroid/myinfo/userguide/view/UserGuideFragment.kt rename to app/src/main/java/com/infra/infraandroid/myinfo/userguide/view/UserGuideFragment.kt index a3906cf..745ca05 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/userguide/view/UserGuideFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/myinfo/userguide/view/UserGuideFragment.kt @@ -1,14 +1,13 @@ -package com.example.infraandroid.myinfo.userguide.view +package com.infra.infraandroid.myinfo.userguide.view import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView import androidx.fragment.app.Fragment import androidx.navigation.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentUserGuideBinding +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentUserGuideBinding class UserGuideFragment: Fragment() { lateinit var binding: FragmentUserGuideBinding diff --git a/app/src/main/java/com/example/infraandroid/util/BaseFragment.kt b/app/src/main/java/com/infra/infraandroid/util/BaseFragment.kt similarity index 95% rename from app/src/main/java/com/example/infraandroid/util/BaseFragment.kt rename to app/src/main/java/com/infra/infraandroid/util/BaseFragment.kt index ffd7f9f..8737125 100644 --- a/app/src/main/java/com/example/infraandroid/util/BaseFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/util/BaseFragment.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt b/app/src/main/java/com/infra/infraandroid/util/BindingConversion.kt similarity index 94% rename from app/src/main/java/com/example/infraandroid/util/BindingConversion.kt rename to app/src/main/java/com/infra/infraandroid/util/BindingConversion.kt index 9fe6ede..25d1732 100644 --- a/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt +++ b/app/src/main/java/com/infra/infraandroid/util/BindingConversion.kt @@ -1,17 +1,13 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util -import android.annotation.SuppressLint -import android.content.res.ColorStateList import android.graphics.Color import android.widget.ImageView import android.widget.TextView -import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.databinding.BindingAdapter import com.bumptech.glide.Glide -import com.example.infraandroid.R -import org.w3c.dom.Text +import com.infra.infraandroid.R object BindingConversions { @JvmStatic diff --git a/app/src/main/java/com/example/infraandroid/util/ImageRound.kt b/app/src/main/java/com/infra/infraandroid/util/ImageRound.kt similarity index 97% rename from app/src/main/java/com/example/infraandroid/util/ImageRound.kt rename to app/src/main/java/com/infra/infraandroid/util/ImageRound.kt index 9f884a5..38dd037 100644 --- a/app/src/main/java/com/example/infraandroid/util/ImageRound.kt +++ b/app/src/main/java/com/infra/infraandroid/util/ImageRound.kt @@ -1,4 +1,4 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util import android.graphics.Outline import android.os.Build diff --git a/app/src/main/java/com/example/infraandroid/util/InfraApplication.kt b/app/src/main/java/com/infra/infraandroid/util/InfraApplication.kt similarity index 79% rename from app/src/main/java/com/example/infraandroid/util/InfraApplication.kt rename to app/src/main/java/com/infra/infraandroid/util/InfraApplication.kt index a143184..7ec6ae2 100644 --- a/app/src/main/java/com/example/infraandroid/util/InfraApplication.kt +++ b/app/src/main/java/com/infra/infraandroid/util/InfraApplication.kt @@ -1,9 +1,9 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util import android.app.Application import android.content.Context -import com.example.infraandroid.R -import com.example.infraandroid.id.viewmodel.Prefs +import com.infra.infraandroid.R +import com.infra.infraandroid.id.viewmodel.Prefs import com.kakao.sdk.common.KakaoSdk class InfraApplication : Application() { diff --git a/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt b/app/src/main/java/com/infra/infraandroid/util/ServiceCreator.kt similarity index 74% rename from app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt rename to app/src/main/java/com/infra/infraandroid/util/ServiceCreator.kt index 0f99b76..82fe0fc 100644 --- a/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt +++ b/app/src/main/java/com/infra/infraandroid/util/ServiceCreator.kt @@ -1,17 +1,16 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util -import com.example.infraandroid.category.model.ProjectService -import com.example.infraandroid.home.model.CreateProjectService -import com.example.infraandroid.id.model.* -import com.example.infraandroid.myinfo.myintroductionpage.model.ProfileViewService -import com.example.infraandroid.myinfo.myinfomodify.model.MyInfoService -import com.example.infraandroid.myinfo.myideamanage.model.MyProjectService -import com.example.infraandroid.myinfo.myinfomodify.model.NicknameDoubleCheckService +import com.infra.infraandroid.category.model.ProjectService +import com.infra.infraandroid.home.model.CreateProjectService +import com.infra.infraandroid.id.model.* +import com.infra.infraandroid.myinfo.myintroductionpage.model.ProfileViewService +import com.infra.infraandroid.myinfo.myinfomodify.model.MyInfoService +import com.infra.infraandroid.myinfo.myideamanage.model.MyProjectService +import com.infra.infraandroid.myinfo.myinfomodify.model.NicknameDoubleCheckService import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory -import retrofit2.create object ServiceCreator { private const val BASE_URL = "https://www.qbeom.shop" diff --git a/app/src/main/java/com/example/infraandroid/util/SplashFragment.kt b/app/src/main/java/com/infra/infraandroid/util/SplashFragment.kt similarity index 88% rename from app/src/main/java/com/example/infraandroid/util/SplashFragment.kt rename to app/src/main/java/com/infra/infraandroid/util/SplashFragment.kt index 39e63b6..b8a7de8 100644 --- a/app/src/main/java/com/example/infraandroid/util/SplashFragment.kt +++ b/app/src/main/java/com/infra/infraandroid/util/SplashFragment.kt @@ -1,14 +1,13 @@ -package com.example.infraandroid.util +package com.infra.infraandroid.util import android.util.Log import android.widget.Toast -import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import com.example.infraandroid.R -import com.example.infraandroid.databinding.FragmentSplashBinding -import com.example.infraandroid.id.model.RequestLoginData -import com.example.infraandroid.id.model.ResponseLoginData -import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.infra.infraandroid.R +import com.infra.infraandroid.databinding.FragmentSplashBinding +import com.infra.infraandroid.id.model.RequestLoginData +import com.infra.infraandroid.id.model.ResponseLoginData +import com.infra.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/res/layout/category_information.xml b/app/src/main/res/layout/category_information.xml index 03686f6..71a815b 100644 --- a/app/src/main/res/layout/category_information.xml +++ b/app/src/main/res/layout/category_information.xml @@ -5,7 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/category_information" - tools:context="com.example.infraandroid.category.view.fragment.CategoryInformationFragment" + tools:context="com.infra.infraandroid.category.view.fragment.CategoryInformationFragment" android:background="@color/infra_blue_c"> + tools:context="com.infra.infraandroid.myinfo.applicationstatus.view.ApplicationStatusFragment"> + tools:context="com.infra.infraandroid.category.view.fragment.CategoryFragment" > + tools:context="com.infra.infraandroid.category.view.fragment.CategoryIdeaFragment"> + tools:context="com.infra.infraandroid.chat.view.ChatFragment"> + tools:context="com.infra.infraandroid.chat.view.ChattingRoomListFragment"> + type="com.infra.infraandroid.home.viewmodel.CreateProjectViewModel" /> + type="com.infra.infraandroid.home.view.fragment.CreateProjectFragment" /> + tools:context="com.infra.infraandroid.home.view.fragment.CreateProjectFragment"> + tools:context="com.infra.infraandroid.home.view.fragment.CreateProjectSelectCategoryFragment"> + tools:context="com.infra.infraandroid.id.view.FindPWFragment"> + tools:context="com.infra.infraandroid.myinfo.hashtagalarm.view.HashTagAlarmFragment"> + tools:context="com.infra.infraandroid.myinfo.history.view.HistoryFragment"> + tools:context="com.infra.infraandroid.home.view.fragment.HomeFragment"> + tools:context="com.infra.infraandroid.category.view.fragment.IdeaListFragment"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaCategoryModifyFragment"> + tools:context="com.infra.infraandroid.myinfo.MyInfoFragment"> + tools:context="com.infra.infraandroid.myinfo.myinfointerest.MyInfoInterestFragment"> + type="com.infra.infraandroid.myinfo.myinfomodify.model.ResponseViewMyInfoData.Result" /> + tools:context="com.infra.infraandroid.myinfo.myinfomodify.view.MyInfoModifyFragment"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaManageFragment"> + type="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaModifyPageFragment" /> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaModifyPageFragment"> + tools:context="com.infra.infraandroid.myinfo.scrap.view.ScrapFragment"> + tools:context="com.infra.infraandroid.id.view.FindPWFragment"> + tools:context="com.infra.infraandroid.id.view.SignUpFirstFragment"> + tools:context="com.infra.infraandroid.id.view.SignUpFourthFragment"> + tools:context="com.infra.infraandroid.id.view.SignUpSecondFragment"> + tools:context="com.infra.infraandroid.id.view.SignUpThirdFragment"> + tools:context="com.infra.infraandroid.myinfo.teammembereval.view.fragment.TeamMemberEvalEditFragment"> + tools:context="com.infra.infraandroid.myinfo.teammembereval.view.fragment.TeamMemberEvalManageFragment"> + tools:context="com.infra.infraandroid.myinfo.teammembereval.view.fragment.TeamMemberEvalWriteFragment"> + type="com.infra.infraandroid.category.model.ResponseViewIdeaData.Result" /> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaModifyFragment"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaMemberFragment"> + tools:context="com.infra.infraandroid.myinfo.userguide.view.UserGuideFragment"> + type="com.infra.infraandroid.category.model.ResponseViewIdeaData.Result" /> + tools:context="com.infra.infraandroid.category.view.fragment.CategoryViewIdeaFragment"> + type="com.infra.infraandroid.category.model.ResponseViewUserProfileData.Result" /> + type="com.infra.infraandroid.category.model.ResponseLookUpAllProjectData.Result" /> + type="com.infra.infraandroid.myinfo.myideamanage.model.ResponseMyProjectListData.Result" /> + type="com.infra.infraandroid.home.model.ResponseHotProjectData.Result" /> + type="com.infra.infraandroid.myinfo.myideamanage.model.ResponseViewProjectApplyData.Result" /> + type="com.infra.infraandroid.myinfo.myideamanage.model.ResponseTeamMemberData.Result" /> + tools:context="com.infra.infraandroid.myinfo.myintroductionpage.view.MyIntroPageModifyBottomSheetFragment"> diff --git a/app/src/main/res/layout/my_info_my_idea_accept_warning.xml b/app/src/main/res/layout/my_info_my_idea_accept_warning.xml index 683f5b5..07d6178 100644 --- a/app/src/main/res/layout/my_info_my_idea_accept_warning.xml +++ b/app/src/main/res/layout/my_info_my_idea_accept_warning.xml @@ -6,7 +6,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_marginHorizontal="20dp" android:background="@drawable/warning_background" - tools:context="com.example.infraandroid.myinfo.myideamanage.view.WarningAcceptDialog"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.WarningAcceptDialog"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.WarningKickOutDialog"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.WarningRejectDialog"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.WarningDeleteDialog"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaFragment"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyIdeaMemberInfoBottomSheetFragment"> + tools:context="com.infra.infraandroid.myinfo.teammembereval.view.fragment.TeamMemberEvalFragment"> + tools:context="com.infra.infraandroid.myinfo.myideamanage.view.fragment.MyProjectMoreMenuBottomSheetFragment"> + tools:context="com.infra.infraandroid.myinfo.myinfomodify.view.MyInfoPhotoMoreMenuBottomSheetFragment"> @@ -97,7 +97,7 @@