Make pretty "no notifications"
This commit is contained in:
parent
cc853022dd
commit
60b9375f89
5 changed files with 22 additions and 28 deletions
|
@ -10,9 +10,7 @@ import android.view.View
|
|||
import android.widget.Toast
|
||||
import androidx.activity.viewModels
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.android.volley.Request
|
||||
import com.android.volley.toolbox.StringRequest
|
||||
import com.android.volley.toolbox.Volley
|
||||
import io.heckel.ntfy.R
|
||||
|
@ -20,10 +18,6 @@ import io.heckel.ntfy.app.Application
|
|||
import io.heckel.ntfy.data.Notification
|
||||
import io.heckel.ntfy.data.topicShortUrl
|
||||
import io.heckel.ntfy.data.topicUrl
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import java.io.OutputStreamWriter
|
||||
import java.net.HttpURLConnection
|
||||
import java.util.*
|
||||
|
||||
|
||||
|
@ -50,7 +44,7 @@ class DetailActivity : AppCompatActivity() {
|
|||
title = topicShortUrl(subscriptionBaseUrl, subscriptionTopic)
|
||||
|
||||
// Update main list based on viewModel (& its datasource/livedata)
|
||||
val noEntriesText: View = findViewById(R.id.detail_no_notifications_text)
|
||||
val noEntriesText: View = findViewById(R.id.detail_no_notifications)
|
||||
val adapter = DetailAdapter { notification -> onNotificationClick(notification) }
|
||||
val mainList: RecyclerView = findViewById(R.id.detail_notification_list)
|
||||
mainList.adapter = adapter
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L5.17,16L4,17.17L4,4h16v12zM7,9h2v2L7,11zM15,9h2v2h-2zM11,9h2v2h-2z"/>
|
||||
</vector>
|
|
@ -17,14 +17,25 @@
|
|||
android:background="?android:attr/selectableItemBackground"
|
||||
app:layoutManager="LinearLayoutManager" android:visibility="gone"/>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/detail_no_notifications" app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent">
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" app:srcCompat="@drawable/ic_sms_gray_48dp"
|
||||
android:id="@+id/detail_no_notifications_image"/>
|
||||
<TextView
|
||||
android:id="@+id/detail_no_notifications_text"
|
||||
android:text="@string/detail_no_subscriptions_text"
|
||||
android:text="@string/detail_no_notifications_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:padding="50dp" app:layout_constraintBottom_toBottomOf="parent" android:gravity="center_horizontal"
|
||||
android:textStyle="italic"/>
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:padding="10dp" android:gravity="center_horizontal"
|
||||
android:paddingStart="50dp" android:paddingEnd="50dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
<string name="add_dialog_button_subscribe">Subscribe</string>
|
||||
|
||||
<!-- Detail activity -->
|
||||
<string name="detail_no_subscriptions_text">You haven\'t received any notifications for this topic yet.</string>
|
||||
<string name="detail_no_notifications_text">You haven\'t received any notifications for this topic yet.</string>
|
||||
<string name="detail_delete_dialog_message">Do you really want to permanently delete this subscription and all its messages?</string>
|
||||
<string name="detail_delete_dialog_permanently_delete">Permanently delete</string>
|
||||
<string name="detail_delete_dialog_cancel">Cancel</string>
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M20 2H4c-1.1 0-2 .9-2 2v18l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 14H5.17L4 17.17V4h16v12zM7 9h2v2H7zm8 0h2v2h-2zm-4 0h2v2h-2z"/></svg>
|
Before Width: | Height: | Size: 288 B |
Loading…
Reference in a new issue