Skip to content
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

1/n Nested Text textAlignVertical (Android) - Adding CustomStyleSpan API to align nested text vertically #35949

Closed
wants to merge 107 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
38bb5cd
trigger test_buck failure
fabOnReact Jan 24, 2023
25c6e5a
trigger test_buck failure
fabOnReact Jan 24, 2023
31a5929
run only CustomLineHeightSpanTest.java
fabOnReact Jan 24, 2023
889b599
running CustomStyleSpanTest
fabOnReact Jan 24, 2023
e5ee49a
remove comments from buck file
fabOnReact Jan 24, 2023
ea5ff53
moving CustomLineHeightSpanTest to root
fabOnReact Jan 24, 2023
94c5da5
fail CustomLineHeightSpan
fabOnReact Jan 24, 2023
e702a5d
running simple AbsoluteSizeSpan test
fabOnReact Jan 24, 2023
941a37b
AbsStyleSpan test
fabOnReact Jan 24, 2023
83aabf1
try to fix BUCK setup
fabOnReact Jan 24, 2023
53d58a1
fix buck directory
fabOnReact Jan 24, 2023
6ed5c3d
trigger test failure
fabOnReact Jan 24, 2023
1999edf
ReactAbsSizeSpan test
fabOnReact Jan 24, 2023
9412421
basic test updateDrawState
fabOnReact Jan 24, 2023
3dd1373
fix test failure
fabOnReact Jan 24, 2023
90530e9
adding test for top-child alignment
fabOnReact Jan 24, 2023
6500ca7
adding top-child test, result should be failiure
fabOnReact Jan 24, 2023
58b9b88
trigger updateSpan before updateDrawState
fabOnReact Jan 24, 2023
591b5bd
fix unit test
fabOnReact Jan 24, 2023
50f72f7
reintroduct ReactTextTest.java
fabOnReact Jan 24, 2023
d5a2b09
avoid running ReactTextTest.java
fabOnReact Jan 24, 2023
b844cd6
renable image and view tests
fabOnReact Jan 24, 2023
18d78c4
renable textinput dependency - break tests
fabOnReact Jan 24, 2023
18d72cd
adding more test scenarios
fabOnReact Jan 24, 2023
9b120cc
rename test class
fabOnReact Jan 24, 2023
2d2468d
change test to bottom-child
fabOnReact Jan 24, 2023
f22b2ec
adding log messages
fabOnReact Jan 24, 2023
a635c64
adding log messages
fabOnReact Jan 24, 2023
e202181
adding log messages
fabOnReact Jan 24, 2023
346eae1
using Log instead of FLog
fabOnReact Jan 25, 2023
f214f7f
adding log messages
fabOnReact Jan 25, 2023
179abe4
adding log messages
fabOnReact Jan 25, 2023
625945d
adding text to example
fabOnReact Jan 25, 2023
51d825c
Manually set the font metrics tp.bottom tp.top as done with CustomLin…
fabOnReact Jan 25, 2023
52bca87
setTextSize test
fabOnReact Jan 25, 2023
21fdc84
add MockSpan
fabOnReact Jan 25, 2023
65bceab
adding log
fabOnReact Jan 25, 2023
ee4a7d0
check top font metrics
fabOnReact Jan 25, 2023
51660e2
adding font size
fabOnReact Jan 25, 2023
5284898
adding log messages
fabOnReact Jan 25, 2023
41821da
mock font metrics
fabOnReact Jan 25, 2023
8583639
fix errors
fabOnReact Jan 25, 2023
b7af1fc
fix mock font metrics
fabOnReact Jan 25, 2023
66eb784
mock updateDrawState to avoid using TextPaint.FontMetrics
fabOnReact Jan 25, 2023
b911987
trying another syntax for mocking
fabOnReact Jan 25, 2023
c8b7d43
fix font metrics over-ride
fabOnReact Jan 25, 2023
a24f9fd
adding powermock
fabOnReact Jan 25, 2023
331aa9b
MockFontMetrics extends Paint
fabOnReact Jan 25, 2023
741bd7f
mock(FontMetrics)
fabOnReact Jan 25, 2023
bc21438
mock .ascent()
fabOnReact Jan 26, 2023
c352f32
convert 1 to float
fabOnReact Jan 26, 2023
5144527
pass mocked textpaint to updateDrawState
fabOnReact Jan 26, 2023
dc1e9ee
mock top and bottom
fabOnReact Jan 26, 2023
1c164de
set mock top and bottom
fabOnReact Jan 26, 2023
4ae92e3
textWithNoLineHeightAlignsBasedOnFontMetrics green
fabOnReact Jan 26, 2023
d147d35
move mock to @Before
fabOnReact Jan 26, 2023
74801f4
adding @Before
fabOnReact Jan 26, 2023
a4d2173
add import statement @Before
fabOnReact Jan 26, 2023
f174212
update test result
fabOnReact Jan 26, 2023
7e5d001
update mock values
fabOnReact Jan 26, 2023
cedc946
clear baseline shift
fabOnReact Jan 26, 2023
d586caa
clear baseline shift
fabOnReact Jan 26, 2023
ba1c34a
comment test
fabOnReact Jan 26, 2023
461b439
tp.baselineShift instead of FontMetrics
fabOnReact Jan 26, 2023
005bd88
smaller fontsize with lineheight test
fabOnReact Jan 26, 2023
1877520
remove local TextPaint variable
fabOnReact Jan 26, 2023
1823e09
update result
fabOnReact Jan 26, 2023
c610947
update implementation that is not using mock values
fabOnReact Jan 26, 2023
2e951ae
remove ascent() descent() mock
fabOnReact Jan 26, 2023
da06964
revert previous commit
fabOnReact Jan 26, 2023
06edd95
remove hardcoded results
fabOnReact Jan 26, 2023
12500c1
remove hardcoded results
fabOnReact Jan 26, 2023
409dcaa
parse result to float
fabOnReact Jan 26, 2023
d52feb6
parse to float
fabOnReact Jan 26, 2023
4a04387
using result as int instead of float
fabOnReact Jan 26, 2023
94988f7
update top/bottom/ascent/descent values
fabOnReact Jan 26, 2023
c75ec07
Merge branch 'main' into span-api-junit-tests
fabOnReact Jan 26, 2023
04220e5
adding comments to junit tests
fabOnReact Jan 26, 2023
a04f072
adding comments to junit tests
fabOnReact Jan 26, 2023
6ca785f
update comments
fabOnReact Jan 26, 2023
1c35a40
update comments
fabOnReact Jan 26, 2023
4880ba8
adding enum TextAlignVertical
fabOnReact Jan 26, 2023
b2d794d
test runtime exception wrong type
fabOnReact Jan 26, 2023
2b44ee9
remove runtime test
fabOnReact Jan 26, 2023
427863a
rename TextPaint variable to tp
fabOnReact Jan 27, 2023
0415284
Revert "rename TextPaint variable to tp"
fabOnReact Jan 27, 2023
629148a
verify that fontsize is smaller before changing alignment
fabOnReact Jan 27, 2023
6a00f55
Merge branch 'main' into span-api-junit-tests
fabOnReact Jan 27, 2023
7d31d60
move align logic to ReactAlignSpan.javagst
fabOnReact Jan 30, 2023
1d2a505
remove getTextAlignVertical
fabOnReact Jan 30, 2023
642cb6f
enable ReactAlignSpanTest.java in BUCK
fabOnReact Jan 30, 2023
148bded
Merge branch 'main' into span-api-junit-tests
fabOnReact Jan 30, 2023
a143896
Implement logic to calculate updated FontMetrics in ReactAlignSpan wi…
fabOnReact Jan 31, 2023
2455a67
copy textPaint attributes in textPaintCopy
fabOnReact Jan 31, 2023
498c90e
Move the logic for shifting text based on the lineheight to CustomSty…
fabOnReact Feb 1, 2023
7a32be6
pass 1 test
fabOnReact Feb 1, 2023
44c526f
updating test cases
fabOnReact Feb 2, 2023
2dfd45d
minor refactoring tests
fabOnReact Feb 2, 2023
4257bb0
minor refactoring tests
fabOnReact Feb 2, 2023
79db750
Merge branch 'main' into span-api-junit-tests
fabOnReact Feb 9, 2023
8a3fd1c
changing order constructor parameters
fabOnReact Feb 9, 2023
d8556a7
The parent Text does not align correctly with CustomStyleSpan with Gr…
fabOnReact Feb 9, 2023
1e13233
reintroduce comments
fabOnReact Feb 10, 2023
6f2cfe5
remove textWithNoLineHeightAlignsBasedOnFontMetrics
fabOnReact Feb 10, 2023
510b84a
Merge branch 'main' into span-api-junit-tests
fabOnReact Feb 10, 2023
1dd5718
Merge branch 'main' into span-api-junit-tests
fabOnReact Feb 21, 2023
459588a
avoid changing lineHeight with updateMeasureState
fabOnReact Feb 23, 2023
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
Prev Previous commit
avoid changing lineHeight with updateMeasureState
  • Loading branch information
fabOnReact committed Feb 23, 2023
commit 459588af425ff1f231de56428a2a9f73be21a227
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public void updateMeasureState(TextPaint paint) {
mAssetManager,
mTextAlignVertical,
mSize,
mHighestLineHeight,
mHighestFontSize);
0,
0);
}

public int getStyle() {
Expand Down