Add MetronomeActivity.

Complete notes. Update string no_change_made
aiavci · Oct 18, 2018 · eadca43 · eadca43
1 parent c8b1852
commit eadca43
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 12 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,8 @@
         </activity>
         <activity android:name=".ui.ScaleActivity"
             android:label="Scales and Arpeggios" />
+        <activity android:name=".ui.MetronomeActivity"
+            android:label="Metronome" />
         <activity android:name=".ui.NotesActivity"
             android:label="Notes" />
         <activity android:name=".ui.NoteEditorActivity"

diff --git a/app/src/main/java/info/aiavci/violincompanion/ui/MainAdapter.kt b/app/src/main/java/info/aiavci/violincompanion/ui/MainAdapter.kt
@@ -19,7 +19,7 @@ class MainAdapter(val context: Context): BaseAdapter() {
     private val menuItemsInfos = mutableListOf<Triple<Int, String, Activity>>(
             Triple(R.drawable.music_scale, "Scales and Arpeggios", ScaleActivity()),
             Triple(R.drawable.music_note, "Tuner", ScaleActivity()),
-            Triple(R.drawable.music_symbol, "Metronome", ScaleActivity()),
+            Triple(R.drawable.music_symbol, "Metronome", MetronomeActivity()),
             Triple(R.drawable.note_book, "Notes", NotesActivity())
     )
 

diff --git a/app/src/main/java/info/aiavci/violincompanion/ui/MetronomeActivity.kt b/app/src/main/java/info/aiavci/violincompanion/ui/MetronomeActivity.kt
@@ -0,0 +1,16 @@
+package info.aiavci.violincompanion.ui
+
+import android.os.Bundle
+import info.aiavci.violincompanion.R
+
+/**
+ * Created by ${$FULLNAME}
+ * Version
+ */
+class MetronomeActivity: BaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_metronome)
+    }
+}
diff --git a/app/src/main/java/info/aiavci/violincompanion/ui/NoteEditorActivity.kt b/app/src/main/java/info/aiavci/violincompanion/ui/NoteEditorActivity.kt
@@ -3,7 +3,6 @@ package info.aiavci.violincompanion.ui
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import info.aiavci.violincompanion.R
@@ -35,20 +34,17 @@ class NoteEditorActivity : BaseActivity() {
 
         edit_title.setText(existingNoteTitle ?: "")
         edit_content.setText(existingNoteContent ?: "")
-
-//        saveMenuItem?.apply {
-//            isEnabled = false
-//        }
     }
 
-//    private val isChangeMade: Boolean
-//        get() = edit_title.text.toString() != existingNoteTitle ||
-//                edit_content.text.toString() != existingNoteContent
+    private val isChangeMade: Boolean
+        get() = edit_title.text.toString() != existingNoteTitle ||
+                edit_content.text.toString() != existingNoteContent
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.note_menu, menu)
 
         saveMenuItem = menu?.findItem(R.id.action_save)
+        saveMenuItem?.isEnabled = true
 
         return super.onCreateOptionsMenu(menu)
     }
@@ -70,7 +66,7 @@ class NoteEditorActivity : BaseActivity() {
     private fun performSave() {
         val noteIntent = Intent()
 
-        if (TextUtils.isEmpty(edit_content.text)) {
+        if (!isChangeMade) {
             setResult(Activity.RESULT_CANCELED, noteIntent)
         } else {
             val noteTitle = edit_title.text.toString()

diff --git a/app/src/main/java/info/aiavci/violincompanion/ui/NotesActivity.kt b/app/src/main/java/info/aiavci/violincompanion/ui/NotesActivity.kt
@@ -75,7 +75,7 @@ class NotesActivity: BaseActivity() {
         } else {
             Toast.makeText(
                     applicationContext,
-                    R.string.empty_not_saved,
+                    R.string.no_change_made,
                     Toast.LENGTH_LONG).show()
         }
 

diff --git a/app/src/main/res/layout/activity_metronome.xml b/app/src/main/res/layout/activity_metronome.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <SeekBar
+        android:id="@+id/seekBar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@+id/bpmTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="123"
+        app:layout_constraintBottom_toBottomOf="@id/seekBar"
+        app:layout_constraintStart_toStartOf="@id/seekBar"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <Button
+        android:id="@+id/playButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Play"
+        app:layout_constraintBottom_toBottomOf="@id/seekBar"
+        app:layout_constraintEnd_toEndOf="@id/seekBar"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,5 +3,5 @@
     <string name="hint_note">Note</string>
     <string name="hint_title">Title</string>
     <string name="save">Save</string>
-    <string name="empty_not_saved">Note not saved because it is empty.</string>
+    <string name="no_change_made">Note not saved because no changes were made.</string>
 </resources>