Skip to content

Conversation

@theck13
Copy link
Contributor

@theck13 theck13 commented Aug 7, 2025

Fix

Update the background color resources created in #251 by renaming from background_primary to background and removing background_secondary.

Test

There are no visual changes with this update, but it be tested in Automattic/simplenote-android#1743 using the dependency below.

implementation 'com.automattic:simperium:252-fef1ca06ec6fe8367d79931bd388244aee5beb18'

Review

Only one developer is required to review these changes, but anyone can perform the review.

Release

These changes do not require release notes.

mzorz added a commit that referenced this pull request Aug 7, 2025
@mzorz
Copy link
Contributor

mzorz commented Aug 7, 2025

Having a hard time trying to test your branch, I added your remote repo to my git list locally and can switch branches, but I can't see the commits listed in this PR when I fetch and pull your remote locally

MacBook-Pro-45:simperium-android mariozorz$ git checkout heck/update-targetsdk-35
Switched to branch 'heck/update-targetsdk-35'
Your branch is up to date with 'theck13/heck/update-targetsdk-35'.
MacBook-Pro-45:simperium-android mariozorz$ git pull
Already up to date.
MacBook-Pro-45:simperium-android mariozorz$ git show fef1ca06ec6fe8367d79931bd388244aee5beb18
fatal: bad object fef1ca06ec6fe8367d79931bd388244aee5beb18
MacBook-Pro-45:simperium-android mariozorz$ git log
commit 9f61fa124ff5aa5f628cc40adb744e2c63841855 (HEAD -> heck/update-targetsdk-35, theck13/heck/update-targetsdk-35)
Author: Tyler Heck <theck13@users.noreply.github.com>
Date:   Sun Aug 3 16:00:15 2025 -0600

    Add on apply window insets listener to add button in tags activity

commit e58bac652b5cd8e4c5ea1dcbb73090f29cb175ae
Author: Tyler Heck <theck13@users.noreply.github.com>
Date:   Sun Aug 3 15:57:25 2025 -0600

    Add on apply window insets listener to add button in collaborators activity

commit 32332e5862b6f16d799db4b4eca90bdc06d6695f
Author: Tyler Heck <theck13@users.noreply.github.com>
Date:   Sun Aug 3 15:55:24 2025 -0600

    Add apply window insets for floating action button method to display utils

Tried a merge on an intermediate branch which makes things more complex since git complains both branches have unrelated history, and finally wanted to resort to cherry-pick but the commits aren't found even when pulling your branch.

I may be dumb but in lack of more time to figure it out, I decided to do it the old way and applying your changes manually on my local branch, just pushed the changes to the base branch in f5dbeb1 credited your work in the commit message 🙏

Thanks much @theck13 !

@theck13
Copy link
Contributor Author

theck13 commented Aug 7, 2025

Weird. I don't know what happened there either. Oh, well. Applying the changes is more important than merging this pull request. Thanks for trying multiple ways though!

@theck13 theck13 closed this Aug 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants