Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Fixes #3528 Fix for the what's configuration change issue #3536

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Fixes #3528 Fix for the what's configuration change issue #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ public NavigationURLBar(Context context, AttributeSet attrs) {

@SuppressLint("ClickableViewAccessibility")
private void initialize(Context aContext) {
mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

mAudio = AudioEngine.fromContext(aContext);

mUIThreadExecutor = ((VRBrowserApplication)getContext().getApplicationContext()).getExecutors().mainThread();
Expand All @@ -120,6 +125,7 @@ private void initialize(Context aContext) {
// Layout setup
mBinding = DataBindingUtil.inflate(LayoutInflater.from(getContext()), R.layout.navigation_url, this, true);
mBinding.setLifecycleOwner((VRBrowserActivity)getContext());
mBinding.setSettingsViewmodel(mSettingsViewModel);

// Use Domain autocomplete provider from components
mAutocompleteProvider = new ShippedDomainsProvider();
Expand Down Expand Up @@ -239,25 +245,15 @@ public void detachFromWindow() {
mViewModel.getIsBookmarked().removeObserver(mIsBookmarkedObserver);
mViewModel = null;
}
if (mSettingsViewModel != null) {
mSettingsViewModel = null;
}
}

public void attachToWindow(@NonNull WindowWidget aWindow) {
mViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(String.valueOf(aWindow.hashCode()), WindowViewModel.class);
mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

mBinding.setViewmodel(mViewModel);
mBinding.setSettingsViewmodel(mSettingsViewModel);

mSettingsViewModel.refresh();

mViewModel.getIsLoading().observe((VRBrowserActivity)getContext(), mIsLoadingObserver);
mViewModel.getIsBookmarked().observe((VRBrowserActivity)getContext(), mIsBookmarkedObserver);
Expand Down
18 changes: 7 additions & 11 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ private void initialize(@NonNull Context aContext) {
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(TrayViewModel.class);
mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

updateUI();

Expand Down Expand Up @@ -189,6 +193,7 @@ private void updateUI() {
mBinding = DataBindingUtil.inflate(inflater, R.layout.navigation_bar, this, true);
mBinding.setLifecycleOwner((VRBrowserActivity)getContext());
mBinding.setViewmodel(mViewModel);
mBinding.setSettingsmodel(mSettingsViewModel);

mBinding.navigationBarNavigation.backButton.setOnClickListener(v -> {
v.requestFocusFromTouch();
Expand Down Expand Up @@ -424,6 +429,8 @@ public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);

updateUI();

mSettingsViewModel.refresh();
}

@Override
Expand Down Expand Up @@ -521,10 +528,6 @@ public void detachFromWindow() {
mViewModel.getIsPopUpBlocked().removeObserver(mIsPopUpBlockedListener);
mViewModel = null;
}

if (mSettingsViewModel != null) {
mSettingsViewModel = null;
}
}

@Override
Expand All @@ -541,15 +544,8 @@ public void attachToWindow(@NonNull WindowWidget aWindow) {
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(String.valueOf(mAttachedWindow.hashCode()), WindowViewModel.class);
mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

mBinding.setViewmodel(mViewModel);
mBinding.setSettingsmodel(mSettingsViewModel);

mSettingsViewModel.refresh();

mViewModel.getIsActiveWindow().observeForever(mIsActiveWindowObserver);
mViewModel.getIsPopUpBlocked().observeForever(mIsPopUpBlockedListener);
Expand Down
11 changes: 5 additions & 6 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ public SettingsWidget(Context aContext, AttributeSet aAttrs, int aDefStyle) {

@SuppressLint("ClickableViewAccessibility")
private void initialize() {
mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

updateUI();

mOpenDialog = SettingsView.SettingViewType.MAIN;
Expand All @@ -126,12 +131,6 @@ public void updateUI() {

// Inflate this data binding layout
mBinding = DataBindingUtil.inflate(inflater, R.layout.settings, this, true);

mSettingsViewModel = new ViewModelProvider(
(VRBrowserActivity)getContext(),
ViewModelProvider.AndroidViewModelFactory.getInstance(((VRBrowserActivity) getContext()).getApplication()))
.get(SettingsViewModel.class);

mBinding.setSettingsmodel(mSettingsViewModel);

mBinding.backButton.setOnClickListener(v -> {
Expand Down