diff --git a/app/build.gradle b/app/build.gradle
index 09cee58..fdb3557 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,5 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.squareup.picasso:picasso:2.71828'
+ implementation 'com.github.XuDeveloper:XPopupWindow:1.0.1'
}
diff --git a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
index f4180e9..328f870 100644
--- a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
@@ -1,8 +1,13 @@
package com.example.mear.activities
+import android.content.Context
import android.os.Bundle
import android.os.Environment
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.Toast
import java.lang.Exception
import kotlinx.android.synthetic.main.activity_settings.*
@@ -12,7 +17,9 @@ import com.example.mear.adapters.SettingsAdapter
import com.example.mear.R
import com.example.mear.management.MusicFiles
import com.example.mear.management.TrackManager
+import com.example.mear.ui.popups.AboutPopup
import com.example.mear.repositories.TrackRepository
+import kotlinx.android.synthetic.main.popup_layout.*
class SettingsActivity : AppCompatActivity() {
@@ -22,6 +29,16 @@ class SettingsActivity : AppCompatActivity() {
setContentView(R.layout.activity_settings)
setSupportActionBar(toolbar)
+ var aListener = AboutListener(aboutApp, this)
+ About.setOnClickListener(aListener)
+
+ /**
+ About.setOnClickListener {
+ val i =0
+ var j = i.plus(500)
+ }
+ */
+
initialize()
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
@@ -55,4 +72,20 @@ class SettingsActivity : AppCompatActivity() {
private fun updateLibrary() {
loadTracks(loadSongPaths())
}
+
+ class AboutListener(var layout: LinearLayout?, val ctx: Context): View.OnClickListener {
+ override fun onClick(v: View?) {
+ val ss = 10
+ var ob = ss.plus(500)
+ try {
+ val popup = AboutPopup(ctx)
+ popup?.showPopupFromScreenCenter(R.layout.activity_settings)
+ }
+ catch (ex: Exception) {
+ val exMsg = ex.message
+ }
+ Toast.makeText(ctx, "About Setting pressed", Toast.LENGTH_LONG).show()
+ }
+
+ }
}
diff --git a/app/src/main/java/com/example/mear/ui/popups/AboutPopup.kt b/app/src/main/java/com/example/mear/ui/popups/AboutPopup.kt
new file mode 100644
index 0000000..fe27331
--- /dev/null
+++ b/app/src/main/java/com/example/mear/ui/popups/AboutPopup.kt
@@ -0,0 +1,38 @@
+package com.example.mear.ui.popups
+
+import android.animation.Animator
+import android.content.Context
+import android.view.View
+import com.example.mear.R
+
+import com.xu.xpopupwindow.XPopupWindow
+
+class AboutPopup(ctx: Context): XPopupWindow(ctx) {
+ override fun exitAnim(view: View): Animator? {
+ return null
+ }
+
+ override fun getLayoutId(): Int {
+ return R.layout.popup_layout
+ }
+
+ override fun getLayoutParentNodeId(): Int {
+ return R.id.parent
+ }
+
+ override fun initData() {
+ }
+
+ override fun initViews() {
+ }
+
+ override fun startAnim(view: View): Animator? {
+ return null
+ }
+
+ override fun animStyle(): Int {
+ return -1
+ }
+
+}
+
diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml
index 7ac119b..1c5e3c7 100644
--- a/app/src/main/res/layout/content_settings.xml
+++ b/app/src/main/res/layout/content_settings.xml
@@ -14,9 +14,11 @@
android:layout_width="12dp"
android:layout_height="55dp"
android:layout_marginStart="120dp"
+ android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
+ android:layout_height="464dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/space3">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- -->
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_layout.xml b/app/src/main/res/layout/popup_layout.xml
new file mode 100644
index 0000000..d164ea4
--- /dev/null
+++ b/app/src/main/res/layout/popup_layout.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 3e4c169..961edaf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,4 +17,11 @@
@color/color_background
#FFFFFF
#FFFFFF
+
+
+ #FFFFFF
+
+
+ #323232
+ #FFFFFF
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cf815c..a9c9628 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,9 @@
Mear
+ Pre-development release
+ amazing-username - Kun Deng
+ Zularizal
+
Open navigation drawer
Close navigation drawer
Android Studio
@@ -24,15 +28,18 @@
Update Music Library
- Clear your music databas
- e and search for musiczf
- dhdfhfdhdfh
-
+ Clear your music databas e and search for music
+ About
+ Information about the software
Settings
Songs
+
+ About
+ Contributors
+
Search for songs or artists