-
-
Notifications
You must be signed in to change notification settings - Fork 362
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
Replace HTML with native text formatting #1256
base: master
Are you sure you want to change the base?
Conversation
app/src/main/java/org/torproject/android/ui/AboutDialogFragment.kt
Outdated
Show resolved
Hide resolved
ffc7a61
to
aa74b74
Compare
error: unable to create symlink app/src/main/assets/LICENSE: File name too long |
Where are you getting this issue? On the contrary, this PR does not symlink to LICENSE anymore. |
just doing a normal cherry pick, I get that error. git fetch https://github.com/meenbeese/orbot sdk-21-fix && git cherry-pick aa74b74 |
It is working fine on my machine. Why do you have to cherry-pick? Can't you just checkout the branch? |
I'm really not sure what the problem is. I've never seen this error before when cherry picking. Maybe its a bug in m version of git. |
git checkout -b html_fix meenbeese/sdk-21-fix |
Cant checkout the branch either. |
I've fixed it by manually copying the LICENSE file to app/src/main/assets/LICENSE and appending the commit. It should look like this:
|
The commit with the problem looks like this:
|
But, is it really necessary to remove the symlink to LICENSE and copy the file there so it exists twice? |
Oh, I see the problem. Your commit should just remove the symlink, but not include the copied file. build.gradle copies the LICENSE file during the build automatically. It should look like this:
|
Here is a fixed version: syphyr@3ca2798 |
I don't understand why I shouldn't include the license file in the commit if it is going to be built anyway. Might as well save that step now. |
Yes because symlinking doesn't work in debug mode so the about page was always broken there. Also, this change doesn't add any maintenance burden as the copying over occurs automatically on every build. |
This commit should just delete the symlink to the license file because build.gradle copies it to assets during the build processes. Or, if your intention is to include another copy of the license file to put in assets by this commit, then you won't need the additional code added to build.gradle to copy the license file to assets. The license file needs to be removed from this commit because it is copied to assets by the build processes. |
My intention was the former. Updated now to remove the symlink. |
Thanks. Just tested it and its working fine now. |
|
Merge @bitmold ? |
The full path to the copied version of the |
This PR removes the backwards-incompatible text formatting done with HTML throughout the codebase and replaces it with a more native approach that uses a mix of text and graphics APIs like SpannableString, Typeface, etc.
Why This is Better
Html.fromHtml()
: No deprecated HTML parsing.Closes #1229
Tested on Pixel 8 API 34 Emulator.