Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d731616
Add KeyboardEvent support
SrMouraSilva Feb 19, 2018
def5106
#6 Create view effects. Tests #5 button support
SrMouraSilva Feb 20, 2018
9cb1e0d
Update package
SrMouraSilva Feb 21, 2018
f629a53
New activities Effect, Param. Update protocol: Add identifier. Create…
SrMouraSilva Feb 21, 2018
71c868e
#6 Effect toggle now send
SrMouraSilva Feb 24, 2018
f73d590
#8 Read plugin data. #6 list pedalboard effects
SrMouraSilva Feb 24, 2018
df8d113
#7 Fix list bug when custom views. #7 Fix ParamDTO get bug when retur…
SrMouraSilva Feb 24, 2018
c4b0102
Ignore messages for not current pedalboard. #7 Toggle param. #Send an…
SrMouraSilva Feb 25, 2018
4256c99
#10 Resume initial tests
SrMouraSilva Feb 25, 2018
e902edf
Improve resume
SrMouraSilva Feb 25, 2018
016118a
#11 Improve resume
SrMouraSilva Feb 25, 2018
ff0b964
#10 #12 Improve param status: Param selected name. Hide params if ped…
SrMouraSilva Feb 25, 2018
654941d
Move files
SrMouraSilva Feb 27, 2018
1b97f65
Create GenericBaseAdapter and GenericViewFilter
SrMouraSilva Feb 27, 2018
d52719a
#12 #10 Resume view: Click a parameter will open a diialog
SrMouraSilva Feb 27, 2018
b2b5a17
#12 Now show dialog and loads the data. #10 Effect now update the status
SrMouraSilva Feb 27, 2018
e3891dd
Improve views: Position and show scroolbar
SrMouraSilva Feb 27, 2018
b01a771
#12 Send and receive param values changes: Partial support
SrMouraSilva Feb 27, 2018
dc32958
#10 Treatment of message events
SrMouraSilva Feb 27, 2018
9c12e5f
ParamsView -> EffectView. #11 EffectView: Add button effect status. R…
SrMouraSilva Feb 28, 2018
eceab7f
Crop long param names. #10 #11 Update dialog when receive EVENT param…
SrMouraSilva Mar 1, 2018
0af2644
#12 Inform the selected item
SrMouraSilva Mar 2, 2018
e0b06f6
#10 #12 Improve selected item. Fix toggle param first click problem.…
SrMouraSilva Mar 3, 2018
b55de52
#4 Show dialog when client disconnect
SrMouraSilva Mar 4, 2018
da0e569
#4 Fix rotate dialog message
SrMouraSilva Mar 4, 2018
f4eb7de
#14 Simple way to check if USB debugging mode are active
SrMouraSilva Mar 4, 2018
d5f85ad
Merge pull request #16 from PedalPi/issue-5-buttons-support
SrMouraSilva Mar 4, 2018
706ab16
Merge pull request #17 from PedalPi/issue-10-resume
SrMouraSilva Mar 4, 2018
1dc4957
#14 Add Configure informations page
SrMouraSilva Mar 4, 2018
8aa8d6c
#14 Add buttons to intent the settings and the help page (developer.a…
SrMouraSilva Mar 5, 2018
f89be51
#14 Improve design
SrMouraSilva Mar 5, 2018
ab55252
#14 Fix activity show info page
SrMouraSilva Mar 6, 2018
a8959bd
Merge pull request #18 from PedalPi/issue-14-usb-debugging
SrMouraSilva Mar 6, 2018
bd9dbe9
#19 USB Acessory initial example
SrMouraSilva Mar 6, 2018
f85bc70
#19 Drop Android 2.3 USB Accessory support. Fix Pedal Pi description …
SrMouraSilva Mar 6, 2018
19f0cba
#20 Readme
SrMouraSilva Mar 6, 2018
27cdaab
#20 Google play image
SrMouraSilva Mar 6, 2018
51f100e
#20 Images size
SrMouraSilva Mar 6, 2018
6a962a9
#20 Images size
SrMouraSilva Mar 6, 2018
ec9526c
#20 Images size - Fix
SrMouraSilva Mar 6, 2018
bee05c6
Merge pull request #24 from PedalPi/issue-20-readme
SrMouraSilva Mar 6, 2018
47e1931
#19 Start refactor for support easly other communication methods
SrMouraSilva Mar 19, 2018
b18c408
#19 Finish refactor necessary to implements other communication proto…
SrMouraSilva Mar 19, 2018
b373aa3
#23 Add license files. Test AOA support. Improve request plugins (onl…
SrMouraSilva Jul 22, 2018
f1547c2
Remove Readme wrong added
SrMouraSilva Jul 22, 2018
1af0320
Merge pull request #25 from PedalPi/issue-19-usb-accessory
SrMouraSilva Jul 22, 2018
0dfafa9
Merge pull request #27 from PedalPi/issue-23-license
SrMouraSilva Jul 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/local.properties
/.idea/workspace.xml
/.idea/libraries
/.idea/caches
.DS_Store
/build
/captures
Expand Down
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

174 changes: 174 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
15 changes: 15 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Pedal Pi - Display View

Manage the current pedalboard with **Pedal Pi - Display View**

[<img alt="Get it on Google Play" src="docs/google-play-badge.png" width="250">](https://play.google.com/store/apps/details?id=io.github.com.pedalpi.displayview)

## Screenshots

<img alt="Connecting device show a simple modal" src="docs/connecting.png" width="500">
<img alt="Current pedalboard view" src="docs/current-pedalboard.png" width="500">
<img alt="Change a param value of a effect" src="docs/param-value.png" width="500">

## Legal attribution

* Google Play and the Google Play logo are trademarks of Google LLC.
25 changes: 13 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 25 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.github.pedalpi.pedalpi_display">
package="io.github.pedalpi.displayview">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:name="android.hardware.usb.accessory" />

<application
android:allowBackup="true"
Expand All @@ -11,14 +12,34 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:name=".communication.server.ServerApplication">
<activity android:name=".MainActivity">
android:name="io.github.pedalpi.displayview.App">
<!--<activity android:"io.github.pedalpi.displayview.activity.MainActivity">-->

<!--<uses-library android:name="com.android.future.usb.accessory" />-->

<activity android:name="io.github.pedalpi.displayview.activity.resume.ResumeActivity"
android:screenOrientation="sensorLandscape"
android:configChanges="orientation|keyboardHidden">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name="io.github.pedalpi.displayview.activity.effects.EffectsActivity" />
<activity android:name=".activity.params.ParamsActivity" />
<!--<activity android:name=".resume.ResumeActivity" />-->
<activity android:name=".activity.MainActivity" />
<activity android:name=".activity.ConfigureInformationActivity" />

<activity android:name=".communication.usb.UsbAccessoryActivity">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
android:resource="@xml/accessory_filter" />
</activity>
</application>

</manifest>
31 changes: 31 additions & 0 deletions app/src/main/java/io/github/pedalpi/displayview/App.kt
Original file line number Diff line number Diff line change
@@ -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()
}
}
Loading