caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DanaHistoryActivity: toolbar

Browse source
This commit is contained in:
Milos Kozak 2023-08-19 10:48:06 +02:00
parent 510e640673
commit e3ff4f33d6
3 changed files with 24 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pump/dana/src/main/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
<activity
android:name="info.nightscout.pump.dana.activities.DanaHistoryActivity"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
android:theme="@style/AppTheme" />
<activity
android:name="info.nightscout.pump.dana.activities.DanaUserOptionsActivity"
android:exported="false"

22
pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt
View file

@ -2,10 +2,14 @@ package info.nightscout.pump.dana.activities
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
import android.widget.ArrayAdapter
import androidx.core.view.MenuProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
@ -87,6 +91,10 @@ class DanaHistoryActivity : TranslatedDaggerAppCompatActivity() {
binding = DanarHistoryActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
title = rh.gs(info.nightscout.core.ui.R.string.pump_history)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
binding.recyclerview.setHasFixedSize(true)
binding.recyclerview.layoutManager = LinearLayoutManager(this)
binding.status.visibility = View.GONE
@ -133,6 +141,20 @@ class DanaHistoryActivity : TranslatedDaggerAppCompatActivity() {
showingType = selected.type
swapAdapter(selected.type)
}
// Add menu items without overriding methods in the Activity
addMenuProvider(object : MenuProvider {
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
when (menuItem.itemId) {
android.R.id.home -> {
onBackPressedDispatcher.onBackPressed()
true
}
else -> false
}
})
}
inner class RecyclerViewAdapter internal constructor(private var historyList: List<DanaHistoryRecord>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {

44
pump/dana/src/main/res/layout/danar_history_activity.xml
View file

@ -8,47 +8,6 @@
android:layout_height="fill_parent"
tools:context="info.nightscout.pump.dana.activities.DanaHistoryActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="?attr/activity_title_backgroundColor"
android:orientation="horizontal"
android:padding="5dp"
app:layout_constraintBottom_toTopOf="@+id/typeListLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_pump_history" />
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/pump_history"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/typeListLayout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@ -59,8 +18,7 @@
android:hint="@string/event_type"
app:layout_constraintBottom_toTopOf="@+id/status"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/header">
app:layout_constraintStart_toStartOf="parent">
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/typeList"