diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java index 8d10eaff3..a9f3ec9a2 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java @@ -5,10 +5,12 @@ package org.mozilla.vrbrowser.ui.widgets.settings; +import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Point; +import android.text.Html; import android.util.AttributeSet; import android.util.Log; import android.view.GestureDetector; @@ -23,8 +25,8 @@ import org.mozilla.vrbrowser.BuildConfig; import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.audio.AudioEngine; -import org.mozilla.vrbrowser.browser.engine.SessionStore; import org.mozilla.vrbrowser.browser.engine.SessionStack; +import org.mozilla.vrbrowser.browser.engine.SessionStore; import org.mozilla.vrbrowser.ui.views.HoneycombButton; import org.mozilla.vrbrowser.ui.widgets.UIWidget; import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; @@ -78,6 +80,7 @@ public SettingsWidget(Context aContext, AttributeSet aAttrs, int aDefStyle) { initialize(aContext); } + @SuppressLint("ClickableViewAccessibility") private void initialize(Context aContext) { inflate(aContext, R.layout.settings, this); @@ -138,7 +141,12 @@ private void initialize(Context aContext) { TextView versionText = findViewById(R.id.versionText); try { PackageInfo pInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0); - versionText.setText(String.format(getResources().getString(R.string.settings_version), pInfo.versionName)); + String app_name = getResources().getString(R.string.app_name); + String[] app_name_parts = app_name.split(" "); + versionText.setText(Html.fromHtml("" + app_name_parts[0] + "" + + " " + app_name_parts[1] + " " + + " " + pInfo.versionName + "", + Html.FROM_HTML_MODE_LEGACY)); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); @@ -147,7 +155,7 @@ private void initialize(Context aContext) { mBuildText = findViewById(R.id.buildText); mBuildText.setText(versionCodeToDate(BuildConfig.VERSION_CODE)); - ViewGroup settingsMasthead = findViewById(R.id.settingsMasthead); + TextView settingsMasthead = findViewById(R.id.buildText); final GestureDetector gd = new GestureDetector(getContext(), new VersionGestureListener()); settingsMasthead.setOnTouchListener((view, motionEvent) -> { if (gd.onTouchEvent(motionEvent)) { @@ -156,6 +164,12 @@ private void initialize(Context aContext) { return view.performClick(); }); + TextView surveyLink = findViewById(R.id.surveyLink); + surveyLink.setOnClickListener(v -> { + mWidgetManager.getFocusedWindow().getSessionStack().newSessionWithUrl(getResources().getString(R.string.survey_link)); + exitWholeSettings(); + }); + HoneycombButton reportButton = findViewById(R.id.helpButton); reportButton.setOnClickListener(view -> { if (mAudio != null) { diff --git a/app/src/debug/res/drawable/ff_logo_settings.png b/app/src/debug/res/drawable/ff_logo_settings.png deleted file mode 100644 index 617d69b0e..000000000 Binary files a/app/src/debug/res/drawable/ff_logo_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable/ff_logo_settings.png b/app/src/main/res/drawable/ff_logo_settings.png deleted file mode 100644 index a845888ad..000000000 Binary files a/app/src/main/res/drawable/ff_logo_settings.png and /dev/null differ diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml index f60d7ca73..34c14d571 100644 --- a/app/src/main/res/layout/settings.xml +++ b/app/src/main/res/layout/settings.xml @@ -85,6 +85,7 @@ android:clickable="true" android:contextClickable="false" android:focusable="true" + android:gravity="center_horizontal" android:orientation="vertical" android:contentDescription="Firefox logo" app:layout_constraintEnd_toEndOf="parent" @@ -98,23 +99,38 @@ android:layout_gravity="center" android:clickable="false" android:scaleType="fitCenter" - android:src="@drawable/ff_logo_settings" /> + android:src="@drawable/ff_logo" /> + + https://yandex.by/search https://yandex.com.tr/search https://yandex.kz/search + + + https://qsurvey.mozilla.com/s3/FxR diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 25f5d615a..9e9503181 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,11 +85,6 @@ sdcard. '%1$s' will be replaced at runtime with the website's domain name. --> Will you allow %1$s to store data in persistent storage? - - version %1$s - @@ -271,6 +266,10 @@ opens the Firfox Reality support web site in the browser window. --> Help + + Send us Your Feedback + Restart Required