8000 Merge branch 'main' into compose-animations · wikimedia/apps-android-wikipedia@b9a4115 · GitHub
[go: up one dir, main page]
Skip to content

Commit

Permalink
Merge branch 'main' into compose-animations
Browse files Browse the repository at this point in the history
  • Loading branch information
@Williamrai
Williamrai authored Feb 19, 2025
2 parents bd004bf + ad5003d commit b9a4115
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 62 deletions.
65 changes: 37 additions & 28 deletions app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import android.view.ViewGroup
import android.view.animation.AccelerateInterpolator
import android.view.animation.DecelerateInterpolator
import android.widget.ImageView
import android.widget.TextView
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.core.animation.doOnEnd
Expand Down Expand Up @@ -287,40 +288,28 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
binding.questionCard2.tag = event2

binding.questionDate1.text = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(LocalDate.of(event1.year, viewModel.currentMonth, viewModel.currentDay))
binding.questionText1.maxLines = Integer.MAX_VALUE
binding.questionText1.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = 0 }
binding.questionText1.text = event1.text
binding.questionText1.post {
if (!isDestroyed) {
// this seems to be the only way to properly ellipsize the text in its layout.
if (binding.questionText1.lineHeight > 0) {
binding.questionText1.maxLines = (binding.questionText1.measuredHeight / binding.questionText1.lineHeight)
}
}
}
layoutTextViewForEllipsize(binding.questionText1)

val thumbnailUrl1 = event1.pages.firstOrNull()?.thumbnailUrl
val thumbnailUrl1 = viewModel.getThumbnailUrlForEvent(event1)
if (thumbnailUrl1.isNullOrEmpty()) {
binding.questionThumbnail1.setImageResource(R.mipmap.launcher)
binding.questionThumbnail1.isVisible = false
} else {
binding.questionThumbnail1.isVisible = true
ViewUtil.loadImage(binding.questionThumbnail1, thumbnailUrl1, placeholderId = R.mipmap.launcher)
}

binding.questionDate2.text = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(LocalDate.of(event2.year, viewModel.currentMonth, viewModel.currentDay))
binding.questionText2.maxLines = Integer.MAX_VALUE
binding.questionText2.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = 0 }
binding.questionText2.text = event2.text
binding.questionText2.post {
if (!isDestroyed) {
// this seems to be the only way to properly ellipsize the text in its layout.
if (binding.questionText2.lineHeight > 0) {
binding.questionText2.maxLines = (binding.questionText2.measuredHeight / binding.questionText2.lineHeight)
}
}
}
layoutTextViewForEllipsize(binding.questionText2)

val thumbnailUrl2 = event2.pages.firstOrNull()?.thumbnailUrl
val thumbnailUrl2 = viewModel.getThumbnailUrlForEvent(event2)
if (thumbnailUrl2.isNullOrEmpty()) {
binding.questionThumbnail2.setImageResource(R.mipmap.launcher)
binding.questionThumbnail2.isVisible = false
} else {
binding.questionThumbnail2.isVisible = true
ViewUtil.loadImage(binding.questionThumbnail2, thumbnailUrl2, placeholderId = R.mipmap.launcher)
}

Expand Down Expand Up @@ -384,11 +373,9 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
private fun onCurrentQuestionCorrect(gameState: OnThisDayGameViewModel.GameState) {
updateGameState(gameState)

binding.whichCameFirstText.isVisible = false
updateQuestionEndLayout()
binding.correctIncorrectText.setText(R.string.on_this_day_game_correct)
binding.pointsText.isVisible = true
binding.nextQuestionText.isVisible = false
binding.centerContent.isVisible = true

if (gameState.currentQuestionState.event1.year < gameState.currentQuestionState.event2.year) {
binding.questionDate1.setBackgroundResource(R.drawable.game_date_background_correct)
Expand All @@ -406,10 +393,8 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
private fun onCurrentQuestionIncorrect(gameState: OnThisDayGameViewModel.GameState) {
updateGameState(gameState)

binding.whichCameFirstText.isVisible = false
updateQuestionEndLayout()
binding.correctIncorrectText.setText(R.string.on_this_day_game_incorrect)
binding.nextQuestionText.isVisible = false
binding.centerContent.isVisible = true

if (gameState.currentQuestionState.event1.year < gameState.currentQuestionState.event2.year) {
binding.questionDate1.setBackgroundResource(R.drawable.game_date_background_correct)
Expand All @@ -429,6 +414,30 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
enqueueGoNext(gameState)
}

private fun updateQuestionEndLayout() {
binding.whichCameFirstText.isVisible = false
binding.nextQuestionText.isVisible = false
binding.centerContent.isVisible = true
if (!binding.questionThumbnail1.isVisible) {
binding.questionText1.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = DimenUtil.roundedDpToPx(40f) }
}
if (!binding.questionThumbnail2.isVisible) {
binding.questionText2.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = DimenUtil.roundedDpToPx(40f) }
}
}

private fun layoutTextViewForEllipsize(textView: TextView) {
textView.maxLines = Int.MAX_VALUE
textView.post {
if (!isDestroyed) {
// this seems to be the only way to properly ellipsize the text in its layout.
if (textView.lineHeight > 0) {
textView.maxLines = (textView.measuredHeight / textView.lineHeight)
}
}
}
}

private fun setCorrectIcon(view: ImageView) {
view.setImageResource(R.drawable.check_circle_24px)
view.imageTintList = ResourceUtil.getThemedColorStateList(this, R.attr.success_color)
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ class OnThisDayGameViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
return currentState.answerState[if (index >= 0) index / 2 else 0]
}

fun getThumbnailUrlForEvent(event: OnThisDay.Event): String? {
return event.pages.firstOrNull { !it.thumbnailUrl.isNullOrEmpty() }?.thumbnailUrl
}

private fun composeQuestionState(index: Int): QuestionState {
return QuestionState(events[index * 2], events[index * 2 + 1], currentMonth, currentDay)
}
Expand Down
80 changes: 46 additions & 34 deletions app/src/main/res/layout/activity_on_this_day_game.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,31 @@
android:layout_gravity="bottom|end"
android:contentDescription="@null" />

<TextView
android:id="@+id/questionText1"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="132dp"
android:ellipsize="end"
style="@style/P"
android:textColor="?attr/primary_color"
tools:text="Lorem ipsum"/>

<org.wikipedia.views.FaceAndColorDetectImageView
android:id="@+id/questionThumbnail1"
app:shapeAppearanceOverlay="@style/RoundedCornerOverlay.All"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_gravity="end"
android:contentDescription="@null"
android:scaleType="centerCrop"
android:src="@mipmap/launcher"/>
android:orientation="horizontal">
<TextView
android:id="@+id/questionText1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
style="@style/P"
android:textColor="?attr/primary_color"
tools:text="Lorem ipsum"/>

<org.wikipedia.views.FaceAndColorDetectImageView
android:id="@+id/questionThumbnail1"
app:shapeAppearanceOverlay="@style/RoundedCornerOverlay.All"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginStart="16dp"
android:layout_gravity="end"
android:contentDescription="@null"
android:scaleType="centerCrop"
android:src="@mipmap/launcher"/>
</LinearLayout>

</org.wikipedia.views.WikiCardView>

Expand Down Expand Up @@ -200,25 +206,31 @@
android:layout_gravity="bottom|end"
android:contentDescription="@null" />

<TextView
android:id="@+id/questionText2"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="132dp"
android:ellipsize="end"
style="@style/P"
android:textColor="?attr/primary_color"
tools:text="Lorem ipsum"/>

<org.wikipedia.views.FaceAndColorDetectImageView
android:id="@+id/questionThumbnail2"
app:shapeAppearanceOverlay="@style/RoundedCornerOverlay.All"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_gravity="end"
android:contentDescription="@null"
android:scaleType="centerCrop"
android:src="@mipmap/launcher"/>
android:orientation="horizontal">
<TextView
android:id="@+id/questionText2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
style="@style/P"
android:textColor="?attr/primary_color"
tools:text="Lorem ipsum"/>

<org.wikipedia.views.FaceAndColorDetectImageView
android:id="@+id/questionThumbnail2"
app:shapeAppearanceOverlay="@style/RoundedCornerOverlay.All"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginStart="16dp"
android:layout_gravity="end"
android:contentDescription="@null"
android:scaleType="centerCrop"
android:src="@mipmap/launcher"/>
</LinearLayout>

</org.wikipedia.views.WikiCardView>

Expand Down

0 comments on commit b9a4115

Please sign in to comment.
0