Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

126 41 connect with api editing profile #191

Open
wants to merge 50 commits into
base: develop
Choose a base branch
from

Conversation

NadezhdaSakal
Copy link

No description provided.

NadezhdaSakal and others added 8 commits June 28, 2024 19:25
…th-api-profile-chips

# Conflicts:
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/data/impl/ProfileInfoRepoImpl.kt
#	config/detekt/detekt.yml
…h_api_editing_profile

# Conflicts:
#	app/src/main/java/com/innoprog/android/feature/profile/editingprofile/presentation/EditingProfileFragment.kt
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/presentation/BottomSheetProfile.kt
# Conflicts:
#	app/src/main/java/com/innoprog/android/network/data/ApiConstants.kt
… move setOnClickListener to onCreateViewHolder method, resolve merge conflict
Cdarius and others added 21 commits July 6, 2024 14:32
delete recyclers & refactor fragment
add fun runSafelyUseCase & refactor
rename Request
refactor viewHolder
…-chips' into 167-41--connect-with-api-profile-chips
…-chips' into 126-41-connect_with_api_editing_profile

# Conflicts:
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/data/impl/ProfileInfoRepoImpl.kt
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/data/network/ProfileApi.kt
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/presentation/BottomSheetProfile.kt
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/presentation/ProfileFragment.kt
#	app/src/main/java/com/innoprog/android/feature/profile/profiledetails/presentation/ProfileViewModel.kt
#	app/src/main/java/com/innoprog/android/network/data/ApiConstants.kt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant