Skip to content

Commit

Permalink
ft_185
Browse files Browse the repository at this point in the history
  • Loading branch information
@n-shvedov27
n-shvedov27 committed Dec 10, 2024
1 parent 88b7f6b commit 65338cd
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 12 deletions.
8 changes: 2 additions & 6 deletions app/src/main/java/com/davay/android/feature/selectmovie/presentation/SelectMovieFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,8 @@ class SelectMovieFragment :
peekHeight = BOTTOMSHEET_PEEK_HEIGHT_112_DP.dpToPx()

clDetailsBottomSheet.post {
val cardLocation = IntArray(2)
rvFilmCard.getLocationOnScreen(cardLocation)
val cardTop = cardLocation[1]

val screenHeight = activity?.resources?.displayMetrics?.heightPixels ?: 0
val maxHeight = screenHeight - cardTop + MARGIN_TOP_16_DP.dpToPx()
val maxHeight = screenHeight - BOTTOMSHEET_MARGIN_TOP_DP.dpToPx()

clDetailsBottomSheet.layoutParams.height = maxHeight
clDetailsBottomSheet.requestLayout()
Expand Down Expand Up @@ -408,7 +404,7 @@ class SelectMovieFragment :

private companion object {
const val BOTTOMSHEET_PEEK_HEIGHT_112_DP = 112
const val MARGIN_TOP_16_DP = 16
const val BOTTOMSHEET_MARGIN_TOP_DP = 54
const val CURRENT_POSITION_KEY = "currentPosition"
}
}
Expand Down
16 changes: 12 additions & 4 deletions app/src/main/res/layout/fragment_select_movie.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
android:layout_height="match_parent"
android:background="@drawable/bottom_sheet_background"
android:backgroundTint="@color/background_white"
android:paddingHorizontal="@dimen/padding_16"
app:behavior_hideable="false"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
tools:context=".feature.moviedetails.presentation.MovieDetailsBottomSheetFragment">
Expand Down Expand Up @@ -117,6 +116,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_12"
android:paddingHorizontal="@dimen/padding_16"
android:elevation="4dp"
android:text="@string/select_movies_details_title" />

Expand All @@ -126,6 +126,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_12"
android:paddingHorizontal="@dimen/padding_16"
android:elevation="0dp"
tools:text="[Captured French Resistance fighter Lieutenant Fontaine awaits a certain death sentence for espionage in a stark German prison in Lyon, France. Facing malnutrition and paralyzing fear, he must plot an extraordinary escape, complicated by the questions of whom to trust, and what lies beyond the small portion of the prison they are housed in.—Sam Spector]" />

Expand All @@ -134,6 +135,7 @@
style="@style/Text.Headline.SubTitle.NoLineSpacing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/padding_16"
android:layout_marginTop="@dimen/margin_24"
android:text="@string/select_movies_top_cast" />

Expand All @@ -142,6 +144,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_12"
android:paddingHorizontal="@dimen/padding_16"
app:flexWrap="wrap"
app:justifyContent="flex_start" />

Expand All @@ -151,13 +154,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_16"
android:paddingHorizontal="@dimen/padding_16"
android:text="@string/select_movies_director" />

<com.google.android.flexbox.FlexboxLayout
android:id="@+id/fbl_details_director_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_12"
android:paddingHorizontal="@dimen/padding_16"
app:flexWrap="wrap"
app:justifyContent="flex_start" />

Expand All @@ -167,6 +172,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_16"
android:paddingHorizontal="@dimen/padding_16"
android:text="@string/select_movies_rates" />

<HorizontalScrollView
Expand All @@ -184,19 +190,21 @@
android:id="@+id/mev_details_imdb_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_16"
app:rate_service="@string/select_movies_imdb_rate" />

<com.davai.uikit.MovieEvaluationView
android:id="@+id/mev_details_kinopoisk_rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginEnd="@dimen/margin_16"
app:rate_service="@string/select_movies_kinopoisk_rate" />
</LinearLayout>
</HorizontalScrollView>
<Space
android:layout_width="0dp"
android:layout_height="@dimen/margin_16"/>
<Space
android:layout_width="0dp"
android:layout_height="@dimen/margin_16"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

Expand Down
19 changes: 17 additions & 2 deletions uikit/src/main/java/com/davai/uikit/TagView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import android.widget.FrameLayout
import android.widget.TextView
import androidx.annotation.AttrRes
import androidx.annotation.StyleRes
import java.util.Locale

class TagView @JvmOverloads constructor(
context: Context,
Expand Down Expand Up @@ -41,7 +42,14 @@ class TagView @JvmOverloads constructor(
defStyleRes
).apply {
try {
tvTagText?.text = getString(R.styleable.TagView_tag_text)
tvTagText?.text = getString(R.styleable.TagView_tag_text)?.replaceFirstChar {
if (it.isLowerCase()) {
it.titlecase(Locale.getDefault())
}
else {
it.toString()
}
}
tagType = getInt(R.styleable.TagView_tag_type, 1)
setStyle(tagType)
} finally {
Expand All @@ -51,7 +59,14 @@ class TagView @JvmOverloads constructor(
}

fun setText(text: String) {
tvTagText?.text = text
tvTagText?.text = text.replaceFirstChar {
if (it.isLowerCase()) {
it.titlecase(Locale.getDefault())
}
else {
it.toString()
}
}
}


Expand Down

0 comments on commit 65338cd

Please sign in to comment.