fix: use onClick

Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
ZNotify · Sep 7, 2021 · 01ed100 · 01ed100
1 parent 9960505
commit 01ed100
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 12 deletions.
diff --git a/app/src/main/java/top/learningman/mipush/MessagesActivity.kt b/app/src/main/java/top/learningman/mipush/MessagesActivity.kt
@@ -2,6 +2,7 @@ package top.learningman.mipush
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_messages.*

diff --git a/app/src/main/java/top/learningman/mipush/utils/MessageAdapter.kt b/app/src/main/java/top/learningman/mipush/utils/MessageAdapter.kt
@@ -1,9 +1,14 @@
 package top.learningman.mipush.utils
 
+import android.app.AlertDialog
+import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -13,22 +18,42 @@ import top.learningman.mipush.R
 class MessageAdapter : ListAdapter<Message, MessageAdapter.MessageHolder>(WordsComparator()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessageHolder {
+
         return MessageHolder.create(parent)
     }
 
     override fun onBindViewHolder(holder: MessageHolder, position: Int) {
         val current = getItem(position)
         holder.bind(current)
-        holder.bind(current)
+
     }
 
     class MessageHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         private val messageItemTitleView: TextView = itemView.findViewById(R.id.row_item_title)
         private val messageItemContentView: TextView = itemView.findViewById(R.id.row_item_content)
+        private val messageItemTimeView: TextView = itemView.findViewById(R.id.row_item_time)
+        private val messageItem: ConstraintLayout = itemView.findViewById(R.id.row_item)
+
 
         fun bind(msg: Message?) {
             messageItemTitleView.text = msg?.title
             messageItemContentView.text = msg?.content
+
+            val relativeTime = msg?.time?.let { DateUtils.getRelativeTimeSpanString(it) }
+            messageItemTimeView.text = relativeTime
+
+//            val dialogView = LayoutInflater.from(itemView.context).inflate(R.layout.message_dialog,null,false)
+
+            messageItem.setOnClickListener {
+                Toast.makeText(
+                    it.context,
+                    "Clicked Item at ${this.adapterPosition}",
+                    Toast.LENGTH_SHORT
+                ).show()
+                AlertDialog.Builder((itemView.context))
+                    .setTitle(msg?.title)
+                    .create()
+            }
         }
 
         companion object {

diff --git a/app/src/main/res/layout/message_dialog.xml b/app/src/main/res/layout/message_dialog.xml
@@ -0,0 +1,15 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_layout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/dialog_content"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/dialog_long"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/text_row_item.xml b/app/src/main/res/layout/text_row_item.xml
@@ -1,18 +1,41 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/row_item"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/list_item_height"
-    android:layout_margin="@dimen/margin_medium"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/margin_medium">
 
     <TextView
         android:id="@+id/row_item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/msg_title" />
+        android:text="@string/loading"
+        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp"
+        android:theme="@style/msg_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/row_item_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/msg_content" />
-</LinearLayout>
+        android:layout_marginTop="5dp"
+        android:text="@string/loading"
+        android:textSize="14sp"
+        android:theme="@style/msg_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/row_item_title" />
+
+    <TextView
+        android:id="@+id/row_item_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:text="@string/loading"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -26,14 +26,10 @@
     <style name="msg_title">
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:paddingLeft">8dp</item>
-
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Title</item>
     </style>
 
     <style name="msg_content">
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:paddingLeft">8dp</item>
-
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Menu</item>
     </style>
 </resources>