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
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() {
callback()?.yearInReviewClick()
dismiss()
}
binding.yearInReviewRedDot.isVisible = !Prefs.yearInReviewVisited

binding.mainDrawerEditContainer.setOnClickListener {
BreadCrumbLogEvent.logClick(requireActivity(), binding.mainDrawerEditContainer)
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/org/wikipedia/settings/Prefs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,11 @@ object Prefs {
get() = PrefsIoUtil.getBoolean(R.string.preference_key_year_in_review_is_enabled, false)
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_year_in_review_is_enabled, value)

var yirSurveyShown
var yearInReviewVisited: Boolean
get() = PrefsIoUtil.getBoolean(R.string.preference_key_year_in_review_visited, false)
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_year_in_review_visited, value)

var yearInReviewSurveyShown
get() = PrefsIoUtil.getBoolean(R.string.preference_key_yir_survey_shown, false)
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_yir_survey_shown, value)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
import org.wikipedia.analytics.eventplatform.EventPlatformClient
import org.wikipedia.compose.theme.BaseTheme
import org.wikipedia.settings.Prefs

class YearInReviewActivity : BaseActivity() {

private val viewModel: YearInReviewViewModel by viewModels()

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Prefs.yearInReviewVisited = true

setContent {
BaseTheme {
val coroutineScope = rememberCoroutineScope()
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/layout/view_main_drawer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
<LinearLayout
android:id="@+id/main_drawer_year_in_review_container"
android:visibility="gone"
tools:visibility="visible"
style="@style/SideDrawerMenuItem">

<ImageView
Expand All @@ -243,6 +244,14 @@
android:layout_weight="1"
android:text="@string/nav_item_year_in_review" />

<View
android:id="@+id/yearInReviewRedDot"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_marginStart="8dp"
android:background="@drawable/shape_circle"
android:backgroundTint="?attr/destructive_color" />

</LinearLayout>

</LinearLayout>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/preference_keys.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
<string name="preference_key_otd_is_archive_game_playing">isArchiveGamePlaying</string>
<string name="preference_key_otd_sound_on">isOtdSoundOn</string>
<string name="preference_key_year_in_review_is_enabled">isYearInReviewEnabled</string>
<string name="preference_key_year_in_review_visited">yearInReviewVisited</string>
<string name="preference_key_yir_survey_shown">yirSurveyShown</string>
<string name="preference_category_recommended_reading_list">recommendedReadingListSettings</string>
<string name="preference_key_recommended_reading_list_enabled">recommendedReadingListEnabled</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/xml/developer_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,10 @@
android:key="@string/preference_key_year_in_review_is_enabled"
android:title="@string/preference_key_year_in_review_is_enabled" />

<org.wikipedia.settings.SwitchPreferenceMultiLine
android:key="@string/preference_key_year_in_review_visited"
android:title="@string/preference_key_year_in_review_visited" />

<org.wikipedia.settings.SwitchPreferenceMultiLine
android:key="@string/preference_key_yir_survey_shown"
android:title="@string/preference_key_yir_survey_shown" />
Expand Down
Loading