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

Commit ecbfc19

Browse files
keianhzoMortimerGoro
keianhzo
authored and
MortimerGoro
committed
UI transitions animations (#1934)
1 parent 51a797f commit ecbfc19

File tree

108 files changed

+472
-173
lines changed

Some content is hidden

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

108 files changed

+472
-173
lines changed

‎app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomScrollView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void createScrollDelegate(Context context, AttributeSet attrs, int defSt
6262
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CustomScrollView, 0, defStyle);
6363
mThumbDrawable = a.getDrawable(R.styleable.CustomScrollView_android_fastScrollThumbDrawable);
6464
if (mThumbDrawable == null) {
65-
mThumbDrawable = getResources().getDrawable(R.drawable.fast_scroll_thumb, getContext().getTheme());
65+
mThumbDrawable = getResources().getDrawable(R.drawable.scrollbar_thumb, getContext().getTheme());
6666
}
6767
mIsAlwaysVisible = a.getBoolean(R.styleable.CustomScrollView_android_fastScrollAlwaysVisible, false);
6868
mThumbDynamicHeight = a.getBoolean(R.styleable.CustomScrollView_dynamicHeight, true);

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

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

318318
mPrefs = PreferenceManager.getDefaultSharedPreferences(mAppContext);
319319
mPrefs.registerOnSharedPreferenceChangeListener(this);
320+
321+
for (CustomUIButton button : mButtons) {
322+
button.setPrivateMode(true);
323+
}
320324
}
321325

322326
@Override
@@ -734,8 +738,6 @@ public void onCanGoBack(GeckoSession aSession, boolean canGoBack) {
734738

735739
Log.d(LOGTAG, "Got onCanGoBack: " + (enableBackButton ? "true" : "false"));
736740
mBackButton.setEnabled(enableBackButton);
737-
mBackButton.setHovered(false);
738-
mBackButton.setClickable(enableBackButton);
739741
}
740742
}
741743

@@ -744,8 +746,6 @@ public void onCanGoForward(GeckoSession aSession, boolean canGoForward) {
744746
if (mForwardButton != null) {
745747
Log.d(LOGTAG, "Got onCanGoForward: " + (canGoForward ? "true" : "false"));
746748
mForwardButton.setEnabled(canGoForward);
747-
mForwardButton.setHovered(false);
748-
mForwardButton.setClickable(canGoForward);
749749
}
750750
}
751751

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)