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.

Sign up for GitHub

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

Jump to bottom

Generalize common components #130

Merged
merged 49 commits into from
Feb 19, 2023
Merged

Generalize common components #130

merged 49 commits into from
Feb 19, 2023

Conversation

lihenggui
Copy link
Owner

No description provided.

Julie Wang and others added 30 commits February 10, 2023 10:06
Revert "Make TopAppBarUiState as key of LaunchedEffect"
6541a26 
This reverts commit 6da8032.
Merge branch 'compose' of https://github.com/lihenggui/blocker into c…
785e826 
…ompose
@lihenggui
Add ShellResult to pass more data from the command
76d98a3 
Change-Id: I17f430702735906e6f3b1d2525d3f1e9ffc61180
@lihenggui
Fix search list is not showing correctly
7cd3354 
Change-Id: I903fc207e44c3acda83346f6b49d154097446892
@lihenggui
Refine code in the search screen
80fb3e7 
Change-Id: I2734e9783e14990b28f2dc1325a3c07b0d4b13bf
@lihenggui
Use sealed class in the tab state
5870270 
Change-Id: I69b0795105f8203dd7dd81dd58b67923e7a21486
@lihenggui
Rename functions in the component list ViewModel
08b3874 
Change-Id: I3627e71eb173312209b0a5501fa1a70be6dcf074
@lihenggui
Merge branch 'modularization' into compose
eb08dd8 
Change-Id: Iabaab946aa3ec44e8cf144c3593b25ef3bda9d66
Merge branch 'compose' of https://github.com/lihenggui/blocker into c…
f4f0476 
…ompose
@lihenggui
Fix infinite recompose UI in the component list
77cfc71 
Change-Id: Ic1a7d31976a160bcc6f2ea3d835394e0cb2de472
Fix error: The target value must have an associated anchor.
19b57a3
Fix recomposition on ComponentListContentRoute
08fc2fd
@lihenggui
Merge branch 'compose' into modularization
8123d3c 
Change-Id: I96796b2df5cf5c465aec074982ad2839a603fa1a

# Conflicts:
#	feature/appdetail/src/main/java/com/merxury/blocker/feature/appdetail/cmplist/ComponentListContent.kt
@lihenggui
Upgrade Firebase BOM
4244469 
Change-Id: I89137b4192479d00d19cdd64330b6dea74707b58
@lihenggui
Make component check in IFW controller save to operate
6d46b16 
Change-Id: Ie1d4fed966b4b3267186b88f81ccc6cbf972f47a
@lihenggui
Move AppItem to ui module
b680e4e 
Change-Id: I0a0607c10f64b8a77d4dc6616fac59241e5d6fb4
1. Simplify modifier on SearchScreen
87d02d8 
2. Add LoadingScreen preview
Use getComponentInfo instead of Row + Text
7acb30c
Remove space on the bottom on RulesScreen and SearchScreen
5f00783
Hide the keyboard when clicking items
158e7b4
1. Change FilteredComponentItem to InstalledAppItem
a0763b0 
2. Update InfoSection
3. Make text end with ...
Remove space on the bottom on the SettingsScreen
186ae70
Customer containerColor of BlockerScrollableTabRow
44ea7d3
@lihenggui
Fix spotless issues
972554d 
Change-Id: I332f9641d7ff373cf1ab2067a4009758f0e1b83d
@lihenggui
Optimize code in the search screen
94e6e56 
Change-Id: I85e72d5828f997bcda95b5e4bf17fdf8612b478d
@lihenggui
Use the unified AppItem for data representation
7ec4d6c 
Change-Id: I3ec26d1d36e2297c58279836a6467736a66bdb1a
@lihenggui
Extract app detail tab info to UI module
c715f16 
Change-Id: Ic11a9d0a29a835c0ca17feded7d8e41dff55c9ec
@lihenggui
Use AppDetailTabs in the search screen, and optimize algorithms to ad…
8bcf264 
…d delimiters.

Change-Id: I887daea413ec174e317bd5915b676510dea2be74
@lihenggui
Rename AppListItem.kt to FilteredComponentItem.kt
d44ba22 
Change-Id: I756a7bf6095f8000cf7ca13a36e7047ae861dadc
@lihenggui
Separate screens into different files
0a4f92c 
Change-Id: Ic280a835ff6020095a5287cd70979aeaedd21b9a
@lihenggui
Use generic TabState to show tabs in search result
b4128cb 
Change-Id: I9dcee6412d43d9a487a78547a874264a32937349
@lihenggui
Use generic TabState in the bottom sheet
d3e07d1 
Change-Id: I44c1446a9424a367f45083e7e60b7ec3c2888ad9
@lihenggui
Make IFW controller return true by default
cd85afc 
Change-Id: Ic2631069c35a8195fe6c38c4b09216864187c876
@lihenggui
Use generic TabState in the AppDetailScreen
dd844ac 
Change-Id: I144865bbfe1ab73b10dc259ce960d25a7135ebab
@lihenggui
Optimize labels in the InitializingScreen
a036399 
Change-Id: I0b425c75ff14a424bf8a8562f44a9c37a7a06da5
@lihenggui
Optimize modifier in different screens
1bc66b6 
Change-Id: I263a22415c393affbb1b9fe970dc5fcedf48d7e9
@lihenggui
Add general error screen in ui module
fdaad99 
Change-Id: Ibb5d07da286083bf39588a360bbd139375044dea
@lihenggui
Navigate to apps in the search screen
219637d 
Change-Id: Ic93649849b2d731f3b84a3a5122f5bdce755fb28
@lihenggui
Adjust styles in the FilteredComponentItem
65fa411 
Change-Id: Iaf2ed97cb599be6ec24374bb27b0bdf383ed8c98
@lihenggui
Move rule cards to ui module
eae6699 
Change-Id: Ic44d2db899dae2c3992adf06e075d310a415c370
@lihenggui
Rename BlockerTextField to BlockerSearchTextField
dfa7c81 
Change-Id: Ie784f14c54776972651c687d358f23202704b049
@lihenggui
Remove unused string resource
34b94b7 
Change-Id: I3b9bd79835ad441fa9142fa0d1d5cdfc20947c1a
@lihenggui
Draft: Fix crash issue temporary
bc6dd3f 
Change-Id: Ie05fb50e1e940f09298edf8d56ebd086e4d3d808
@lihenggui
Use invoke correctly
0772d31 
Change-Id: I045de67ae158e1729ba2ae0a401f6e08bbe7f5c5
@lihenggui
Remove server URL in the rule card
d3aef05 
Change-Id: Ic6b3d1465853ed7a9bf071dc31293ef4231ddd6f
@lihenggui
Add rule cards in the search screen
3d975b7 
Change-Id: If627136996a38aba11bfe8a8aae87e1354ff2f66
@lihenggui
Add no search result hint
a379be3 
Change-Id: I8d156174e73ffed109a5cf687f83982865ab51c1
@lihenggui
Use correct color for navigationIndicatorColor
8af43d8 
Change-Id: I985b62ee1526c440939716d7fb1d47c27129db7a
@lihenggui
Fix spotless issue
a1729ff 
Change-Id: I1840519e1a3a50110f58c6955931e8a8490bb92a
@lihenggui lihenggui merged commit 23d282a into main Feb 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@lihenggui