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

Feautre tips view #418

Merged
merged 37 commits into from
Mar 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
77cb335
feat: add tips cell
AkaShark Feb 19, 2024
def5b76
Merge branch 'dev' into feautre_tips_view
AkaShark Feb 19, 2024
2e5d583
feat: add Empty string checker
AkaShark Feb 19, 2024
318faeb
feat: add tips cell UI
AkaShark Feb 20, 2024
d1a12ae
pref: finish UI
AkaShark Feb 21, 2024
a380433
fix: UI
AkaShark Feb 21, 2024
ef5ee71
fix: update table row number
AkaShark Feb 21, 2024
3e99537
pref: update UI
AkaShark Feb 21, 2024
ad5dcc8
feat: solve btn click more btn click
AkaShark Feb 21, 2024
a582f58
Merge branch 'dev' into feautre_tips_view
AkaShark Feb 22, 2024
d592723
fix: replace hoverButton with linkButton
AkaShark Feb 22, 2024
f56785c
Merge branch 'feautre_tips_view' of github.com:AkaShark/Easydict into…
AkaShark Feb 22, 2024
35275d0
pref: pref UI
AkaShark Feb 22, 2024
c704722
fix: query text empty tableview hight error
AkaShark Feb 22, 2024
1722719
fix: get current localized language
AkaShark Feb 22, 2024
d168d02
Merge branch 'dev' into feautre_tips_view
tisfeng Feb 23, 2024
7b4128d
fix: remove unused code
AkaShark Feb 24, 2024
f206d7f
chore: extract func for check is tips cell
AkaShark Feb 24, 2024
0e28158
Merge branch 'dev' into feautre_tips_view
tisfeng Feb 25, 2024
e5b8307
Merge branch 'dev' into feautre_tips_view
tisfeng Feb 25, 2024
bb043b9
Merge branch 'dev' into feautre_tips_view
AkaShark Feb 26, 2024
f984ef4
Merge branch 'dev' into feautre_tips_view
tisfeng Feb 27, 2024
c9c2fec
Merge branch 'dev' into feautre_tips_view
tisfeng Feb 29, 2024
5257c8d
fix: use isUserChineseFirstLanguage to check if user system language …
tisfeng Feb 29, 2024
af95e3a
perf: do not show tips view when inputing translate
tisfeng Feb 29, 2024
388d56b
style: formate code
tisfeng Feb 29, 2024
5fc46c6
fix: fix query window height
AkaShark Mar 5, 2024
58a7d92
feat: add toggle for tips view
AkaShark Mar 5, 2024
7737bbe
Merge branch 'dev' into feautre_tips_view
tisfeng Mar 5, 2024
7834f26
Merge branch 'dev' into feautre_tips_view
tisfeng Mar 5, 2024
32303d8
fix: review comment
AkaShark Mar 5, 2024
b59b0fd
Merge branch 'feautre_tips_view' of github.com:AkaShark/Easydict into…
AkaShark Mar 5, 2024
4fc52ba
chore: update selection translation action type
AkaShark Mar 6, 2024
38342b1
Merge branch 'dev' into feautre_tips_view
tisfeng Mar 7, 2024
21a29c7
Update Easydict/App/Localizable.xcstrings
AkaShark Mar 8, 2024
d1dae4d
Merge branch 'dev' into feautre_tips_view
AkaShark Mar 10, 2024
0a6d636
Merge branch 'dev' into feautre_tips_view
tisfeng Mar 10, 2024
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 @@ -367,7 +367,7 @@ - (EZQueryService *)defaultTTSService {
}

- (BOOL)isShowTipsView {
if (self.queryModel.actionType != EZActionTypeInputQuery && EZ_isEmptyString(self.queryModel.queryText) && !self.hasShowTips) {
tisfeng marked this conversation as resolved.
Show resolved Hide resolved
if (EZ_isEmptyString(self.queryModel.queryText) && !self.hasShowTips) {
tisfeng marked this conversation as resolved.
Show resolved Hide resolved
return YES;
}
return NO;
Expand Down Expand Up @@ -1486,6 +1486,11 @@ - (CGFloat)getScrollViewContentHeight {
}
// NSLog(@"scrollViewContentHeight: %.1f", scrollViewContentHeight);

///TODO: 完善
if (!self.hasShowTips && !EZ_isEmptyString(self.queryModel.queryText)) {
scrollViewContentHeight += [self.tipsCell cellHeight];
}

return scrollViewContentHeight;
}

Expand Down