summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar t8952024-01-13 18:12:19 -0500
committerGravatar t8952024-01-13 18:12:19 -0500
commit7b3941e5d47915590f477b7900fcbd1759168295 (patch)
tree0e6bfef11f9e489a995af174915cec227ef4de7c
parentandroid: Clean up git commands in build.gradle (diff)
downloadyuzu-7b3941e5d47915590f477b7900fcbd1759168295.tar.gz
yuzu-7b3941e5d47915590f477b7900fcbd1759168295.tar.xz
yuzu-7b3941e5d47915590f477b7900fcbd1759168295.zip
android: Show version name instead of git hash in the about fragment
Diffstat (limited to '')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt4
-rw-r--r--src/android/app/src/main/res/layout-w600dp/fragment_about.xml4
-rw-r--r--src/android/app/src/main/res/layout/fragment_about.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
index a1620fbb7..5b5f800c1 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
@@ -76,8 +76,8 @@ class AboutFragment : Fragment() {
76 binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment) 76 binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
77 } 77 }
78 78
79 binding.textBuildHash.text = BuildConfig.GIT_HASH 79 binding.textVersionName.text = BuildConfig.VERSION_NAME
80 binding.buttonBuildHash.setOnClickListener { 80 binding.textVersionName.setOnClickListener {
81 val clipBoard = 81 val clipBoard =
82 requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager 82 requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
83 val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH) 83 val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)
diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
index a26ffbc73..655e49219 100644
--- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
@@ -147,7 +147,7 @@
147 android:layout_marginHorizontal="20dp" /> 147 android:layout_marginHorizontal="20dp" />
148 148
149 <LinearLayout 149 <LinearLayout
150 android:id="@+id/button_build_hash" 150 android:id="@+id/button_version_name"
151 android:layout_width="match_parent" 151 android:layout_width="match_parent"
152 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
153 android:background="?attr/selectableItemBackground" 153 android:background="?attr/selectableItemBackground"
@@ -164,7 +164,7 @@
164 android:textAlignment="viewStart" /> 164 android:textAlignment="viewStart" />
165 165
166 <com.google.android.material.textview.MaterialTextView 166 <com.google.android.material.textview.MaterialTextView
167 android:id="@+id/text_build_hash" 167 android:id="@+id/text_version_name"
168 style="@style/TextAppearance.Material3.BodyMedium" 168 style="@style/TextAppearance.Material3.BodyMedium"
169 android:layout_width="match_parent" 169 android:layout_width="match_parent"
170 android:layout_height="wrap_content" 170 android:layout_height="wrap_content"
diff --git a/src/android/app/src/main/res/layout/fragment_about.xml b/src/android/app/src/main/res/layout/fragment_about.xml
index a24f5230e..38090fa50 100644
--- a/src/android/app/src/main/res/layout/fragment_about.xml
+++ b/src/android/app/src/main/res/layout/fragment_about.xml
@@ -148,7 +148,7 @@
148 android:layout_marginHorizontal="20dp" /> 148 android:layout_marginHorizontal="20dp" />
149 149
150 <LinearLayout 150 <LinearLayout
151 android:id="@+id/button_build_hash" 151 android:id="@+id/button_version_name"
152 android:layout_width="match_parent" 152 android:layout_width="match_parent"
153 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
154 android:paddingVertical="16dp" 154 android:paddingVertical="16dp"
@@ -165,7 +165,7 @@
165 android:text="@string/build" /> 165 android:text="@string/build" />
166 166
167 <com.google.android.material.textview.MaterialTextView 167 <com.google.android.material.textview.MaterialTextView
168 android:id="@+id/text_build_hash" 168 android:id="@+id/text_version_name"
169 style="@style/TextAppearance.Material3.BodyMedium" 169 style="@style/TextAppearance.Material3.BodyMedium"
170 android:layout_width="match_parent" 170 android:layout_width="match_parent"
171 android:layout_height="wrap_content" 171 android:layout_height="wrap_content"