forked from wikimedia/apps-android-wikipedia
-
Notifications
You must be signed in to change notification settings - Fork 0
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
[pull] main from wikimedia:main #342
Open
pull
wants to merge
1,195
commits into
fork-house:main
Choose a base branch
from
wikimedia:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update strings for wiki game final result screen * Update strings.xml --------- Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Bumps [com.github.skydoves:balloon](https://github.com/skydoves/balloon) from 1.6.11 to 1.6.12. - [Release notes](https://github.com/skydoves/balloon/releases) - [Commits](skydoves/Balloon@1.6.11...1.6.12) --- updated-dependencies: - dependency-name: com.github.skydoves:balloon dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: williamrai <[email protected]> Co-authored-by: Dmitry Brant <[email protected]>
Bumps androidx.compose:compose-bom from 2025.01.00 to 2025.01.01. --- updated-dependencies: - dependency-name: androidx.compose:compose-bom dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…mpose-compose-bom-2025.01.01 Bump androidx.compose:compose-bom from 2025.01.00 to 2025.01.01
* Show warning if edited article description exceeds 100 chars. * Update verbiage and impose character count. * Move length check higher in the order. * Move it lower than any error-class checks. --------- Co-authored-by: Cooltey Feng <[email protected]>
Localisation updates from https://translatewiki.net.
Co-authored-by: Dmitry Brant <[email protected]>
[WikiGames] strings for Pause dialog.
* Localisation updates from https://translatewiki.net. * - translation fix * Fix translation --------- Co-authored-by: williamrai <[email protected]> Co-authored-by: cooltey <[email protected]>
* Localisation updates from https://translatewiki.net. * Fix translation --------- Co-authored-by: Cooltey Feng <[email protected]>
Bumps [org.maplibre.gl:android-sdk](https://github.com/maplibre/maplibre-native) from 11.8.0 to 11.8.1. - [Release notes](https://github.com/maplibre/maplibre-native/releases) - [Changelog](https://github.com/maplibre/maplibre-native/blob/main/CHANGELOG.md) - [Commits](maplibre/maplibre-native@android-v11.8.0...android-v11.8.1) --- updated-dependencies: - dependency-name: org.maplibre.gl:android-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
puts credits.xml back
…e.gl-android-sdk-11.8.1 Bump org.maplibre.gl:android-sdk from 11.8.0 to 11.8.1
Localisation updates from https://translatewiki.net.
* Add margins to the talk templates to avoid text reaches the edge * Change to default margin * Also errorView
* Beginnings. * Basic game scaffolding. * Wire up some stuff. * Animation? * Towards dynamic views. * Straighten out code for dynamic views. * Thumbnail? * Manage intermediate state. * Further logic. * Lint. * A few more tweaks. * Persist state? * Improve persistence. * Update styling and layout of buttons. * Arrange buttons at bottom. * Right. * Further logic. * Improve randomization. * Prevent invalid index. * Design updates. * Stubs for final screen. * Add more stuff. * Share viewModel with fragment. * Add start and end dates as prefs. * Weekly progress views. * Yep. * Trivia game: entry points + splash screen (#4869) * Android trivia game: add an entry dialog to the article screen * Add a close button, dotted line and checkbox * adjust margin space for x button * Revert * Rename to use On this day game * Update text and logic * Work on date stuff * Make a comment to verify the logic * Add indicator correctly (finally) * Add chip icon * Move to onResume * Add strings for splash screen * Add onboarding xml * Improve positioning of dot. * Use java.time. * Fix error * Update text * Update onboarding text * Add padding * Bind onboarding fragment with activity * Refine layout * Make the chip unclickable * Whoops. * Use proper handler. --------- Co-authored-by: Dmitry Brant <[email protected]> * Improve prefs arrangement. * Consolidate a bit. * Share fragment commit * Fix merge conflict * Fix * Build share layout * A bit more tidying. * Improve defaulting of dates. * Add logic of first link of each question * Add topic item xml * Adapter for the list * Improve year-spread algorithm. * Update game state * Update item layout * Allow replaying other days. * Lint. * Fill in some strings. * Complete the share function * Add list to the final page * Always finish when back pressed. * Improve randomization of questions. * Show at most 3 items when sharing. * Add string. * Handle bookmark icon actions * Comment the logic out * Update bookmark logic * Minor clean up * Improve daily logic. * Adjust year spreads. * Clear articles list when starting new game. * Adapt. * Begin adjusting to new designs. * Start laying it out. * Continue. * Continue building updated design. * Correctly handle insets. * Begin integrating new game mechanics. * Improve insets. * Sharpen up mechanics. * Build out animations. * Add correct/incorrect checkboxes. * Tweak layout a bit. * Refine fragment alignment. * Update logic for picking events. * Experiment with dynamic year ranges. * Prevent overflow. * Rejigger layouts and animations per new design. * Nail down animations. * Use only decelerate interpolator. * Correctly ellipsize. * Integrate sound. * Use savedStateHandle. * Merge strings. * [WikiGames] entry dialog (#5252) * - updates otd entry dialog to new design - updates preference for otd entry dialog - removes unused code - adds maybeShowOnThisDayGameDialog function to baseActivity * - adds strings resource and re-arranges the strings order in the strings.xml and qq/strings.xml * - string fix * Fix error (commented out code will be removed in the new design) * Resource fix * Tweak close button in dialog. * Move responsibility away from BaseActivity. * Remove older unnecessary stuff. * Limit global max questions to 5. * Disable clicking on cards while animating. * Don't store today's mentioned articles in game state. * Add Games to feed availability struct. * Add en to list of languages for prerelease. * [Wikigames] game entry card (#5261) * - adds new CardType WIKI_GAMES - adjust codes to fit the new entry card for wiki games - adds WikiGamesCardView * - adds FeedContentType for WikiGamesCard - updates append card logic for WikiGamesCard - updates UI - adds WikiGamesCardClient * - updates WikiGamesCardClient to fetch feedAvailability() to show the wiki games for available languages. * - adds missing logic from ConfigureViewModel to support wikigames * - code fixes * Doesn't need to be a coroutine. * Tighten up a bit. * Remove temporary entry from More menu. * Integrate language selection a bit further. * Whoops. * Whoops - remove unused xml. * WikiGames: the final result screen (#5255) * WikiGames: the final result screen * Change radius * Stats view * Hygiene a bit * Add functions for stat cards * Update recycler view item * Nest it * Change coordinateLayout to Framelayout to avoid jumpy view when scrolling * Add icons * update the logic of showing card colors * Add article share function * Some tweak * Update color * Update card color to non-themed group * Update design * Tweak design * Top margin * Update design * Add actions for the menu items * Add actions for the menu items * Code review comment * !? --------- Co-authored-by: Dmitry Brant <[email protected]> * Remove Share fragment. * Don't clip child card shadows. * Add scrollbar. * Further refine styles of article cards. * Add Pause dialog. * Store game history per language. * Onboarding overlay should take input, to prevent accidental clicks. * Strings. * Add date override pref. * Design review update * Add convenience functions for final screen. * Plug in card language availability more explicitly, for now. * Put contentDescription for the close button * Set same margin for the grid items * Set minHeight for stat cards * WikiGames: build bottom sheet popup for final screen (#5281) * WikiGames: the final result screen * Change radius * Stats view * Hygiene a bit * Add functions for stat cards * Update recycler view item * Nest it * Change coordinateLayout to Framelayout to avoid jumpy view when scrolling * Add icons * update the logic of showing card colors * Add article share function * Some tweak * Update color * Update card color to non-themed group * Update design * Tweak design * Top margin * Update design * Add actions for the menu items * Add actions for the menu items * Code review comment * !? * WikiGames: build bottom sheet popup for individual articles in final screen * Button * Round border * Complete view * Summary view * Bottomsheet (wip) * Use bottomsheet behavior * Change the layout to coordinateLayout and move the dateText to toolbar * Update action bar title and show it properly * Set up click listeners * Layout tweak * Use wikicardview instead of circle bg * Tweak action buttons * minimum height for stats view * Fix lint * Update margin top * 12dp --------- Co-authored-by: Dmitry Brant <[email protected]> * Use styles for default card background color. * Flatten layout for proper usage of ConstraintLayout. * Tooltips on long-press. * Add a condition for yellow500 * Add maxlines * Adjust size of the summary * Add a check for final screen only * Fix bottom sheet edge-to-edge issue in wikigame final screen (#5288) * Fix bottom sheet edge-to-edge issue in wikigame final screen * add null * More setting * Optimization * Fix lift color on appBarLayout * Optimize it * Remove comments * Make sure it is in the correct padding by default * Smooth sliding * Handle values properly --------- Co-authored-by: Dmitry Brant <[email protected]> --------- Co-authored-by: Cooltey Feng <[email protected]> Co-authored-by: cooltey <[email protected]> Co-authored-by: William Rai <[email protected]>
* Beginnings. * Basic game scaffolding. * Wire up some stuff. * Animation? * Towards dynamic views. * Straighten out code for dynamic views. * Thumbnail? * Manage intermediate state. * Further logic. * Lint. * A few more tweaks. * Persist state? * Improve persistence. * Update styling and layout of buttons. * Arrange buttons at bottom. * Right. * Further logic. * Improve randomization. * Prevent invalid index. * Design updates. * Stubs for final screen. * Add more stuff. * Share viewModel with fragment. * Add start and end dates as prefs. * Weekly progress views. * Yep. * Trivia game: entry points + splash screen (#4869) * Android trivia game: add an entry dialog to the article screen * Add a close button, dotted line and checkbox * adjust margin space for x button * Revert * Rename to use On this day game * Update text and logic * Work on date stuff * Make a comment to verify the logic * Add indicator correctly (finally) * Add chip icon * Move to onResume * Add strings for splash screen * Add onboarding xml * Improve positioning of dot. * Use java.time. * Fix error * Update text * Update onboarding text * Add padding * Bind onboarding fragment with activity * Refine layout * Make the chip unclickable * Whoops. * Use proper handler. --------- Co-authored-by: Dmitry Brant <[email protected]> * Improve prefs arrangement. * Consolidate a bit. * Share fragment commit * Fix merge conflict * Fix * Build share layout * A bit more tidying. * Improve defaulting of dates. * Add logic of first link of each question * Add topic item xml * Adapter for the list * Improve year-spread algorithm. * Update game state * Update item layout * Allow replaying other days. * Lint. * Fill in some strings. * Complete the share function * Add list to the final page * Always finish when back pressed. * Improve randomization of questions. * Show at most 3 items when sharing. * Add string. * Handle bookmark icon actions * Comment the logic out * Update bookmark logic * Minor clean up * Improve daily logic. * Adjust year spreads. * Clear articles list when starting new game. * Adapt. * Begin adjusting to new designs. * Start laying it out. * Continue. * Continue building updated design. * Correctly handle insets. * Begin integrating new game mechanics. * Improve insets. * Sharpen up mechanics. * Build out animations. * Add correct/incorrect checkboxes. * Tweak layout a bit. * Refine fragment alignment. * Update logic for picking events. * Experiment with dynamic year ranges. * Prevent overflow. * Rejigger layouts and animations per new design. * Nail down animations. * Use only decelerate interpolator. * Correctly ellipsize. * Integrate sound. * Use savedStateHandle. * Merge strings. * [WikiGames] entry dialog (#5252) * - updates otd entry dialog to new design - updates preference for otd entry dialog - removes unused code - adds maybeShowOnThisDayGameDialog function to baseActivity * - adds strings resource and re-arranges the strings order in the strings.xml and qq/strings.xml * - string fix * Fix error (commented out code will be removed in the new design) * Resource fix * Tweak close button in dialog. * Move responsibility away from BaseActivity. * Remove older unnecessary stuff. * Limit global max questions to 5. * Disable clicking on cards while animating. * Don't store today's mentioned articles in game state. * Add Games to feed availability struct. * Add en to list of languages for prerelease. * [Wikigames] game entry card (#5261) * - adds new CardType WIKI_GAMES - adjust codes to fit the new entry card for wiki games - adds WikiGamesCardView * - adds FeedContentType for WikiGamesCard - updates append card logic for WikiGamesCard - updates UI - adds WikiGamesCardClient * - updates WikiGamesCardClient to fetch feedAvailability() to show the wiki games for available languages. * - adds missing logic from ConfigureViewModel to support wikigames * - code fixes * Doesn't need to be a coroutine. * Tighten up a bit. * Remove temporary entry from More menu. * Integrate language selection a bit further. * Whoops. * Whoops - remove unused xml. * WikiGames: the final result screen (#5255) * WikiGames: the final result screen * Change radius * Stats view * Hygiene a bit * Add functions for stat cards * Update recycler view item * Nest it * Change coordinateLayout to Framelayout to avoid jumpy view when scrolling * Add icons * update the logic of showing card colors * Add article share function * Some tweak * Update color * Update card color to non-themed group * Update design * Tweak design * Top margin * Update design * Add actions for the menu items * Add actions for the menu items * Code review comment * !? --------- Co-authored-by: Dmitry Brant <[email protected]> * Remove Share fragment. * Don't clip child card shadows. * Add scrollbar. * Further refine styles of article cards. * Add Pause dialog. * Store game history per language. * Onboarding overlay should take input, to prevent accidental clicks. * Strings. * Add date override pref. * Design review update * Add convenience functions for final screen. * - adds a deep link support for wikigames - adds TODO on sharing link and extracting deep link parameters * Plug in card language availability more explicitly, for now. * - update strings * - update strings - moves the deep link to MainActivity instead of OnThisDayGameActivity * Put contentDescription for the close button * Set same margin for the grid items * Set minHeight for stat cards * WikiGames: build bottom sheet popup for final screen (#5281) * WikiGames: the final result screen * Change radius * Stats view * Hygiene a bit * Add functions for stat cards * Update recycler view item * Nest it * Change coordinateLayout to Framelayout to avoid jumpy view when scrolling * Add icons * update the logic of showing card colors * Add article share function * Some tweak * Update color * Update card color to non-themed group * Update design * Tweak design * Top margin * Update design * Add actions for the menu items * Add actions for the menu items * Code review comment * !? * WikiGames: build bottom sheet popup for individual articles in final screen * Button * Round border * Complete view * Summary view * Bottomsheet (wip) * Use bottomsheet behavior * Change the layout to coordinateLayout and move the dateText to toolbar * Update action bar title and show it properly * Set up click listeners * Layout tweak * Use wikicardview instead of circle bg * Tweak action buttons * minimum height for stats view * Fix lint * Update margin top * 12dp --------- Co-authored-by: Dmitry Brant <[email protected]> * Use styles for default card background color. * Flatten layout for proper usage of ConstraintLayout. * Tooltips on long-press. * - reverts code to share link instead of deep link * - using ShareUtil instead of own code * Use string resource. --------- Co-authored-by: Dmitry Brant <[email protected]> Co-authored-by: Cooltey Feng <[email protected]> Co-authored-by: cooltey <[email protected]> Co-authored-by: Dmitry Brant <[email protected]>
* Update migration query to also insert missing PageImage rows. * Remove log msgs. * Update query. * Lint.
Bumps `gradle` from 8.9.0 to 8.9.1. Updates `com.android.tools.build:gradle` from 8.9.0 to 8.9.1 Updates `com.android.application` from 8.9.0 to 8.9.1 --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.android.application dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cooltey Feng <[email protected]> Co-authored-by: Dmitry Brant <[email protected]>
T380661 Co-authored-by: William Rai <[email protected]> Co-authored-by: Dmitry Brant <[email protected]>
* Final, ultimate fixes for db upgrade. * Add MAX.
Bumps androidx.compose:compose-bom from 2025.03.00 to 2025.03.01. --- updated-dependencies: - dependency-name: androidx.compose:compose-bom dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the kotlin-ksp group with 1 update: [com.google.devtools.ksp](https://github.com/google/ksp). Updates `com.google.devtools.ksp` from 2.1.20-1.0.31 to 2.1.20-1.0.32 - [Release notes](https://github.com/google/ksp/releases) - [Commits](google/ksp@2.1.20-1.0.31...2.1.20-1.0.32) --- updated-dependencies: - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin-ksp ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dmitry Brant <[email protected]>
…#5440) Co-authored-by: Cooltey Feng <[email protected]>
Bumps [org.maplibre.gl:android-sdk](https://github.com/maplibre/maplibre-native) from 11.8.4 to 11.8.5. - [Release notes](https://github.com/maplibre/maplibre-native/releases) - [Changelog](https://github.com/maplibre/maplibre-native/blob/main/CHANGELOG.md) - [Commits](maplibre/maplibre-native@android-v11.8.4...android-v11.8.5) --- updated-dependencies: - dependency-name: org.maplibre.gl:android-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Refactor ReadingListFragment to use ViewModel. * Code cleanup. * Code cleanup. * Fix merge conflicts. * Removed unnecessary wrapper class, cleaned up code. * Refactor ReadingListsReceiveHelper. --------- Co-authored-by: Cooltey Feng <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
* - adds reading list test * - adds reading list specific tests * - minor code fix --------- Co-authored-by: Cooltey Feng <[email protected]> Co-authored-by: Dmitry Brant <[email protected]>
Bumps [org.jetbrains.kotlinx:kotlinx-serialization-json](https://github.com/Kotlin/kotlinx.serialization) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/Kotlin/kotlinx.serialization/releases) - [Changelog](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md) - [Commits](Kotlin/kotlinx.serialization@v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-serialization-json dependency-version: 1.8.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dmitry Brant <[email protected]>
* Pass login UI messages through parser. * Fall back to unparsed message if parsing returns nothing.
* Convert WikiCardView to use Compose * Make the CardColors as a parameter * Change to theme parameter and add previews
* Enable EmailAuth support. * Reset auth state upon general error. --------- Co-authored-by: Cooltey Feng <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Bumps `kotlinCoroutinesVersion` from 1.10.1 to 1.10.2. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.10.1 to 1.10.2 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.10.1...1.10.2) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.10.1 to 1.10.2 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.10.1...1.10.2) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-version: 1.10.2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-version: 1.10.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps androidx.compose:compose-bom from 2025.03.01 to 2025.04.00. --- updated-dependencies: - dependency-name: androidx.compose:compose-bom dependency-version: 2025.04.00 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )