android: Remove early access fragment and home setting item

src/android/app/build.gradle.kts

@@ -146,12 +146,10 @@ android {
         create("mainline") {
             isDefault = true
             dimension = "version"
-            buildConfigField("Boolean", "PREMIUM", "false")
         }
 
         create("ea") {
             dimension = "version"
-            buildConfigField("Boolean", "PREMIUM", "true")
             applicationIdSuffix = ".ea"
         }
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt

@@ -41,15 +41,6 @@ class HomeSettingAdapter(
                 )
             )
 
-            when (model.titleId) {
-                R.string.get_early_access ->
-                    binding.optionLayout.background =
-                        ContextCompat.getDrawable(
-                            binding.optionCard.context,
-                            R.drawable.premium_background
-                        )
-            }
-
             if (!model.isEnabled.invoke()) {
                 binding.optionTitle.alpha = 0.5f
                 binding.optionDescription.alpha = 0.5f

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt

@@ -1,87 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.findNavController
-import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.FragmentEarlyAccessBinding
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
-
-class EarlyAccessFragment : Fragment() {
-    private var _binding: FragmentEarlyAccessBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentEarlyAccessBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        homeViewModel.setNavigationVisibility(visible = false, animated = true)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        binding.toolbarAbout.setNavigationOnClickListener {
-            parentFragmentManager.primaryNavigationFragment?.findNavController()?.popBackStack()
-        }
-
-        binding.getEarlyAccessButton.setOnClickListener {
-            openLink(
-                getString(R.string.play_store_link)
-            )
-        }
-
-        setInsets()
-    }
-
-    private fun openLink(link: String) {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
-        startActivity(intent)
-    }
-
-    private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            val leftInsets = barInsets.left + cutoutInsets.left
-            val rightInsets = barInsets.right + cutoutInsets.right
-
-            binding.appbarEa.updateMargins(left = leftInsets, right = rightInsets)
-
-            binding.scrollEa.updatePadding(
-                left = leftInsets,
-                right = rightInsets,
-                bottom = barInsets.bottom
-            )
-
-            windowInsets
-        }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -237,22 +237,6 @@ class HomeSettingsFragment : Fragment() {
             )
         }
 
-        if (!BuildConfig.PREMIUM) {
-            optionsList.add(
-                0,
-                HomeSetting(
-                    R.string.get_early_access,
-                    R.string.get_early_access_description,
-                    R.drawable.ic_diamond,
-                    {
-                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-                        parentFragmentManager.primaryNavigationFragment?.findNavController()
-                            ?.navigate(R.id.action_homeSettingsFragment_to_earlyAccessFragment)
-                    }
-                )
-            )
-        }
-
         binding.homeSettingsList.apply {
             layoutManager =
                 GridLayoutManager(requireContext(), resources.getInteger(R.integer.grid_columns))

src/android/app/src/main/res/layout/fragment_early_access.xml

@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator_about"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_ea"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_about"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
-            app:navigationIcon="@drawable/ic_back"
-            app:title="@string/early_access" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scroll_ea"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="20dp"
-        android:scrollbars="vertical"
-        android:fadeScrollbars="false"
-        android:defaultFocusHighlightEnabled="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/card_ea"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginVertical="32dp"
-            android:layout_marginHorizontal="20dp"
-            android:background="@drawable/premium_background"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                style="@style/TextAppearance.Material3.TitleLarge"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginHorizontal="20dp"
-                android:text="@string/early_access_benefits"
-                android:textAlignment="center"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/cutting_edge_features"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/early_access_updates"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/no_manual_installation"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/prioritized_support"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/helping_game_preservation"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginHorizontal="20dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_check_circle"
-                    app:tint="?attr/colorOnSurface" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:text="@string/our_eternal_gratitude"
-                    android:textAlignment="viewStart"
-                    android:layout_gravity="start|center_vertical" />
-
-            </LinearLayout>
-
-            <com.google.android.material.textview.MaterialTextView
-                style="@style/TextAppearance.Material3.TitleLarge"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/are_you_interested"
-                android:layout_marginTop="80dp"
-                android:layout_marginHorizontal="20dp"
-                android:textStyle="bold"
-                android:textAlignment="center" />
-
-            <com.google.android.material.card.MaterialCardView
-                style="?attr/materialCardViewFilledStyle"
-                android:id="@+id/get_early_access_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="28dp"
-                android:background="?attr/selectableItemBackground"
-                android:backgroundTint="@android:color/black">
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextAppearance.Material3.TitleLarge"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/get_early_access"
-                    android:layout_marginHorizontal="20dp"
-                    android:layout_marginVertical="8dp"
-                    android:textColor="@android:color/white"
-                    android:textStyle="bold"
-                    android:textAlignment="center" />
-
-            </com.google.android.material.card.MaterialCardView>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -16,9 +16,6 @@
         <action
             android:id="@+id/action_homeSettingsFragment_to_aboutFragment"
             app:destination="@id/aboutFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
-            app:destination="@id/earlyAccessFragment" />
         <action
             android:id="@+id/action_homeSettingsFragment_to_installableFragment"
             app:destination="@id/installableFragment" />
@@ -58,11 +55,6 @@
             app:destination="@id/licensesFragment" />
     </fragment>
 
-    <fragment
-        android:id="@+id/earlyAccessFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.EarlyAccessFragment"
-        android:label="EarlyAccessFragment" />
-
     <fragment
         android:id="@+id/licensesFragment"
         android:name="org.yuzu.yuzu_emu.fragments.LicensesFragment"

src/android/app/src/main/res/values/strings.xml

@@ -187,9 +187,7 @@
 
     <!-- Early access upgrade strings -->
     <string name="early_access">Early Access</string>
-    <string name="get_early_access">Get Early Access</string>
     <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string>
-    <string name="get_early_access_description">Cutting-edge features, early access to updates, and more</string>
     <string name="early_access_benefits">Early Access Benefits</string>
     <string name="cutting_edge_features">Cutting-edge features</string>
     <string name="early_access_updates">Early access to updates</string>