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

Commit 1cc152f

Browse files
keianhzoMortimerGoro
keianhzo
authored and
MortimerGoro
committed
Revert UI animations (#2380)
* Revert all UI ease animations * Moved hiding library panels to onPageStart
1 parent e6f5e2b commit 1cc152f

File tree

95 files changed

+122
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+122
-318
lines changed

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,6 @@ private void initialize(@NonNull Context aContext) {
339339

340340
mPrefs = PreferenceManager.getDefaultSharedPreferences(mAppContext);
341341
mPrefs.registerOnSharedPreferenceChangeListener(this);
342-
343-
for (CustomUIButton button : mButtons) {
344-
button.setPrivateMode(true);
345-
}
346342
}
347343

348344
@Override
@@ -781,10 +777,10 @@ public void onLocationChange(GeckoSession session, String url) {
781777
@Override
782778
public void onCanGoBack(GeckoSession aSession, boolean canGoBack) {
783779
if (mBackButton != null) {
784-
boolean enableBackButton = getSession().canGoBack();
785-
786-
Log.d(LOGTAG, "Got onCanGoBack: " + (enableBackButton ? "true" : "false"));
787-
mBackButton.setEnabled(enableBackButton);
780+
Log.d(LOGTAG, "Got onCanGoBack: " + (canGoBack ? "true" : "false"));
781+
mBackButton.setEnabled(canGoBack);
782+
mBackButton.setHovered(false);
783+
mBackButton.setClickable(canGoBack);
788784
}
789785
}
790786

@@ -793,6 +789,8 @@ public void onCanGoForward(GeckoSession aSession, boolean canGoForward) {
793789
if (mForwardButton != null) {
794790
Log.d(LOGTAG, "Got onCanGoForward: " + (canGoForward ? "true" : "false"));
795791
mForwardButton.setEnabled(canGoForward);
792+
mForwardButton.setHovered(false);
793+
mForwardButton.setClickable(canGoForward);
796794
}
797795
}
798796

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,14 @@ public void onVideoAvailabilityChanged(boolean aVideosAvailable) {
15591559
@Override
15601560
public void onPageStart(@NonNull GeckoSession geckoSession, @NonNull String s) {
15611561
mCaptureOnPageStop = true;
1562+
1563+
if (isHistoryVisible()) {
1564+
hideHistory();
1565+
}
1566+
1567+
if (isBookmarksVisible()) {
1568+
hideBookmarks();
1569+
}
15621570
}
15631571

15641572
@Override
@@ -1573,22 +1581,6 @@ public void captureImage() {
15731581
mSession.captureBitmap();
15741582
}
15751583

1576-
// GeckoSession.NavigationDelegate
1577-
1578-
@Nullable
1579-
@Override
1580-
public GeckoResult<AllowOrDeny> onLoadRequest(@NonNull GeckoSession geckoSession, @NonNull LoadRequest loadRequest) {
1581-
if (isHistoryVisible()) {
1582-
hideHistory();
1583-
}
1584-
1585-
if (isBookmarksVisible()) {
1586-
hideBookmarks();
1587-
}
1588-
1589-
return GeckoResult.ALLOW;
1590-
}
1591-
15921584
@Override
15931585
public void onLocationChange(@NonNull GeckoSession session, @Nullable String url) {
15941586
updateTitleBarUrl(url);

‎app/src/main/res/color/fog_void_tint.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_hovered="true"
64
android:color="@color/void_color"/> <!-- focused -->
75
<item android:color="@color/fog"/> <!-- default -->

‎app/src/main/res/color/library_panel_button_text_color.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
43
<item android:color="@color/rhino" android:state_enabled="false" />
54
<item android:color="@color/fog" android:state_pressed="true" />
65
<item android:color="@color/asphalt" android:state_hovered="true" />

‎app/src/main/res/color/library_panel_context_menu_item_color.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_pressed="true" android:color="@color/fog"/>
64
<item android:state_hovered="true" android:color="@color/asphalt"/>
75
<item android:color="@color/fog"/>

‎app/src/main/res/color/library_panel_description_color.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_pressed="true" android:color="@color/fog"/>
64
<item android:state_hovered="true" android:color="@color/asphalt"/>
75
<item android:color="@color/concrete"/>

‎app/src/main/res/color/library_panel_icon_color.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_pressed="true" android:color="@color/void_color"/>
64
<item android:state_hovered="true" android:color="@color/smoke"/>
75
<item android:color="@color/concrete"/>

‎app/src/main/res/color/library_panel_title_text_color.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_pressed="true" android:color="@color/fog"/>
64
<item android:state_hovered="true" android:color="@color/fog"/>
75
<item android:color="@color/fog"/>

‎app/src/main/res/color/rhino_void_tint.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_hovered="true"
64
android:color="@color/void_color"/> <!-- focused -->
75
<item android:color="@color/rhino"/> <!-- default -->

‎app/src/main/res/color/void_fog_tint.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:enterFadeDuration="@integer/ui_fadeAnimTime"
4-
android:exitFadeDuration="@integer/ui_fadeAnimTime">
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
53
<item android:state_hovered="true"
64
android:color="@color/fog"/> <!-- focused -->
75
<item android:color="@color/void_color"/> <!-- default -->

0 commit comments

Comments
 (0)