Merge pull request #8 from maks/fix-program-change-ui

Fix program change indication in UI, bump version for release
maks · Apr 27, 2022 · 0de05fa · 0de05fa
2 parents e687f57 + 52007e4
commit 0de05fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,9 +7,9 @@ android {
     defaultConfig {
         applicationId "com.manichord.synthesizer"
         minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 30
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/com/manichord/synthesizer/android/ui/PianoActivity2.java b/app/src/main/java/com/manichord/synthesizer/android/ui/PianoActivity2.java
@@ -93,8 +93,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
-
-
     switch (item.getItemId()) {
       case R.id.settings:
         startActivity(new Intent(this, SettingsActivity.class));
@@ -123,7 +121,6 @@ public void onActivityResult(int requestCode, int resultCode,
     } else {
       // Get the file's content URI from the incoming Intent
       Uri returnUri = returnIntent.getData();
-
         try {
           InputStream patchIs =
                   getContentResolver().openInputStream(returnUri);
@@ -297,6 +294,20 @@ public void run() {
           }
         });
       }
+
+      @Override
+      public void onProgramChange(final int channel, final int program) {
+        // Log.d(TAG, "onProgramChange: chan"+channel+" prog:"+program);
+          runOnUiThread(new Runnable() {
+            public void run() {
+              if (program < 32) {
+                presetSpinner_.setSelection(program);
+              } else {
+                Log.i(TAG, "out of range Program change:"+program);
+              }
+            }
+          });
+        }
     });
 
     // Populate patch names (note: we could update an existing list rather than