Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .gradle/7.2/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified .gradle/7.2/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/7.2/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/7.2/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/7.2/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
16 changes: 8 additions & 8 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package com.github.bgrebennikov.devbuff.data.local.explore.ideaDetails

import android.os.Parcelable
import com.github.bgrebennikov.devbuff.data.local.explore.MappedLanguagesModel
import com.github.bgrebennikov.devbuff.data.remote.models.explore.LanguagesModel
import com.github.bgrebennikov.devbuff.presentation.ui.adapters.explore.ListItem
import kotlinx.parcelize.Parcelize

@Parcelize
data class MappedIdeaSpecialists(
val id: String,
val count: Int,
val name: String,
val languages: List<MappedIdeaSpecialistsLanguages>,
val frameworks: List<MappedIdeaFrameworks>
) : ListItem{
) : ListItem, Parcelable {
override val itemId: Int
get() = this.id.hashCode()
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package com.github.bgrebennikov.devbuff.data.local.explore.ideaDetails

import android.os.Parcelable
import com.github.bgrebennikov.devbuff.data.local.explore.MappedTechnologiesModel
import com.github.bgrebennikov.devbuff.presentation.ui.adapters.explore.ListItem
import kotlinx.parcelize.Parcelize

@Parcelize
data class MappedIdeaSpecialistsLanguages(
val name: String
) : ListItem{
) : ListItem, Parcelable {
override val itemId: Int
get() = this.name.hashCode()
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ import com.github.bgrebennikov.devbuff.presentation.ui.GithubAuthActivity
import com.github.bgrebennikov.devbuff.presentation.ui.MainActivity
import com.github.bgrebennikov.devbuff.presentation.ui.SplashScreen
import com.github.bgrebennikov.devbuff.presentation.ui.BaseActivity
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.ApplyIdeaFragment
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.guest.GuestExploreFragment
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.ExploreFragment
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.IdeaDetailsFragment
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.SettingsFragment
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import dagger.BindsInstance
import dagger.Component
import javax.inject.Singleton
Expand All @@ -36,10 +38,13 @@ interface AppComponent {
fun inject(fragment: SettingsFragment)
fun inject(fragment: IdeaDetailsFragment)

fun inject(bottomSheetDialogFragment: ApplyIdeaFragment)

fun inject(activity: MainActivity)
fun inject(activity: GithubAuthActivity)
fun inject(activity : SplashScreen)
fun inject(application: Application)

fun inject(activity: BaseActivity)

@Component.Builder
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.github.bgrebennikov.devbuff.presentation.ui.adapters.binding

import android.view.View
import android.widget.TextView
import androidx.databinding.BindingAdapter
import com.github.bgrebennikov.devbuff.R
import com.github.bgrebennikov.devbuff.data.local.explore.ideaDetails.MappedIdeaSpecialistsLanguages

@BindingAdapter("languagesToString")
fun setLanguagesToString(textView: TextView, languages :List<MappedIdeaSpecialistsLanguages>){

textView.apply {

if(languages.isEmpty()) {
visibility = View.GONE
return@apply
}

text = context.getString(R.string.stack_of_languages)
.format(
languages.joinToString(", "){
it.name
}
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ object IdeaDetailsDelegate {
}
) {

val languagesAdapter = ChipsAdapter()
binding.languagesList.adapter = languagesAdapter

val frameworksAdapter = ChipsAdapter()
binding.technologiesList.adapter = frameworksAdapter
// val languagesAdapter = ChipsAdapter()
// binding.languagesList.adapter = languagesAdapter
//
// val frameworksAdapter = ChipsAdapter()
// binding.technologiesList.adapter = frameworksAdapter


bind {
binding.specialist = item
languagesAdapter.items = item.languages
frameworksAdapter.items = item.frameworks
// languagesAdapter.items = item.languages
// frameworksAdapter.items = item.frameworks
binding.executePendingBindings()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.github.bgrebennikov.devbuff.presentation.ui.customViews

import android.content.Context
import android.os.Parcelable
import android.util.AttributeSet
import androidx.constraintlayout.motion.widget.MotionLayout
import kotlinx.parcelize.Parcelize

class SavingMotionLayout @JvmOverloads constructor(
context: Context,
attrs: AttributeSet?,
defStyleAttr: Int = 0
) : MotionLayout(
context, attrs, defStyleAttr
) {

override fun onSaveInstanceState(): Parcelable {
return SaveState(super.onSaveInstanceState(), startState, endState, targetPosition)
}

override fun onRestoreInstanceState(state: Parcelable?) {
(state as? SaveState)?.let {
super.onRestoreInstanceState(it.superParcel)
setTransition(it.startState, it.endState)
progress = it.progress
}
}

@Parcelize
private class SaveState(
val superParcel: Parcelable?,
val startState: Int,
val endState: Int,
val progress: Float
) : Parcelable

}
Original file line number Diff line number Diff line change
@@ -1,31 +1,55 @@
package com.github.bgrebennikov.devbuff.presentation.ui.fragments

import android.app.Dialog
import android.content.Context
import android.content.res.Configuration
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
import androidx.navigation.fragment.navArgs
import com.github.bgrebennikov.devbuff.BaseApplication
import com.github.bgrebennikov.devbuff.R
import com.github.bgrebennikov.devbuff.databinding.FragmentApplyIdeaBinding
import com.github.bgrebennikov.devbuff.presentation.ui.adapters.explore.ideaDetails.IdeaSpecialistsAdapter
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialogFragment


class ApplyIdeaFragment : BottomSheetDialogFragment() {

val component by lazy{
(requireActivity().application as BaseApplication).component
}

private var _binding: FragmentApplyIdeaBinding? = null
val binding get() = _binding!!

private val args : ApplyIdeaFragmentArgs by navArgs()

private val adapterSpecialists = IdeaSpecialistsAdapter()

override fun onAttach(context: Context) {
component.inject(this)
super.onAttach(context)
}

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = FragmentApplyIdeaBinding.inflate(inflater, container, false)

with(binding.ideaSpecialistsRecycler) {
adapter = adapterSpecialists
}


adapterSpecialists.items = args.specialists.toList()

return binding.root
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ package com.github.bgrebennikov.devbuff.presentation.ui.fragments
import android.content.Context
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.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.github.bgrebennikov.devbuff.common.TAG
import com.github.bgrebennikov.devbuff.common.extensions.findMainNavController
import com.github.bgrebennikov.devbuff.data.local.explore.Status
import com.github.bgrebennikov.devbuff.data.local.explore.ideaDetails.MappedIdeaSpecialists
import com.github.bgrebennikov.devbuff.databinding.FragmentIdeaDetailsBinding
import com.github.bgrebennikov.devbuff.presentation.ui.adapters.explore.ideaDetails.IdeaSpecialistsAdapter
import com.github.bgrebennikov.devbuff.presentation.ui.fragments.base.BaseFragment
Expand Down Expand Up @@ -37,17 +40,17 @@ class IdeaDetailsFragment : BaseFragment<FragmentIdeaDetailsBinding>(
}




override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

if(savedInstanceState == null) viewModel.loadSingleIdea(args.ideaInfo.id)

binding.alreadyLoadedInfo = ideaInfo
Log.i(TAG, "onViewCreated: $ideaInfo")

// with(binding.ideaSpecialistsList){
// adapter = adapterSpecialists
// }

viewModel.loadSingleIdea(ideaInfo.id).observe(viewLifecycleOwner) {
viewModel.singleIdea.observe(viewLifecycleOwner) {
it.let { apiResponse ->
when (apiResponse.status) {

Expand All @@ -58,8 +61,7 @@ class IdeaDetailsFragment : BaseFragment<FragmentIdeaDetailsBinding>(
Status.SUCCESS -> apiResponse.data?.let { idea ->
binding.isLoading = false
binding.ideaInfo = idea
adapterSpecialists.items = idea.specialist
handleJoinClick()
handleJoinClick(idea.specialist)
}

Status.ERROR -> apiResponse.message?.let { error ->
Expand All @@ -71,23 +73,23 @@ class IdeaDetailsFragment : BaseFragment<FragmentIdeaDetailsBinding>(
}
}


binding.appBar.onBackPressed {
findNavController().popBackStack()
}


}

private fun handleJoinClick() {
with(binding.ideaJoinBtn){

private fun handleJoinClick(specialists: List<MappedIdeaSpecialists>) {
with(binding.ideaJoinBtn) {
setOnClickListener {
findMainNavController().navigate(
IdeaDetailsFragmentDirections
.actionIdeaDetailsFragmentToApplyIdeaFragment()
.actionIdeaDetailsFragmentToApplyIdeaFragment(
specialists.toTypedArray()
)
)
}
}
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class GlideImageGetter(
runCatching {
Glide.with(context)
.asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.load(Uri.parse(source))
.into(drawable)
}
Expand Down
Loading