diff --git a/app/app.iml b/app/app.iml
index 744ea53..a3172f2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -17,7 +17,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -78,13 +78,6 @@
-
-
-
-
-
-
-
@@ -92,6 +85,13 @@
+
+
+
+
+
+
+
@@ -99,13 +99,6 @@
-
-
-
-
-
-
-
@@ -113,6 +106,13 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/example/mear/activities/MainActivity.kt b/app/src/main/java/com/example/mear/activities/MainActivity.kt
index e1ed18f..1ad2dc4 100644
--- a/app/src/main/java/com/example/mear/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/MainActivity.kt
@@ -6,8 +6,12 @@ import android.content.pm.PackageManager
import android.graphics.Color
import android.os.Bundle
import android.os.Handler
+import android.R as RDroid
import android.support.v4.app.ActivityCompat
import android.support.v4.content.ContextCompat
+import android.view.MenuItem
+import android.view.View
+import android.widget.PopupMenu
import java.lang.Exception
import java.lang.Runnable
@@ -64,15 +68,6 @@ class MainActivity : BaseServiceActivity() {
override fun onResume() {
super.onResume()
- try {
- if (musicService!! != null) {
- val tr = musicService!!.getCurrentTrack().title
- val artist = musicService!!.getCurrentTrack().artist
- }
- }
- catch (ex: Exception) {
- val exMsg = ex.message
- }
}
override fun onDestroy() {
@@ -128,12 +123,14 @@ class MainActivity : BaseServiceActivity() {
RepeatTrack.setOnClickListener {
toggleRepeat()
}
- SongView.setOnClickListener {
- startActivity(Intent(this, SongViewActivity::class.java))
- }
- SettingsLink.setOnClickListener {
- startActivity(Intent(this, SettingsActivity::class.java))
+ val clickListener = View.OnClickListener { view ->
+ when (view.id) {
+ R.id.SettingsLink-> {
+ showPopup(view)
+ }
+ }
}
+ SettingsLink.setOnClickListener (clickListener )
}
private fun initializeServices() {
doBindService()
@@ -305,6 +302,7 @@ class MainActivity : BaseServiceActivity() {
PlayTrack.setColorFilter(Color.GREEN)
}
}
+
private fun permissionPrompt() {
if (ContextCompat.checkSelfPermission(this,
Manifest.permission.READ_EXTERNAL_STORAGE)
@@ -318,24 +316,44 @@ class MainActivity : BaseServiceActivity() {
arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 0)
}
}
- else {
- }
+ }
+ private fun showPopup(view: View) {
+ try {
+ var popup = PopupMenu(this, view)
+ popup.inflate(R.menu.popup_menu)
+
+ popup.setOnMenuItemClickListener{ item: MenuItem? ->
+ when (item!!.itemId) {
+ R.id.action_settings-> {
+ startActivity(Intent(this, SettingsActivity::class.java))
+ }
+ R.id.action_song_view -> {
+ startActivity(Intent(this, SongViewActivity::class.java))
+ }
+ }
+ true
+ }
+
+ popup.show()
+ }
+ catch (ex: Exception) {
+ val exMsg = ex.message
+ }
}
private var musicTrackTimeUpdateTask = object: Runnable {
override fun run() {
try {
val currentPosition = musicService!!.currentPositionOfTrack() / 1000
- val dur = String.format( "%02d:%02d",
- TimeUnit.SECONDS.toMinutes(currentPosition.toLong()),
- (currentPosition % 60) )
+ val dur = String.format( "%02d:%02d", TimeUnit.SECONDS.toMinutes(currentPosition.toLong()),
+ (currentPosition % 60) )
CurrentPosition.text = dur
- val tTitle = musicService!!.getCurrentTrack().title
+ val trackTitle = musicService!!.getCurrentTrack().title
- if (!(TrackTitle.text.equals(musicService!!.getCurrentTrack().title))) {
+ if (!(TrackTitle.text == trackTitle)) {
configureTrackDisplay()
}
diff --git a/app/src/main/res/drawable-hdpi/ic_action_name.png b/app/src/main/res/drawable-hdpi/ic_action_name.png
new file mode 100644
index 0000000..f8ff916
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_name.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_name.png b/app/src/main/res/drawable-mdpi/ic_action_name.png
new file mode 100644
index 0000000..44f72e2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_name.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_name.png b/app/src/main/res/drawable-xhdpi/ic_action_name.png
new file mode 100644
index 0000000..300cc22
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_name.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_name.png b/app/src/main/res/drawable-xxhdpi/ic_action_name.png
new file mode 100644
index 0000000..fd52ea1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_name.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_name.png b/app/src/main/res/drawable-xxxhdpi/ic_action_name.png
new file mode 100644
index 0000000..ba218dc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_name.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7cc41a1..a81d1b7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,36 +12,31 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
+ android:theme="@style/AppTheme.AppBarOverlay"
+ app:layout_anchorGravity="top|right|end">
-
-
+ app:srcCompat="@drawable/ic_action_more_vert" />
diff --git a/app/src/main/res/menu/popup_menu.xml b/app/src/main/res/menu/popup_menu.xml
new file mode 100644
index 0000000..7c3c7ed
--- /dev/null
+++ b/app/src/main/res/menu/popup_menu.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 281b6d5..04fac02 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,7 @@
#FFFFFF
#333399
+
+
+ #FFFFFF
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f04cd5a..51abff3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,6 +29,10 @@
dhdfhfdhdfh
+
+ Settings
+ Songs
+
General
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6..5dfbe14 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,25 @@
- @color/colorPrimary
- @color/colorPrimaryDark
- @color/colorAccent
+
+ - @style/PopupMenu
+ - @style/myPopupMenuTextAppearanceSmall
+ - @style/myPopupMenuTextAppearanceLarge
+
+
+
+
+
+
+
+