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

Fixes: site monitor prevent webview reload #20077

Merged
merged 33 commits into from
Jan 31, 2024
Merged

Fixes: site monitor prevent webview reload #20077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
964fd10
+ Adds: model to loaded state
AjeshRPai Jan 30, 2024
ae9ca81
↑ Updates: the webview client to use tab type
AjeshRPai Jan 30, 2024
236b450
+ Adds: SiteMonitorParentViewModel
AjeshRPai Jan 30, 2024
586e3ed
↑ Updates: the logic in activity to use tabs
AjeshRPai Jan 30, 2024
84d25bf
↑ Updates: the site monitor tab view model to use state flow
AjeshRPai Jan 30, 2024
d73c942
↑ Updates: the fragment to use loaded state
AjeshRPai Jan 30, 2024
47471c7
↑ Updates: the logic to use three web views for each tab
AjeshRPai Jan 31, 2024
5ada1fa
+ Adds: top bar view to the activity
AjeshRPai Jan 31, 2024
24d8aa9
Merge branch 'trunk' into issue/20067-site-monitor-prevent-webview-re…
AjeshRPai Jan 31, 2024
554b42d
+ Adds: the logic to handle initial tab logic
AjeshRPai Jan 31, 2024
5444240
* Fixes: the incorrect passing of modifier and formatting
AjeshRPai Jan 31, 2024
32877e7
* Fixes: Incorrect passing of modifier instance
AjeshRPai Jan 31, 2024
d532763
* Fixes: Incorrect tab tracking and activity tracking
AjeshRPai Jan 31, 2024
89f9895
- Removes: Redundant logs from SiteMonitorWebViewClient
AjeshRPai Jan 31, 2024
7bf963a
→ Moves: Site Monitor Tab header logic to activity
AjeshRPai Jan 31, 2024
dc1a6ba
- Removes: Site Monitor Fragment and Fragment container
AjeshRPai Jan 31, 2024
8a6984a
- Removes: Redundant SiteMonitorTabNavigation.kt
AjeshRPai Jan 31, 2024
adf4177
* Reverts: the change for loaded state object as its no longer needed
AjeshRPai Jan 31, 2024
da6711c
* Renames: SiteMonitorTabViewModel.kt to SiteMonitorTabViewModelSlice
AjeshRPai Jan 31, 2024
f6633cf
↑ Updates: the state returned from mutable to immutable
AjeshRPai Jan 31, 2024
cfb9132
* Fixes: data not loaded in orientation change
AjeshRPai Jan 31, 2024
8aa801b
Refactor: wrap the content in it's own column to prevent tab jumping
zwarm Jan 31, 2024
c53f6ff
Add unit tests for Site Monitor mapper and utils
zwarm Jan 31, 2024
6a7a13d
Add tracking for initial site monitor tab
pantstamp Jan 31, 2024
b697e79
Add tracking for site monitor webview error
pantstamp Jan 31, 2024
5479d36
Add capitalisation for tab names
pantstamp Jan 31, 2024
29fa1f5
Add unit tests for Site Monitor web view client
zwarm Jan 31, 2024
fb3c6b9
* Updates: the _uiState to use immutable state variable
AjeshRPai Jan 31, 2024
6f0c48e
Refactor: replace direct access to analytics tracker with siteMonitor…
zwarm Jan 31, 2024
1cf5193
Add unit tests for SiteMonitorParentViewModel
zwarm Jan 31, 2024
c21915f
Fix detekt issue
zwarm Jan 31, 2024
e8da1d8
Add unit tests for SiteMonitorTabViewModelSlice
zwarm Jan 31, 2024
82d7b92
Fix checkstyle empty line
zwarm Jan 31, 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
2 changes: 1 addition & 1 deletion .../src/main/java/org/wordpress/android/ui/mysite/personalization/PersonalizationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class PersonalizationActivity : AppCompatActivity() {
contentColor = MaterialTheme.colors.onSurface,
) {
tabs.forEachIndexed { index, title ->
Tab(text = { Text(stringResource(id = title)) },
Tab(text = { Text(stringResource(id = title).uppercase()) },
selected = tabIndex == index,
onClick = { tabIndex = index }
)
Expand Down
76 changes: 0 additions & 76 deletions WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorFragmentContainer.kt
View file
Open in desktop

This file was deleted.

Loading
Loading