target API29, rename packageid & java pkg names

maks · Mar 5, 2021 · bcd6e84 · bcd6e84
1 parent dfec91d
commit bcd6e84
Show file tree

Hide file tree

Showing 53 changed files with 160 additions and 163 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,9 +5,9 @@ android {
     buildToolsVersion "28.0.2"
 
     defaultConfig {
-        applicationId "com.levien.synthesizer"
+        applicationId "com.manichord.synthesizer"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

diff --git a/...m/levien/synthesizer/ApplicationTest.java → ...anichord/synthesizer/ApplicationTest.java b/...m/levien/synthesizer/ApplicationTest.java → ...anichord/synthesizer/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.levien.synthesizer;
+package com.manichord.synthesizer;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.levien.synthesizer">
+    package="com.manichord.synthesizer">
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
         <activity
-            android:name="com.levien.synthesizer.android.ui.PianoActivity2"
+            android:name="com.manichord.synthesizer.android.ui.PianoActivity2"
             android:label="@string/app_name"
             android:screenOrientation="landscape"
             android:theme="@style/LightThemeSelector"
@@ -18,57 +18,57 @@
           </intent-filter>
         </activity>
         <activity
-            android:name="com.levien.synthesizer.android.ui.MainActivity"
+            android:name="com.manichord.synthesizer.android.ui.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.ScoreActivity"
+            android:name="com.manichord.synthesizer.android.ui.ScoreActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.ChordGridActivity"
+            android:name="com.manichord.synthesizer.android.ui.ChordGridActivity"
             android:label="@string/chord_grid"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.InstrumentListActivity"
+            android:name="com.manichord.synthesizer.android.ui.InstrumentListActivity"
             android:label="@string/instrument_list"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.EditInstrumentActivity"
+            android:name="com.manichord.synthesizer.android.ui.EditInstrumentActivity"
             android:label="@string/edit_instrument"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.VibratoActivity"
+            android:name="com.manichord.synthesizer.android.ui.VibratoActivity"
             android:label="@string/vibrato"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.OscillatorActivity"
+            android:name="com.manichord.synthesizer.android.ui.OscillatorActivity"
             android:label="@string/oscillator"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.TremoloActivity"
+            android:name="com.manichord.synthesizer.android.ui.TremoloActivity"
             android:label="@string/tremolo"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.LowPassFilterActivity"
+            android:name="com.manichord.synthesizer.android.ui.LowPassFilterActivity"
             android:label="@string/low_pass_filter"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.AmplificationActivity"
+            android:name="com.manichord.synthesizer.android.ui.AmplificationActivity"
             android:label="@string/amplification"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.EffectsActivity"
+            android:name="com.manichord.synthesizer.android.ui.EffectsActivity"
             android:label="@string/effects"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.KarplusStrongActivity"
+            android:name="com.manichord.synthesizer.android.ui.KarplusStrongActivity"
             android:label="@string/karplus_strong"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.levien.synthesizer.android.ui.SettingsActivity"
+            android:name="com.manichord.synthesizer.android.ui.SettingsActivity"
             android:label="@string/settings" />
-        <service android:name=".android.service.SynthesizerService">
+        <service android:name="com.manichord.synthesizer.android.service.SynthesizerService">
         </service>
 
     </application>

diff --git a/app/src/main/cpp/android_glue.cc b/app/src/main/cpp/android_glue.cc
@@ -133,7 +133,7 @@ SLresult result;
   }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_levien_synthesizer_android_AndroidGlue_start(JNIEnv *env,
+Java_com_manichord_synthesizer_android_AndroidGlue_start(JNIEnv *env,
     jobject thiz, jint sample_rate, jint buf_size) {
   CreateEngine();
   SLDataLocator_AndroidSimpleBufferQueue loc_bufq =
@@ -182,7 +182,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_start(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_levien_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
+Java_com_manichord_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
     jobject thiz) {
   LOGI("shutting down engine");
   if (bqPlayerObject != NULL) {
@@ -209,7 +209,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_levien_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
+Java_com_manichord_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
     jobject thiz, jbyteArray jb) {
   uint8_t *data = (uint8_t *)env->GetByteArrayElements(jb, NULL);
   if (data != NULL) {
@@ -219,7 +219,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_levien_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
+Java_com_manichord_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
     jobject thiz, jboolean isPlaying) {
   SLresult result = (*bq_player_play)->SetPlayState(bq_player_play,
       isPlaying ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_PAUSED);

diff --git a/...vien/synthesizer/android/AndroidGlue.java → ...hord/synthesizer/android/AndroidGlue.java b/...vien/synthesizer/android/AndroidGlue.java → ...hord/synthesizer/android/AndroidGlue.java
@@ -1,6 +1,6 @@
-package com.levien.synthesizer.android;
+package com.manichord.synthesizer.android;
 
-import com.levien.synthesizer.core.midi.MessageOutputProcessor;
+import com.manichord.synthesizer.core.midi.MessageOutputProcessor;
 
 /**
  * JNI container for connecting to C++ synth engine. The actual implementation is in the cpp/src

diff --git a/...r/android/service/SynthesizerService.java → ...r/android/service/SynthesizerService.java b/...r/android/service/SynthesizerService.java → ...r/android/service/SynthesizerService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.service;
+package com.manichord.synthesizer.android.service;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,11 +38,11 @@
 import android.os.IBinder;
 import android.util.Log;
 
-import com.levien.synthesizer.R;
-import com.levien.synthesizer.android.AndroidGlue;
-import com.levien.synthesizer.android.usb.UsbMidiDevice;
-import com.levien.synthesizer.core.midi.MessageTee;
-import com.levien.synthesizer.core.midi.MidiListener;
+import com.manichord.synthesizer.R;
+import com.manichord.synthesizer.android.AndroidGlue;
+import com.manichord.synthesizer.android.usb.UsbMidiDevice;
+import com.manichord.synthesizer.core.midi.MessageTee;
+import com.manichord.synthesizer.core.midi.MidiListener;
 
 /**
  * An Android Service that plays audio from a synthesizer.

diff --git a/...er/android/service/SynthesizerThread.java → ...er/android/service/SynthesizerThread.java b/...er/android/service/SynthesizerThread.java → ...er/android/service/SynthesizerThread.java
@@ -16,7 +16,7 @@
 
 // This class is probably obsolete and should be deleted
 
-package com.levien.synthesizer.android.service;
+package com.manichord.synthesizer.android.service;
 
 import android.media.AudioFormat;
 import android.media.AudioManager;

diff --git a/...ynthesizer/android/stats/JitterStats.java → ...ynthesizer/android/stats/JitterStats.java b/...ynthesizer/android/stats/JitterStats.java → ...ynthesizer/android/stats/JitterStats.java
@@ -1,6 +1,4 @@
-package com.levien.synthesizer.android.stats;
-
-import android.util.Log;
+package com.manichord.synthesizer.android.stats;
 
 public class JitterStats {
   public JitterStats() {

diff --git a/...ynthesizer/android/ui/PianoActivity2.java → ...ynthesizer/android/ui/PianoActivity2.java b/...ynthesizer/android/ui/PianoActivity2.java → ...ynthesizer/android/ui/PianoActivity2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.ui;
+package com.manichord.synthesizer.android.ui;
 
 import java.util.List;
 
@@ -41,14 +41,14 @@
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.levien.synthesizer.R;
-import com.levien.synthesizer.android.widgets.keyboard.KeyboardSpec;
-import com.levien.synthesizer.android.widgets.keyboard.KeyboardView;
-import com.levien.synthesizer.android.widgets.keyboard.ScrollStripView;
-import com.levien.synthesizer.android.widgets.knob.KnobListener;
-import com.levien.synthesizer.android.widgets.knob.KnobView;
-import com.levien.synthesizer.core.midi.MidiAdapter;
-import com.levien.synthesizer.core.midi.MidiListener;
+import com.manichord.synthesizer.R;
+import com.manichord.synthesizer.android.widgets.keyboard.KeyboardSpec;
+import com.manichord.synthesizer.android.widgets.keyboard.KeyboardView;
+import com.manichord.synthesizer.android.widgets.keyboard.ScrollStripView;
+import com.manichord.synthesizer.android.widgets.knob.KnobListener;
+import com.manichord.synthesizer.android.widgets.knob.KnobView;
+import com.manichord.synthesizer.core.midi.MidiAdapter;
+import com.manichord.synthesizer.core.midi.MidiListener;
 
 /**
  * Activity for simply playing the piano.

diff --git a/...thesizer/android/ui/SettingsActivity.java → ...thesizer/android/ui/SettingsActivity.java b/...thesizer/android/ui/SettingsActivity.java → ...thesizer/android/ui/SettingsActivity.java
@@ -1,12 +1,12 @@
-package com.levien.synthesizer.android.ui;
+package com.manichord.synthesizer.android.ui;
 
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceActivity;
 
-import com.levien.synthesizer.R;
+import com.manichord.synthesizer.R;
 
 public class SettingsActivity extends PreferenceActivity {
   @SuppressWarnings("deprecation")

diff --git a/...synthesizer/android/ui/SynthActivity.java → ...synthesizer/android/ui/SynthActivity.java b/...synthesizer/android/ui/SynthActivity.java → ...synthesizer/android/ui/SynthActivity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.ui;
+package com.manichord.synthesizer.android.ui;
 
-import com.levien.synthesizer.android.service.SynthesizerService;
+import com.manichord.synthesizer.android.service.SynthesizerService;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

diff --git a/...ynthesizer/android/usb/UsbMidiDevice.java → ...ynthesizer/android/usb/UsbMidiDevice.java b/...ynthesizer/android/usb/UsbMidiDevice.java → ...ynthesizer/android/usb/UsbMidiDevice.java
@@ -16,7 +16,7 @@
 
 // Class representing a USB MIDI keyboard
 
-package com.levien.synthesizer.android.usb;
+package com.manichord.synthesizer.android.usb;
 
 import android.annotation.TargetApi;
 import android.hardware.usb.UsbConstants;
@@ -27,8 +27,8 @@
 import android.os.Build;
 import android.util.Log;
 
-import com.levien.synthesizer.core.midi.MessageFromBytes;
-import com.levien.synthesizer.core.midi.MidiListener;
+import com.manichord.synthesizer.core.midi.MessageFromBytes;
+import com.manichord.synthesizer.core.midi.MidiListener;
 
 @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
 public class UsbMidiDevice {

diff --git a/...zer/android/widgets/keyboard/KeySpec.java → ...zer/android/widgets/keyboard/KeySpec.java b/...zer/android/widgets/keyboard/KeySpec.java → ...zer/android/widgets/keyboard/KeySpec.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.keyboard;
+package com.manichord.synthesizer.android.widgets.keyboard;
 
 import android.graphics.RectF;
 

diff --git a/...ndroid/widgets/keyboard/KeyboardSpec.java → ...ndroid/widgets/keyboard/KeyboardSpec.java b/...ndroid/widgets/keyboard/KeyboardSpec.java → ...ndroid/widgets/keyboard/KeyboardSpec.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.keyboard;
+package com.manichord.synthesizer.android.widgets.keyboard;
 
 import android.graphics.Color;
 import android.graphics.RectF;

diff --git a/...ndroid/widgets/keyboard/KeyboardView.java → ...ndroid/widgets/keyboard/KeyboardView.java b/...ndroid/widgets/keyboard/KeyboardView.java → ...ndroid/widgets/keyboard/KeyboardView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.keyboard;
+package com.manichord.synthesizer.android.widgets.keyboard;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -27,7 +27,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.levien.synthesizer.core.midi.MidiListener;
+import com.manichord.synthesizer.core.midi.MidiListener;
 
 public class KeyboardView extends View {
   public KeyboardView(Context context, AttributeSet attrs) {

diff --git a/...oid/widgets/keyboard/ScrollStripView.java → ...oid/widgets/keyboard/ScrollStripView.java b/...oid/widgets/keyboard/ScrollStripView.java → ...oid/widgets/keyboard/ScrollStripView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.keyboard;
+package com.manichord.synthesizer.android.widgets.keyboard;
 
 import android.content.Context;
 import android.graphics.Canvas;

diff --git a/...er/android/widgets/knob/KnobListener.java → ...er/android/widgets/knob/KnobListener.java b/...er/android/widgets/knob/KnobListener.java → ...er/android/widgets/knob/KnobListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.knob;
+package com.manichord.synthesizer.android.widgets.knob;
 
 /**
  * KnobListener is an interface for getting events when a KnobView's value changes.

diff --git a/...oid/widgets/knob/KnobPlaceholderView.java → ...oid/widgets/knob/KnobPlaceholderView.java b/...oid/widgets/knob/KnobPlaceholderView.java → ...oid/widgets/knob/KnobPlaceholderView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.knob;
+package com.manichord.synthesizer.android.widgets.knob;
 
 import android.content.Context;
 import android.util.AttributeSet;

diff --git a/.../android/widgets/knob/KnobPreference.java → .../android/widgets/knob/KnobPreference.java b/.../android/widgets/knob/KnobPreference.java → .../android/widgets/knob/KnobPreference.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.knob;
+package com.manichord.synthesizer.android.widgets.knob;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.levien.synthesizer.R;
+import com.manichord.synthesizer.R;
 
 /**
  * A wrapper so that a knob can be used in the preference dialog

diff --git a/...esizer/android/widgets/knob/KnobView.java → ...esizer/android/widgets/knob/KnobView.java b/...esizer/android/widgets/knob/KnobView.java → ...esizer/android/widgets/knob/KnobView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.android.widgets.knob;
+package com.manichord.synthesizer.android.widgets.knob;
 
 import java.util.Locale;
 
@@ -29,11 +29,10 @@
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.levien.synthesizer.R;
+import com.manichord.synthesizer.R;
 
 /**
  * KnobView is a widget for setting a real value by turning a virtual "knob".

diff --git a/...nthesizer/core/midi/MessageFromBytes.java → ...nthesizer/core/midi/MessageFromBytes.java b/...nthesizer/core/midi/MessageFromBytes.java → ...nthesizer/core/midi/MessageFromBytes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.core.midi;
+package com.manichord.synthesizer.core.midi;
 
 /**
  * MessageFromBytes sends MIDI messages from bytes to a MidiListener.

diff --git a/...izer/core/midi/MessageInputProcessor.java → ...izer/core/midi/MessageInputProcessor.java b/...izer/core/midi/MessageInputProcessor.java → ...izer/core/midi/MessageInputProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.levien.synthesizer.core.midi;
+package com.manichord.synthesizer.core.midi;
 
 import java.io.IOException;
 import java.io.InputStream;