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

Commit e957ecb

Browse files
keianhzobluemarvin
keianhzo
authored and
bluemarvin
committed
Standarize dialogs y & z positions (#1949)
1 parent 781f57d commit e957ecb

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
import android.widget.Button;
1111

1212
import org.mozilla.vrbrowser.R;
13-
import org.mozilla.vrbrowser.audio.AudioEngine;
1413

1514
public class NoInternetWidget extends UIWidget {
1615

1716
private Button mAcceptButton;
18-
private AudioEngine mAudio;
19-
private UIWidget mBrowserWidget;
2017

2118
public NoInternetWidget(Context aContext) {
2219
super(aContext);
@@ -48,7 +45,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
4845
Context context = getContext();
4946
aPlacement.width = WidgetPlacement.dpDimension(context, R.dimen.no_internet_width);
5047
aPlacement.height = WidgetPlacement.dpDimension(context, R.dimen.no_internet_height);
51-
aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.no_internet_z_distance);
48+
aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_z_distance);
5249
aPlacement.anchorX = 0.5f;
5350
aPlacement.anchorY = 0.5f;
5451
aPlacement.parentAnchorX = 0.5f;
@@ -57,10 +54,4 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
5754
aPlacement.visible = false;
5855
}
5956

60-
public void setBrowserWidget(UIWidget aWidget) {
61-
if (aWidget != null) {
62-
mWidgetPlacement.parentHandle = aWidget.getHandle();
63-
}
64-
mBrowserWidget = aWidget;
65-
}
6657
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,8 @@ public void setNoInternetToastVisible(boolean aVisible) {
10831083
if (mNoInternetToast == null) {
10841084
mNoInternetToast = new NoInternetWidget(getContext());
10851085
mNoInternetToast.mWidgetPlacement.parentHandle = getHandle();
1086+
mNoInternetToast.mWidgetPlacement.parentAnchorY = 0.0f;
1087+
mNoInternetToast.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
10861088
}
10871089
if (aVisible && !mNoInternetToast.isVisible()) {
10881090
mNoInternetToast.show(REQUEST_FOCUS);
@@ -1094,6 +1096,8 @@ public void setNoInternetToastVisible(boolean aVisible) {
10941096
public void showAlert(String title, @NonNull String msg, @NonNull PromptWidget.PromptDelegate callback) {
10951097
mAlertPrompt = new AlertPromptWidget(getContext());
10961098
mAlertPrompt.mWidgetPlacement.parentHandle = getHandle();
1099+
mAlertPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1100+
mAlertPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
10971101
mAlertPrompt.setTitle(title);
10981102
mAlertPrompt.setMessage(msg);
10991103
mAlertPrompt.setPromptDelegate(callback);
@@ -1103,6 +1107,8 @@ public void showAlert(String title, @NonNull String msg, @NonNull PromptWidget.P
11031107
public void showButtonPrompt(String title, @NonNull String msg, @NonNull String[] btnMsg, @NonNull ConfirmPromptWidget.ConfirmPromptDelegate callback) {
11041108
mConfirmPrompt = new ConfirmPromptWidget(getContext());
11051109
mConfirmPrompt.mWidgetPlacement.parentHandle = getHandle();
1110+
mConfirmPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1111+
mConfirmPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
11061112
mConfirmPrompt.setTitle(title);
11071113
mConfirmPrompt.setMessage(msg);
11081114
mConfirmPrompt.setButtons(btnMsg);
@@ -1114,6 +1120,8 @@ public void showAppDialog(@NonNull String title, @NonNull @StringRes int descri
11141120
@NonNull BaseAppDialogWidget.Delegate buttonsCallback, @NonNull MessageDialogWidget.Delegate messageCallback) {
11151121
mAppDialog = new MessageDialogWidget(getContext());
11161122
mAppDialog.mWidgetPlacement.parentHandle = getHandle();
1123+
mAppDialog.mWidgetPlacement.parentAnchorY = 0.0f;
1124+
mAppDialog.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
11171125
mAppDialog.setTitle(title);
11181126
mAppDialog.setMessage(description);
11191127
mAppDialog.setButtons(btnMsg);
@@ -1125,6 +1133,8 @@ public void showAppDialog(@NonNull String title, @NonNull @StringRes int descri
11251133
public void showClearCacheDialog() {
11261134
mClearCacheDialog = new ClearCacheDialogWidget(getContext());
11271135
mClearCacheDialog.mWidgetPlacement.parentHandle = getHandle();
1136+
mClearCacheDialog.mWidgetPlacement.parentAnchorY = 0.0f;
1137+
mClearCacheDialog.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
11281138
mClearCacheDialog.setTitle(R.string.history_clear);
11291139
mClearCacheDialog.setButtons(new int[] {
11301140
R.string.history_clear_cancel,
@@ -1169,6 +1179,8 @@ public void showClearCacheDialog() {
11691179

11701180
public void showMaxWindowsDialog(int maxDialogs) {
11711181
mMaxWindowsDialog = new MaxWindowsWidget(getContext());
1182+
mMaxWindowsDialog.mWidgetPlacement.parentAnchorY = 0.0f;
1183+
mMaxWindowsDialog.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
11721184
mMaxWindowsDialog.mWidgetPlacement.parentHandle = getHandle();
11731185
mMaxWindowsDialog.setMessage(getContext().getString(R.string.max_windows_msg, String.valueOf(maxDialogs)));
11741186
mMaxWindowsDialog.show(REQUEST_FOCUS);
@@ -1310,6 +1322,8 @@ public GeckoResult<PromptResponse> onAlertPrompt(@NonNull GeckoSession geckoSess
13101322

13111323
mAlertPrompt = new AlertPromptWidget(getContext());
13121324
mAlertPrompt.mWidgetPlacement.parentHandle = getHandle();
1325+
mAlertPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1326+
mAlertPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
13131327
mAlertPrompt.setTitle(alertPrompt.title);
13141328
mAlertPrompt.setMessage(alertPrompt.message);
13151329
mAlertPrompt.setPromptDelegate(() -> result.complete(alertPrompt.dismiss()));
@@ -1325,6 +1339,8 @@ public GeckoResult<PromptResponse> onButtonPrompt(@NonNull GeckoSession geckoSes
13251339

13261340
mConfirmPrompt = new ConfirmPromptWidget(getContext());
13271341
mConfirmPrompt.mWidgetPlacement.parentHandle = getHandle();
1342+
mConfirmPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1343+
mConfirmPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
13281344
mConfirmPrompt.setTitle(buttonPrompt.title);
13291345
mConfirmPrompt.setMessage(buttonPrompt.message);
13301346
mConfirmPrompt.setButtons(new String[] {
@@ -1354,6 +1370,8 @@ public GeckoResult<PromptResponse> onTextPrompt(@NonNull GeckoSession geckoSessi
13541370

13551371
mTextPrompt = new TextPromptWidget(getContext());
13561372
mTextPrompt.mWidgetPlacement.parentHandle = getHandle();
1373+
mTextPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1374+
mTextPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
13571375
mTextPrompt.setTitle(textPrompt.title);
13581376
mTextPrompt.setMessage(textPrompt.message);
13591377
mTextPrompt.setDefaultText(textPrompt.defaultValue);
@@ -1380,6 +1398,8 @@ public GeckoResult<PromptResponse> onAuthPrompt(@NonNull GeckoSession geckoSessi
13801398

13811399
mAuthPrompt = new AuthPromptWidget(getContext());
13821400
mAuthPrompt.mWidgetPlacement.parentHandle = getHandle();
1401+
mAuthPrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1402+
mAuthPrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
13831403
mAuthPrompt.setTitle(authPrompt.title);
13841404
mAuthPrompt.setMessage(authPrompt.message);
13851405
mAuthPrompt.setAuthOptions(authPrompt.authOptions);
@@ -1411,6 +1431,8 @@ public GeckoResult<PromptResponse> onChoicePrompt(@NonNull GeckoSession geckoSes
14111431

14121432
mChoicePrompt = new ChoicePromptWidget(getContext());
14131433
mChoicePrompt.mWidgetPlacement.parentHandle = getHandle();
1434+
mChoicePrompt.mWidgetPlacement.parentAnchorY = 0.0f;
1435+
mChoicePrompt.mWidgetPlacement.translationY = WidgetPlacement.unitFromMeters(getContext(), R.dimen.base_app_dialog_y_distance);
14141436
mChoicePrompt.setTitle(choicePrompt.title);
14151437
mChoicePrompt.setMessage(choicePrompt.message);
14161438
mChoicePrompt.setChoices(choicePrompt.choices);

‎app/src/main/res/values/dimen.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
<!-- No Internet toast -->
111111
<dimen name="no_internet_width">400dp</dimen>
112112
<dimen name="no_internet_height">200dp</dimen>
113-
<dimen name="no_internet_z_distance" format="float" type="dimen">2.5</dimen>
114113

115114
<!-- Autocompletion Widget -->
116115
<dimen name="autocompletion_widget_line_height">36dp</dimen>
@@ -263,6 +262,7 @@
263262
<!-- Base App Dialog -->
264263
<dimen name="base_app_dialog_width">420dp</dimen>
265264
<item name="base_app_dialog_z_distance" format="float" type="dimen">2</item>
265+
<item name="base_app_dialog_y_distance" format="float" type="dimen">1.2</item>
266266

267267
<!-- Cache Dialog -->
268268
<dimen name="cache_app_dialog_width">585dp</dimen>

0 commit comments

Comments
 (0)