history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-27 05:35:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Display version in title

Browse Source
This commit is contained in:
Connor McLaughlin 2020-11-04 00:07:56 +10:00
parent e457d4ca0c
commit f94fef11ac
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/cpp/android_host_interface.cpp
View File

@ -17,6 +17,7 @@
#include "frontend-common/imgui_styles.h" #include "frontend-common/imgui_styles.h"
#include "frontend-common/opengl_host_display.h" #include "frontend-common/opengl_host_display.h"
#include "frontend-common/vulkan_host_display.h" #include "frontend-common/vulkan_host_display.h"
#include "scmversion/scmversion.h"
#include <android/native_window_jni.h> #include <android/native_window_jni.h>
#include <cmath> #include <cmath>
#include <imgui.h> #include <imgui.h>
@ -629,6 +630,11 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
#define DEFINE_JNI_ARGS_METHOD(return_type, name, ...) \ #define DEFINE_JNI_ARGS_METHOD(return_type, name, ...) \
extern "C" JNIEXPORT return_type JNICALL Java_com_github_stenzek_duckstation_##name(JNIEnv* env, __VA_ARGS__) extern "C" JNIEXPORT return_type JNICALL Java_com_github_stenzek_duckstation_##name(JNIEnv* env, __VA_ARGS__)
DEFINE_JNI_ARGS_METHOD(jstring, AndroidHostInterface_getScmVersion, jobject unused)
{
return env->NewStringUTF(g_scm_tag_str);
}
DEFINE_JNI_ARGS_METHOD(jobject, AndroidHostInterface_create, jobject unused, jobject context_object, DEFINE_JNI_ARGS_METHOD(jobject, AndroidHostInterface_create, jobject unused, jobject context_object,
jstring user_directory) jstring user_directory)
{ {

1
android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java
View File

@ -14,6 +14,7 @@ public class AndroidHostInterface {
private long mNativePointer; private long mNativePointer;
private Context mContext; private Context mContext;
static public native String getScmVersion();
static public native AndroidHostInterface create(Context context, String userDirectory); static public native AndroidHostInterface create(Context context, String userDirectory);
public AndroidHostInterface(Context context) { public AndroidHostInterface(Context context) {

10
android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java
View File

@ -45,6 +45,15 @@ public class MainActivity extends AppCompatActivity {
return prefs.getBoolean("Main/SaveStateOnExit", true); return prefs.getBoolean("Main/SaveStateOnExit", true);
} }
private static String getTitleString() {
String scmVersion = AndroidHostInterface.getScmVersion();
final int gitHashPos = scmVersion.indexOf("-g");
if (gitHashPos > 0)
scmVersion = scmVersion.substring(0, gitHashPos);
return String.format("DuckStation %s", scmVersion);
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -52,6 +61,7 @@ public class MainActivity extends AppCompatActivity {
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
Toolbar toolbar = findViewById(R.id.toolbar); Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setTitle(getTitleString());
findViewById(R.id.fab_add_game_directory).setOnClickListener(new View.OnClickListener() { findViewById(R.id.fab_add_game_directory).setOnClickListener(new View.OnClickListener() {
@Override @Override