aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcrueter <swurl@swurl.xyz>2025-06-17 01:59:05 +0000
committercrueter <crueter@noreply.localhost>2025-06-17 01:59:05 +0000
commit704d4e4428d2e335622a50be360268976178c74a (patch)
tree69292f3e7ad9251549ec14e3d5933c2b9c86d142 /src
parent6aeba9de662e05ba3bdfe73a245ac9f7cde62097 (diff)
[android, desktop] Firebomb pre-alpha banner (#195)
Signed-off-by: crueter <swurl@swurl.xyz> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/195 Co-authored-by: crueter <swurl@swurl.xyz> Co-committed-by: crueter <swurl@swurl.xyz>
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt4
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt88
-rw-r--r--src/common/settings.h7
-rw-r--r--src/yuzu/game_list.cpp34
-rw-r--r--src/yuzu/game_list.h8
5 files changed, 8 insertions, 133 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
index f42bda72e9..a5f96a4cc9 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
@@ -1,7 +1,6 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
-
package org.yuzu.yuzu_emu.features.settings.model
import org.yuzu.yuzu_emu.R
@@ -36,7 +35,6 @@ object Settings {
const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
const val PREF_SHOULD_SHOW_DRIVER_WARNING = "ShouldShowDriverWarning"
const val PREF_SHOULD_SHOW_PRE_ALPHA_WARNING = "ShouldShowPreAlphaWarning"
- const val PREF_SHOULD_SHOW_PRE_ALPHA_BANNER = "ShouldShowPreAlphaBanner"
const val PREF_SHOULD_SHOW_EDENS_VEIL_DIALOG = "ShouldShowEdensVeilDialog"
const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"
const val SECTION_STATS_OVERLAY = "Stats Overlay"
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
index 63a20ee1c3..9785e35a5e 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
package org.yuzu.yuzu_emu.ui
@@ -162,12 +162,6 @@ class GamesFragment : Fragment() {
}
setInsets()
- val shouldDisplayPreAlphaBanner =
- PreferenceManager.getDefaultSharedPreferences(requireContext())
- .getBoolean(Settings.PREF_SHOULD_SHOW_PRE_ALPHA_BANNER, true)
- if (shouldDisplayPreAlphaBanner) {
- addPreAlphaBanner()
- }
}
val applyGridGamesBinding = {
@@ -238,86 +232,6 @@ class GamesFragment : Fragment() {
navController.navigate(R.id.action_gamesFragment_to_homeSettingsFragment)
}
- private fun addPreAlphaBanner() {
- val preAlphaBanner = TextView(requireContext()).apply {
- id = "pre_alpha_banner".hashCode()
- layoutParams = ConstraintLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT
- ).apply {
- marginStart = resources.getDimensionPixelSize(R.dimen.spacing_med)
- marginEnd = resources.getDimensionPixelSize(R.dimen.spacing_med)
- topMargin = resources.getDimensionPixelSize(R.dimen.spacing_large)
- topToBottom = R.id.frame_search
- }
- setPadding(
- resources.getDimensionPixelSize(R.dimen.spacing_med),
- resources.getDimensionPixelSize(R.dimen.spacing_large),
- resources.getDimensionPixelSize(R.dimen.spacing_med),
- resources.getDimensionPixelSize(R.dimen.spacing_med)
- )
-
- setBackgroundColor(
- MaterialColors.getColor(
- this,
- com.google.android.material.R.attr.colorPrimary
- )
- )
- text = getString(R.string.pre_alpha_warning)
- setTextAppearance(
- com.google.android.material.R.style.TextAppearance_Material3_HeadlineSmall
- )
- setTextColor(
- MaterialColors.getColor(
- this,
- com.google.android.material.R.attr.colorOnError
- )
- )
- gravity = Gravity.CENTER
- }
-
- val closeButton = ImageButton(requireContext()).apply {
- id = "pre_alpha_close_button".hashCode()
- layoutParams = ConstraintLayout.LayoutParams(
- resources.getDimensionPixelSize(R.dimen.spacing_large),
- resources.getDimensionPixelSize(R.dimen.spacing_large)
- ).apply {
- startToStart = "pre_alpha_banner".hashCode()
- topToTop = "pre_alpha_banner".hashCode()
- bottomToBottom = "pre_alpha_banner".hashCode()
- marginStart = resources.getDimensionPixelSize(R.dimen.spacing_large) * 2
- topMargin = resources.getDimensionPixelSize(R.dimen.spacing_small)
- }
- setImageResource(android.R.drawable.ic_menu_close_clear_cancel)
- setColorFilter(
- MaterialColors.getColor(
- this,
- com.google.android.material.R.attr.colorOnError
- )
- )
- setBackgroundColor(Color.Transparent.toArgb())
- setOnClickListener {
- PreferenceManager.getDefaultSharedPreferences(requireContext())
- .edit() {
- putBoolean(Settings.PREF_SHOULD_SHOW_PRE_ALPHA_BANNER, false)
- }
- binding.root.removeView(preAlphaBanner)
- binding.root.removeView(this)
-
- binding.swipeRefresh.updateLayoutParams<ConstraintLayout.LayoutParams> {
- topToBottom = R.id.frame_search
- }
- }
- }
-
- binding.root.addView(preAlphaBanner)
- binding.root.addView(closeButton)
-
- binding.swipeRefresh.updateLayoutParams<ConstraintLayout.LayoutParams> {
- topToBottom = preAlphaBanner.id
- }
- }
-
private fun showViewMenu(anchor: View) {
val popup = PopupMenu(requireContext(), anchor)
popup.menuInflater.inflate(R.menu.menu_game_views, popup.menu)
diff --git a/src/common/settings.h b/src/common/settings.h
index ccb72acb14..2c22ae323f 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -668,10 +671,6 @@ struct Values {
Setting<bool> censor_username{linkage, true, "censor_username", Category::Miscellaneous};
Setting<bool> use_dev_keys{linkage, false, "use_dev_keys", Category::Miscellaneous};
Setting<bool> first_launch{linkage, true, "first_launch", Category::Miscellaneous};
- Setting<bool> hide_pre_alpha_warning{linkage,
- false,
- "hide_pre_alpha_warning",
- Category::Miscellaneous};
// Network
Setting<std::string> network_interface{linkage, std::string(), "network_interface",
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index c054f10476..80dd90d876 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -371,40 +371,6 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
- warning_layout = new QHBoxLayout;
- pre_alpha_warning = new QLabel;
- pre_alpha_warning->setText(
- tr("IMPORTANT: Eden is PRE-ALPHA SOFTWARE. "
- "Bugs and unfinished features are expected to be present at this stage."));
- pre_alpha_warning->setWordWrap(true);
- pre_alpha_warning->setOpenExternalLinks(true);
- pre_alpha_warning->setStyleSheet(
- QString::fromStdString("color: black; font-weight: bold;"));
-
- warning_dont_show_again = new QPushButton(this);
- warning_dont_show_again->setStyleSheet(
- QString::fromStdString("color: #DFDFDF; background-color: #383838;"));
- warning_dont_show_again->setText(tr("Don't Show Again"));
- connect(warning_dont_show_again, &QPushButton::clicked, this, [=, this] {
- Settings::values.hide_pre_alpha_warning.SetValue(true);
-
- layout->removeWidget(warning_widget);
- warning_widget->hide();
- });
-
- warning_layout->addWidget(pre_alpha_warning, 1);
- warning_layout->addWidget(warning_dont_show_again);
- warning_layout->setContentsMargins(3, 3, 3, 3);
- warning_widget = new QWidget;
- warning_widget->setStyleSheet(QString::fromStdString("background-color: khaki;"));
- warning_widget->setLayout(warning_layout);
-
- if (!Settings::values.hide_pre_alpha_warning.GetValue()) {
- layout->addWidget(warning_widget);
- } else {
- warning_widget->hide();
- }
-
layout->addWidget(tree_view);
layout->addWidget(search_field);
setLayout(layout);
diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h
index 778333dd87..7c492bc19f 100644
--- a/src/yuzu/game_list.h
+++ b/src/yuzu/game_list.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: 2015 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -176,11 +179,6 @@ private:
ControllerNavigation* controller_navigation = nullptr;
CompatibilityList compatibility_list;
- QHBoxLayout* warning_layout = nullptr;
- QWidget* warning_widget = nullptr;
- QPushButton* warning_dont_show_again = nullptr;
- QLabel* pre_alpha_warning = nullptr;
-
friend class GameListSearchField;
const PlayTime::PlayTimeManager& play_time_manager;