diff --git a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt index 86d18ca..ea02f1e 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt @@ -17,8 +17,6 @@ import android.widget.TableRow import android.widget.TextView import androidx.core.view.children -import androidx.core.view.setMargins -import androidx.fragment.app.DialogFragment import com.google.android.material.button.MaterialButton import com.lukas.music.R import com.lukas.music.databinding.FragmentEditChordBinding @@ -27,12 +25,13 @@ import com.lukas.music.song.chords.Accidental import com.lukas.music.song.chords.Chord import com.lukas.music.song.chords.Interval +import com.lukas.music.util.EasyDialogFragment +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup import com.lukas.music.util.updateToggle class EditChordFragment(private val chord: Chord, private val songFragment: SongFragment) : - DialogFragment() { - lateinit var binding: FragmentEditChordBinding + EasyDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,7 +69,7 @@ for (description in descriptions) { val text = TextView(binding.root.context) text.text = description - text.layoutParams = layout + text.layoutParams = UIUtil.cardLayout text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER row.addView(text) } @@ -80,7 +79,7 @@ for (position in 0 until Chord.NOTE_COUNT - 1) { val button = MaterialButton(binding.root.context) button.text = accidental.toString() - button.layoutParams = layout + button.layoutParams = UIUtil.cardLayout button.updateToggle(chord.accidentals[position] == accidental, R.color.blue) button.setOnClickListener { if (chord.accidentals[position] == accidental) { @@ -113,16 +112,6 @@ } companion object { - val layout = TableRow.LayoutParams( - TableRow.LayoutParams.WRAP_CONTENT, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - layout.weight = 1.0f - layout.setMargins(5) - } - val descriptions = arrayOf("III", "V", "VII", "IX") } } \ No newline at end of file diff --git a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt index 86d18ca..ea02f1e 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt @@ -17,8 +17,6 @@ import android.widget.TableRow import android.widget.TextView import androidx.core.view.children -import androidx.core.view.setMargins -import androidx.fragment.app.DialogFragment import com.google.android.material.button.MaterialButton import com.lukas.music.R import com.lukas.music.databinding.FragmentEditChordBinding @@ -27,12 +25,13 @@ import com.lukas.music.song.chords.Accidental import com.lukas.music.song.chords.Chord import com.lukas.music.song.chords.Interval +import com.lukas.music.util.EasyDialogFragment +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup import com.lukas.music.util.updateToggle class EditChordFragment(private val chord: Chord, private val songFragment: SongFragment) : - DialogFragment() { - lateinit var binding: FragmentEditChordBinding + EasyDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,7 +69,7 @@ for (description in descriptions) { val text = TextView(binding.root.context) text.text = description - text.layoutParams = layout + text.layoutParams = UIUtil.cardLayout text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER row.addView(text) } @@ -80,7 +79,7 @@ for (position in 0 until Chord.NOTE_COUNT - 1) { val button = MaterialButton(binding.root.context) button.text = accidental.toString() - button.layoutParams = layout + button.layoutParams = UIUtil.cardLayout button.updateToggle(chord.accidentals[position] == accidental, R.color.blue) button.setOnClickListener { if (chord.accidentals[position] == accidental) { @@ -113,16 +112,6 @@ } companion object { - val layout = TableRow.LayoutParams( - TableRow.LayoutParams.WRAP_CONTENT, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - layout.weight = 1.0f - layout.setMargins(5) - } - val descriptions = arrayOf("III", "V", "VII", "IX") } } \ No newline at end of file diff --git a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt index 0c33019..4b668c4 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt @@ -27,6 +27,7 @@ import com.lukas.music.databinding.FragmentPlayBinding import com.lukas.music.instruments.Rhythm import com.lukas.music.song.Song +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup class PlayFragment : Fragment() { @@ -125,12 +126,12 @@ chordDisplays.clear() for (chord in Song.currentSong.chordProgression.currentItem ?: return) { val card = CardView(binding.root.context) - card.layoutParams = SongFragment.tableRowLayout + card.layoutParams = UIUtil.cardLayout card.radius = 10f card.preventCornerOverlap = false val text = TextView(binding.root.context) text.text = chord.toString(true, Song.currentSong.root) - text.layoutParams = SongFragment.tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER card.addView(text) diff --git a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt index 86d18ca..ea02f1e 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt @@ -17,8 +17,6 @@ import android.widget.TableRow import android.widget.TextView import androidx.core.view.children -import androidx.core.view.setMargins -import androidx.fragment.app.DialogFragment import com.google.android.material.button.MaterialButton import com.lukas.music.R import com.lukas.music.databinding.FragmentEditChordBinding @@ -27,12 +25,13 @@ import com.lukas.music.song.chords.Accidental import com.lukas.music.song.chords.Chord import com.lukas.music.song.chords.Interval +import com.lukas.music.util.EasyDialogFragment +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup import com.lukas.music.util.updateToggle class EditChordFragment(private val chord: Chord, private val songFragment: SongFragment) : - DialogFragment() { - lateinit var binding: FragmentEditChordBinding + EasyDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,7 +69,7 @@ for (description in descriptions) { val text = TextView(binding.root.context) text.text = description - text.layoutParams = layout + text.layoutParams = UIUtil.cardLayout text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER row.addView(text) } @@ -80,7 +79,7 @@ for (position in 0 until Chord.NOTE_COUNT - 1) { val button = MaterialButton(binding.root.context) button.text = accidental.toString() - button.layoutParams = layout + button.layoutParams = UIUtil.cardLayout button.updateToggle(chord.accidentals[position] == accidental, R.color.blue) button.setOnClickListener { if (chord.accidentals[position] == accidental) { @@ -113,16 +112,6 @@ } companion object { - val layout = TableRow.LayoutParams( - TableRow.LayoutParams.WRAP_CONTENT, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - layout.weight = 1.0f - layout.setMargins(5) - } - val descriptions = arrayOf("III", "V", "VII", "IX") } } \ No newline at end of file diff --git a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt index 0c33019..4b668c4 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt @@ -27,6 +27,7 @@ import com.lukas.music.databinding.FragmentPlayBinding import com.lukas.music.instruments.Rhythm import com.lukas.music.song.Song +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup class PlayFragment : Fragment() { @@ -125,12 +126,12 @@ chordDisplays.clear() for (chord in Song.currentSong.chordProgression.currentItem ?: return) { val card = CardView(binding.root.context) - card.layoutParams = SongFragment.tableRowLayout + card.layoutParams = UIUtil.cardLayout card.radius = 10f card.preventCornerOverlap = false val text = TextView(binding.root.context) text.text = chord.toString(true, Song.currentSong.root) - text.layoutParams = SongFragment.tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER card.addView(text) diff --git a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt index 62d314f..afe6137 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt @@ -16,13 +16,13 @@ import android.view.ViewGroup import android.widget.* import androidx.cardview.widget.CardView -import androidx.core.view.setMargins import androidx.fragment.app.Fragment import com.lukas.music.databinding.FragmentSongBinding import com.lukas.music.song.Song import com.lukas.music.song.chords.Phrase import com.lukas.music.song.note.Note import com.lukas.music.song.note.NoteName +import com.lukas.music.util.UIUtil class SongFragment(val playFragment: PlayFragment) : Fragment(), @@ -63,14 +63,14 @@ for (chord in phrase) { val card = CardView(binding.root.context) card.radius = 10f - card.layoutParams = tableRowLayout + card.layoutParams = UIUtil.cardLayout card.setOnClickListener { EditChordFragment(chord, this).showNow(childFragmentManager, "") } val text = TextView(binding.root.context) text.text = chord.toString(displayChordNames, Song.currentSong.root) text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text.layoutParams = tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f card.addView(text) row.addView(card) @@ -81,28 +81,13 @@ updateChords() } button.setImageResource(android.R.drawable.ic_delete) - button.layoutParams = buttonLayout + button.layoutParams = UIUtil.buttonLayout row.addView(button) binding.chords.addView(row) } playFragment.updateChords() } - companion object { - val tableRowLayout = TableRow.LayoutParams( - TableRow.LayoutParams.MATCH_PARENT, - TableRow.LayoutParams.MATCH_PARENT - ) - val buttonLayout = TableRow.LayoutParams( - 0, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - tableRowLayout.setMargins(10) - } - } - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { Song.currentSong.root = Note.of(NoteName.VALUES[position], 4) if (displayChordNames) { diff --git a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt index 86d18ca..ea02f1e 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt @@ -17,8 +17,6 @@ import android.widget.TableRow import android.widget.TextView import androidx.core.view.children -import androidx.core.view.setMargins -import androidx.fragment.app.DialogFragment import com.google.android.material.button.MaterialButton import com.lukas.music.R import com.lukas.music.databinding.FragmentEditChordBinding @@ -27,12 +25,13 @@ import com.lukas.music.song.chords.Accidental import com.lukas.music.song.chords.Chord import com.lukas.music.song.chords.Interval +import com.lukas.music.util.EasyDialogFragment +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup import com.lukas.music.util.updateToggle class EditChordFragment(private val chord: Chord, private val songFragment: SongFragment) : - DialogFragment() { - lateinit var binding: FragmentEditChordBinding + EasyDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,7 +69,7 @@ for (description in descriptions) { val text = TextView(binding.root.context) text.text = description - text.layoutParams = layout + text.layoutParams = UIUtil.cardLayout text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER row.addView(text) } @@ -80,7 +79,7 @@ for (position in 0 until Chord.NOTE_COUNT - 1) { val button = MaterialButton(binding.root.context) button.text = accidental.toString() - button.layoutParams = layout + button.layoutParams = UIUtil.cardLayout button.updateToggle(chord.accidentals[position] == accidental, R.color.blue) button.setOnClickListener { if (chord.accidentals[position] == accidental) { @@ -113,16 +112,6 @@ } companion object { - val layout = TableRow.LayoutParams( - TableRow.LayoutParams.WRAP_CONTENT, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - layout.weight = 1.0f - layout.setMargins(5) - } - val descriptions = arrayOf("III", "V", "VII", "IX") } } \ No newline at end of file diff --git a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt index 0c33019..4b668c4 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt @@ -27,6 +27,7 @@ import com.lukas.music.databinding.FragmentPlayBinding import com.lukas.music.instruments.Rhythm import com.lukas.music.song.Song +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup class PlayFragment : Fragment() { @@ -125,12 +126,12 @@ chordDisplays.clear() for (chord in Song.currentSong.chordProgression.currentItem ?: return) { val card = CardView(binding.root.context) - card.layoutParams = SongFragment.tableRowLayout + card.layoutParams = UIUtil.cardLayout card.radius = 10f card.preventCornerOverlap = false val text = TextView(binding.root.context) text.text = chord.toString(true, Song.currentSong.root) - text.layoutParams = SongFragment.tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER card.addView(text) diff --git a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt index 62d314f..afe6137 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt @@ -16,13 +16,13 @@ import android.view.ViewGroup import android.widget.* import androidx.cardview.widget.CardView -import androidx.core.view.setMargins import androidx.fragment.app.Fragment import com.lukas.music.databinding.FragmentSongBinding import com.lukas.music.song.Song import com.lukas.music.song.chords.Phrase import com.lukas.music.song.note.Note import com.lukas.music.song.note.NoteName +import com.lukas.music.util.UIUtil class SongFragment(val playFragment: PlayFragment) : Fragment(), @@ -63,14 +63,14 @@ for (chord in phrase) { val card = CardView(binding.root.context) card.radius = 10f - card.layoutParams = tableRowLayout + card.layoutParams = UIUtil.cardLayout card.setOnClickListener { EditChordFragment(chord, this).showNow(childFragmentManager, "") } val text = TextView(binding.root.context) text.text = chord.toString(displayChordNames, Song.currentSong.root) text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text.layoutParams = tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f card.addView(text) row.addView(card) @@ -81,28 +81,13 @@ updateChords() } button.setImageResource(android.R.drawable.ic_delete) - button.layoutParams = buttonLayout + button.layoutParams = UIUtil.buttonLayout row.addView(button) binding.chords.addView(row) } playFragment.updateChords() } - companion object { - val tableRowLayout = TableRow.LayoutParams( - TableRow.LayoutParams.MATCH_PARENT, - TableRow.LayoutParams.MATCH_PARENT - ) - val buttonLayout = TableRow.LayoutParams( - 0, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - tableRowLayout.setMargins(10) - } - } - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { Song.currentSong.root = Note.of(NoteName.VALUES[position], 4) if (displayChordNames) { diff --git a/app/src/main/java/com/lukas/music/util/UIUtil.kt b/app/src/main/java/com/lukas/music/util/UIUtil.kt index ea91abf..cd3ba77 100644 --- a/app/src/main/java/com/lukas/music/util/UIUtil.kt +++ b/app/src/main/java/com/lukas/music/util/UIUtil.kt @@ -13,6 +13,7 @@ import android.view.View import android.widget.* import androidx.core.content.ContextCompat +import androidx.core.view.setMargins import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import com.lukas.music.R @@ -168,4 +169,23 @@ override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {} } -} \ No newline at end of file +} + +object UIUtil { + val cardLayout = TableRow.LayoutParams( + 0, + TableRow.LayoutParams.WRAP_CONTENT, + 1f + ) + val buttonLayout = TableRow.LayoutParams( + 0, TableRow.LayoutParams.MATCH_PARENT, 0.5f + ) + val fillingLayout = TableRow.LayoutParams( + TableRow.LayoutParams.MATCH_PARENT, + TableRow.LayoutParams.MATCH_PARENT + ) + + init { + cardLayout.setMargins(5) + } +} diff --git a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt index 86d18ca..ea02f1e 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/EditChordFragment.kt @@ -17,8 +17,6 @@ import android.widget.TableRow import android.widget.TextView import androidx.core.view.children -import androidx.core.view.setMargins -import androidx.fragment.app.DialogFragment import com.google.android.material.button.MaterialButton import com.lukas.music.R import com.lukas.music.databinding.FragmentEditChordBinding @@ -27,12 +25,13 @@ import com.lukas.music.song.chords.Accidental import com.lukas.music.song.chords.Chord import com.lukas.music.song.chords.Interval +import com.lukas.music.util.EasyDialogFragment +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup import com.lukas.music.util.updateToggle class EditChordFragment(private val chord: Chord, private val songFragment: SongFragment) : - DialogFragment() { - lateinit var binding: FragmentEditChordBinding + EasyDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,7 +69,7 @@ for (description in descriptions) { val text = TextView(binding.root.context) text.text = description - text.layoutParams = layout + text.layoutParams = UIUtil.cardLayout text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER row.addView(text) } @@ -80,7 +79,7 @@ for (position in 0 until Chord.NOTE_COUNT - 1) { val button = MaterialButton(binding.root.context) button.text = accidental.toString() - button.layoutParams = layout + button.layoutParams = UIUtil.cardLayout button.updateToggle(chord.accidentals[position] == accidental, R.color.blue) button.setOnClickListener { if (chord.accidentals[position] == accidental) { @@ -113,16 +112,6 @@ } companion object { - val layout = TableRow.LayoutParams( - TableRow.LayoutParams.WRAP_CONTENT, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - layout.weight = 1.0f - layout.setMargins(5) - } - val descriptions = arrayOf("III", "V", "VII", "IX") } } \ No newline at end of file diff --git a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt index 0c33019..4b668c4 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/PlayFragment.kt @@ -27,6 +27,7 @@ import com.lukas.music.databinding.FragmentPlayBinding import com.lukas.music.instruments.Rhythm import com.lukas.music.song.Song +import com.lukas.music.util.UIUtil import com.lukas.music.util.setup class PlayFragment : Fragment() { @@ -125,12 +126,12 @@ chordDisplays.clear() for (chord in Song.currentSong.chordProgression.currentItem ?: return) { val card = CardView(binding.root.context) - card.layoutParams = SongFragment.tableRowLayout + card.layoutParams = UIUtil.cardLayout card.radius = 10f card.preventCornerOverlap = false val text = TextView(binding.root.context) text.text = chord.toString(true, Song.currentSong.root) - text.layoutParams = SongFragment.tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER card.addView(text) diff --git a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt index 62d314f..afe6137 100644 --- a/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt +++ b/app/src/main/java/com/lukas/music/ui/fragments/SongFragment.kt @@ -16,13 +16,13 @@ import android.view.ViewGroup import android.widget.* import androidx.cardview.widget.CardView -import androidx.core.view.setMargins import androidx.fragment.app.Fragment import com.lukas.music.databinding.FragmentSongBinding import com.lukas.music.song.Song import com.lukas.music.song.chords.Phrase import com.lukas.music.song.note.Note import com.lukas.music.song.note.NoteName +import com.lukas.music.util.UIUtil class SongFragment(val playFragment: PlayFragment) : Fragment(), @@ -63,14 +63,14 @@ for (chord in phrase) { val card = CardView(binding.root.context) card.radius = 10f - card.layoutParams = tableRowLayout + card.layoutParams = UIUtil.cardLayout card.setOnClickListener { EditChordFragment(chord, this).showNow(childFragmentManager, "") } val text = TextView(binding.root.context) text.text = chord.toString(displayChordNames, Song.currentSong.root) text.textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text.layoutParams = tableRowLayout + text.layoutParams = UIUtil.fillingLayout text.textSize = 20f card.addView(text) row.addView(card) @@ -81,28 +81,13 @@ updateChords() } button.setImageResource(android.R.drawable.ic_delete) - button.layoutParams = buttonLayout + button.layoutParams = UIUtil.buttonLayout row.addView(button) binding.chords.addView(row) } playFragment.updateChords() } - companion object { - val tableRowLayout = TableRow.LayoutParams( - TableRow.LayoutParams.MATCH_PARENT, - TableRow.LayoutParams.MATCH_PARENT - ) - val buttonLayout = TableRow.LayoutParams( - 0, - TableRow.LayoutParams.WRAP_CONTENT - ) - - init { - tableRowLayout.setMargins(10) - } - } - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { Song.currentSong.root = Note.of(NoteName.VALUES[position], 4) if (displayChordNames) { diff --git a/app/src/main/java/com/lukas/music/util/UIUtil.kt b/app/src/main/java/com/lukas/music/util/UIUtil.kt index ea91abf..cd3ba77 100644 --- a/app/src/main/java/com/lukas/music/util/UIUtil.kt +++ b/app/src/main/java/com/lukas/music/util/UIUtil.kt @@ -13,6 +13,7 @@ import android.view.View import android.widget.* import androidx.core.content.ContextCompat +import androidx.core.view.setMargins import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import com.lukas.music.R @@ -168,4 +169,23 @@ override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {} } -} \ No newline at end of file +} + +object UIUtil { + val cardLayout = TableRow.LayoutParams( + 0, + TableRow.LayoutParams.WRAP_CONTENT, + 1f + ) + val buttonLayout = TableRow.LayoutParams( + 0, TableRow.LayoutParams.MATCH_PARENT, 0.5f + ) + val fillingLayout = TableRow.LayoutParams( + TableRow.LayoutParams.MATCH_PARENT, + TableRow.LayoutParams.MATCH_PARENT + ) + + init { + cardLayout.setMargins(5) + } +} diff --git a/app/src/main/res/layout/fragment_edit_chord.xml b/app/src/main/res/layout/fragment_edit_chord.xml index 245172c..7913046 100644 --- a/app/src/main/res/layout/fragment_edit_chord.xml +++ b/app/src/main/res/layout/fragment_edit_chord.xml @@ -64,7 +64,7 @@