diff --git a/.gitignore b/.gitignore index 39fb081..8f91cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /local.properties /.idea/workspace.xml /.idea/libraries +/.idea/caches .DS_Store /build /captures diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 635999d..cc51e58 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..895657b --- /dev/null +++ b/LICENSE @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. \ No newline at end of file diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..6fadb79 --- /dev/null +++ b/Readme.md @@ -0,0 +1,15 @@ +# Pedal Pi - Display View + +Manage the current pedalboard with **Pedal Pi - Display View** + +[Get it on Google Play](https://play.google.com/store/apps/details?id=io.github.com.pedalpi.displayview) + +## Screenshots + +Connecting device show a simple modal +Current pedalboard view +Change a param value of a effect + +## Legal attribution + +* Google Play and the Google Play logo are trademarks of Google LLC. \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a2881f0..846e3cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,11 +5,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 25 + compileSdkVersion 27 defaultConfig { - applicationId "io.github.pedalpi.pedalpi_display" - minSdkVersion 10 - targetSdkVersion 25 + applicationId "io.github.pedalpi.displayview" + minSdkVersion 16 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -29,13 +29,14 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:25.4.0' - //implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:support-annotations:27.0.2' + //implementation 'com.android.support:appcompat-v7:25.4.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support:support-annotations:27.1.1' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - implementation 'uk.co.chrisjenx:calligraphy:2.3.0' - implementation 'com.github.salomonbrys.kotson:kotson:2.5.0' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'uk.co.chrisjenx:calligraphy:2.3.0' // Custom font + implementation 'com.github.salomonbrys.kotson:kotson:2.5.0' // Use gsom for json + implementation 'com.squareup.okhttp3:okhttp:3.10.0' // HttpClient } diff --git a/app/src/androidTest/java/io/github/pedalpi/pedalpi_display/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/github/pedalpi/displayview/ExampleInstrumentedTest.kt similarity index 93% rename from app/src/androidTest/java/io/github/pedalpi/pedalpi_display/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/io/github/pedalpi/displayview/ExampleInstrumentedTest.kt index 35ea160..afac9e5 100644 --- a/app/src/androidTest/java/io/github/pedalpi/pedalpi_display/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/io/github/pedalpi/displayview/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package io.github.pedalpi.pedalpi_display +package io.github.pedalpi.displayview import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b40d68a..42f48ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,9 @@ + package="io.github.pedalpi.displayview"> + - + android:name="io.github.pedalpi.displayview.App"> + + + + + + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/io/github/pedalpi/displayview/App.kt b/app/src/main/java/io/github/pedalpi/displayview/App.kt new file mode 100644 index 0000000..aff6087 --- /dev/null +++ b/app/src/main/java/io/github/pedalpi/displayview/App.kt @@ -0,0 +1,31 @@ +/* +Copyright 2018 SrMouraSilva + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package io.github.pedalpi.displayview + +import android.app.Application +import io.github.pedalpi.displayview.communication.adb.AdbCommunication +import io.github.pedalpi.displayview.communication.base.Communicator + + +class App : Application() { + + override fun onCreate() { + super.onCreate() + Communicator.communication = AdbCommunication() + Communicator.initialize() + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/ConfigureInformationActivity.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/ConfigureInformationActivity.kt new file mode 100644 index 0000000..6d63c8c --- /dev/null +++ b/app/src/main/java/io/github/pedalpi/displayview/activity/ConfigureInformationActivity.kt @@ -0,0 +1,42 @@ +/* +Copyright 2018 SrMouraSilva + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package io.github.pedalpi.displayview.activity + +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.provider.Settings +import android.support.v7.app.AppCompatActivity +import io.github.pedalpi.displayview.R +import kotlinx.android.synthetic.main.activity_configure_helper.* + + +class ConfigureInformationActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_configure_helper) + + configureHelperButtonSettings.setOnClickListener { + startActivityForResult(Intent(Settings.ACTION_SETTINGS), 0) + } + + configureHelperButtonDocumentation.setOnClickListener { + val uri = "https://developer.android.com/studio/debug/dev-options.html#enable" + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri))) + } + } +} diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/MainActivity.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/MainActivity.kt new file mode 100644 index 0000000..ae3f763 --- /dev/null +++ b/app/src/main/java/io/github/pedalpi/displayview/activity/MainActivity.kt @@ -0,0 +1,110 @@ +/* +Copyright 2018 SrMouraSilva + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package io.github.pedalpi.displayview.activity + +import android.app.ProgressDialog +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import android.view.WindowManager +import android.widget.Button +import android.widget.TextView +import io.github.pedalpi.displayview.R +import io.github.pedalpi.displayview.activity.effects.EffectsActivity +import io.github.pedalpi.displayview.communication.adb.message.EventMessage +import io.github.pedalpi.displayview.communication.adb.message.EventType +import io.github.pedalpi.displayview.communication.base.Communicator +import io.github.pedalpi.displayview.communication.base.message.Messages +import io.github.pedalpi.displayview.communication.base.message.ResponseMessage +import io.github.pedalpi.displayview.communication.base.message.ResponseVerb +import io.github.pedalpi.displayview.model.Data +import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper + + +class MainActivity : AppCompatActivity() { + + private lateinit var progress: ProgressDialog + + private lateinit var number: TextView + private lateinit var name: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + supportActionBar?.hide() + + this.number = findViewById(R.id.pedalboard_number) + this.name = findViewById(R.id.pedalboard_name) + + number.text = "--" + name.text = "CONNECTING" + + Communicator.setOnMessageListener({ onMessage(it) }) + + val button = findViewById