aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorAntônio Oliveira <antonio.filho128@gmail.com>2020-10-02 17:33:32 -0300
committerPaul McLean <pmclean@google.com>2020-10-05 10:56:32 -0600
commitd20b485c4d73cdd2434b0435eaa8c967894fc1de (patch)
tree84e0463f1570791cf82635edca2b95cff0c30037 /samples
parentf4d2113710309c574c4bb192dec2fe8c164cfefa (diff)
downloadoboe-d20b485c4d73cdd2434b0435eaa8c967894fc1de.tar.gz
Code review adjusts
Diffstat (limited to 'samples')
-rw-r--r--samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt3
-rw-r--r--samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt12
2 files changed, 8 insertions, 7 deletions
diff --git a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt
index f665f038..b80b7e6d 100644
--- a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt
+++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt
@@ -142,7 +142,8 @@ class DrumThumperActivity : AppCompatActivity(),
findViewById<LinearLayout>(R.id.rideMixControls).setVisibility(showFlag)
findViewById<LinearLayout>(R.id.crashMixControls).setVisibility(showFlag)
- findViewById<Button>(R.id.mixCtrlBtn).text = if (mMixControlsShowing) "Hide Mix Controls" else "Show Mix Controls"
+ findViewById<Button>(R.id.mixCtrlBtn).text =
+ if (mMixControlsShowing) "Hide Mix Controls" else "Show Mix Controls"
}
private fun connectMixSliders(panSliderId : Int, gainSliderId : Int, drumIndex : Int) {
diff --git a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt
index d3878eb7..0f97ceff 100644
--- a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt
+++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt
@@ -77,8 +77,12 @@ class TriggerPad: View {
//
// Layout Routines
//
- private fun calcTextSizeInPixels() : Float {
- return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, mTextSizeSp, resources.displayMetrics)
+ private fun calcTextSizeInPixels(): Float {
+ return TypedValue.applyDimension(
+ TypedValue.COMPLEX_UNIT_SP,
+ mTextSizeSp,
+ resources.displayMetrics
+ )
}
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
@@ -98,13 +102,9 @@ class TriggerPad: View {
override fun onMeasure (widthMeasureSpec: Int, heightMeasureSpec: Int) {
val width = MeasureSpec.getSize(widthMeasureSpec)
- /* var padLeft = getPaddingLeft() */
- /* var padRight = getPaddingRight() */
-
val padTop = paddingTop
val padBottom = paddingBottom
-
val heightMode = MeasureSpec.getMode(heightMeasureSpec)
var height = MeasureSpec.getSize(heightMeasureSpec)