mathieu/Generator-Attestation-Covid-19
1
0
Fork 0
Code Issues 3 Pull Requests Releases 15 Activity

Adding QrCode Activity and Fragment and a lot

Browse Source
This commit is contained in:
Mathieu Sanchez 2020-04-16 17:47:19 +02:00
parent 54d2a100d0
commit 71cb112bbe
18 changed files with 242 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -12,6 +12,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme.Light">
<activity android:name=".QrCodeActivity"></activity>
<activity android:name=".QrCodeViewerActivity" />
<activity android:name=".PdfViewerActivity" />
<activity
android:name=".MainActivity"

1
app/src/main/java/fr/sanchezm/attestationsCovid19/PdfViewerActivity.kt
View File

@ -1,6 +1,7 @@
package fr.sanchezm.attestationsCovid19
import android.os.Bundle
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import com.github.barteksc.pdfviewer.PDFView
import fr.sanchezm.attestationsCovid19.utilities.InjectorUtils

21
app/src/main/java/fr/sanchezm/attestationsCovid19/QrCodeActivity.kt Normal file
View File

@ -0,0 +1,21 @@
package fr.sanchezm.attestationsCovid19
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import fr.sanchezm.attestationsCovid19.ui.qrcode.QrCodeFragment
class QrCodeActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.qr_code_activity)
if (savedInstanceState == null) {
val fragment = QrCodeFragment.newInstance()
fragment.arguments = intent.extras
supportFragmentManager.beginTransaction()
.replace(R.id.container, fragment)
.commitNow()
}
}
}

16
app/src/main/java/fr/sanchezm/attestationsCovid19/data/db/dao/AttestationDao.kt
View File

@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
import fr.sanchezm.attestationsCovid19.utilities.PdfUtils
import java.io.File
class AttestationDao(private val path: String) {
@ -24,6 +25,14 @@ class AttestationDao(private val path: String) {
save()
}
fun getAttestation(createAt: Long): Attestation? {
_attestations.value?.forEach {
if (it.createAt == createAt)
return@getAttestation it
}
return null
}
init {
load()
}
@ -34,6 +43,13 @@ class AttestationDao(private val path: String) {
if (file.exists()) {
_attestations.value = Gson().fromJson(file.readText(Charsets.UTF_8), type)
}
_attestations.value?.forEach {
val filePath = PdfUtils.getInstance()?.getPath(it.createAt)
if (filePath != null && !File(filePath).exists()) {
_attestations.value!!.remove(it)
}
}
}
private fun save() {

2
app/src/main/java/fr/sanchezm/attestationsCovid19/data/repository/AttestationRepository.kt
View File

@ -13,6 +13,8 @@ class AttestationRepository private constructor(private val attestationDao: Atte
fun getAttestation(id: Int) = attestationDao.getAttestation(id)
fun getAttestation(createAt: Long) = attestationDao.getAttestation(createAt)
fun addAttestation(attestation: Attestation) = attestationDao.addAttestation(attestation)
companion object {

7
app/src/main/java/fr/sanchezm/attestationsCovid19/interfaces/ItemClickListener.kt Normal file
View File

@ -0,0 +1,7 @@
package fr.sanchezm.attestationsCovid19.interfaces
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
interface ItemClickListener {
fun onItemClick(item: Attestation)
}

19
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddFragment.kt
View File

@ -1,5 +1,6 @@
package fr.sanchezm.attestationsCovid19.ui.add
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -9,6 +10,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import com.google.android.material.snackbar.Snackbar
import fr.sanchezm.attestationsCovid19.QrCodeActivity
import fr.sanchezm.attestationsCovid19.R
import fr.sanchezm.attestationsCovid19.databinding.FragmentAddAttestationBinding
import fr.sanchezm.attestationsCovid19.utilities.InjectorUtils
@ -33,20 +35,31 @@ class AddFragment : Fragment() {
this.viewModel = addViewModel
}
bindMessage(binding.constraintContext)
return binding.root
}
private fun bindMessage(context: View) {
private fun bindMessage(ctx: View) {
addViewModel.errorMessage.observe(viewLifecycleOwner, Observer {
it.getContentIfNotHandled()?.let { stringId ->
Snackbar.make(context, stringId, Snackbar.LENGTH_SHORT ).show()
Snackbar.make(ctx, stringId, Snackbar.LENGTH_SHORT).show()
}
})
addViewModel.dataMessage.observe(viewLifecycleOwner, Observer {
it.getContentIfNotHandled()?.let { stringId ->
Snackbar.make(context, stringId, Snackbar.LENGTH_SHORT).show()
Snackbar.make(ctx, stringId, Snackbar.LENGTH_SHORT).show()
}
})
addViewModel.startActivity.observe(viewLifecycleOwner, Observer {
it.getContentIfNotHandled()?.let {
val intent = Intent(context, QrCodeActivity::class.java).apply {
putExtra("createAt", it)
putExtra("toCreate", true)
}
startActivity(intent)
}
})
}

15
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt
View File

@ -24,6 +24,7 @@ class AddViewModel(
private val _errorMessage = MutableLiveData<Event<Int>>()
private val _dataMessage = MutableLiveData<Event<Int>>()
private val _startActivity = MutableLiveData<Event<Long>>()
val errorMessage: LiveData<Event<Int>>
get() = _errorMessage
@ -31,6 +32,10 @@ class AddViewModel(
val dataMessage: LiveData<Event<Int>>
get() = _dataMessage
val startActivity: LiveData<Event<Long>>
get() = _startActivity
// region ViewField
val firstName = MutableLiveData<String>()
val lastName = MutableLiveData<String>()
val birthday = MutableLiveData<String>()
@ -48,6 +53,7 @@ class AddViewModel(
val reason5 = MutableLiveData(false)
val reason6 = MutableLiveData(false)
val reason7 = MutableLiveData(false)
// endregion
private val datePattern = "dd/MM/yyyy"
private val timePattern = "HH'h'mm"
@ -56,10 +62,13 @@ class AddViewModel(
fun onGenerateAttestationClick() {
if (checkAllValue()) {
val attestation = getAttestation()
profileRepository.insertProfile(getProfileFromView())
attestationRepository.generateAttestation(attestation)
attestationRepository.addAttestation(attestation)
_dataMessage.value = Event(R.string.attestation_generated)
_startActivity.value = Event(attestation.createAt)
// attestationRepository.generateAttestation(attestation)
// _dataMessage.value = Event(R.string.attestation_generated)
} else {
_errorMessage.value = Event(R.string.error_cannot_create_attestation)
Log.e("onGenerateAttestationClick", "Cannot generate Attestation")
@ -113,7 +122,7 @@ class AddViewModel(
getProfileFromView(),
exitDate.value.toString(),
exitHour.value.toString(),
0,
Date().time,
getReasons()
)
}

20
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/attestations/AttestationsAdapter.kt
View File

@ -6,17 +6,22 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import fr.sanchezm.attestationsCovid19.R
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
import fr.sanchezm.attestationsCovid19.interfaces.ItemClickListener
import kotlinx.android.synthetic.main.attestation_item.view.*
class AttestationsAdapter(private val items: ArrayList<Attestation>) :
RecyclerView.Adapter<AttestationsAdapter.ViewHolder>() {
class AttestationsAdapter(
private val items: ArrayList<Attestation>,
private val itemClickListener: ItemClickListener
) : RecyclerView.Adapter<AttestationsAdapter.ViewHolder>() {
override fun getItemCount(): Int {
return items.size
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.attestation_item, parent, false))
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(
LayoutInflater.from(parent.context).inflate(R.layout.attestation_item, parent, false),
itemClickListener
)
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.bind(items[(items.size - 1) - position])
@ -28,7 +33,8 @@ class AttestationsAdapter(private val items: ArrayList<Attestation>) :
notifyDataSetChanged()
}
class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
class ViewHolder(private var view: View, private val itemClickListener: ItemClickListener) :
RecyclerView.ViewHolder(view) {
private val peopleItem = view.people_item_data
private val dateItem = view.date_item_data
@ -38,8 +44,10 @@ class AttestationsAdapter(private val items: ArrayList<Attestation>) :
peopleItem.text = getName(attestation)
dateItem.text = attestation.getCreatedAtFormatedDate()
reasonItem.text = attestation.getMotifsText()
view.setOnClickListener { itemClickListener.onItemClick(attestation) }
}
private fun getName(attestation: Attestation) = "${attestation.profile.firstName} ${attestation.profile.lastName}"
private fun getName(attestation: Attestation) =
"${attestation.profile.firstName} ${attestation.profile.lastName}"
}
}

12
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/attestations/AttestationsFragment.kt
View File

@ -12,14 +12,24 @@ import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import fr.sanchezm.attestationsCovid19.PdfViewerActivity
import fr.sanchezm.attestationsCovid19.R
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
import fr.sanchezm.attestationsCovid19.databinding.FragmentAttestationsBinding
import fr.sanchezm.attestationsCovid19.interfaces.ItemClickListener
import fr.sanchezm.attestationsCovid19.utilities.InjectorUtils
import kotlinx.android.synthetic.main.fragment_attestations.view.*
class AttestationsFragment : Fragment() {
private lateinit var attestationsViewModel: AttestationsViewModel
private val attestationsAdapter = AttestationsAdapter(arrayListOf())
private val attestationsAdapter = AttestationsAdapter(arrayListOf(),
object : ItemClickListener {
override fun onItemClick(item: Attestation) {
val intent = Intent(context, PdfViewerActivity::class.java).apply {
putExtra("createAt", item.createAt)
}
startActivity(intent)
}
})
override fun onCreateView(
inflater: LayoutInflater,

8
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/attestations/AttestationsViewModel.kt
View File

@ -7,11 +7,9 @@ import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
import fr.sanchezm.attestationsCovid19.utilities.Event
class AttestationsViewModel(private val attestationRepository: AttestationRepository) : ViewModel() {
class AttestationsViewModel(attestationRepository: AttestationRepository) : ViewModel() {
private var attestationCreateAt: Long
private val _startActivity = MutableLiveData<Event<Long>>()
private val _attestationName = MutableLiveData<String>()
private var _attestations = attestationRepository.getAttestations() as MutableLiveData<ArrayList<Attestation>>
@ -22,8 +20,6 @@ class AttestationsViewModel(private val attestationRepository: AttestationReposi
_startActivity
init {
val attestation = attestationRepository.getAttestations().value?.last()
attestationCreateAt = attestation?.createAt!!
_attestationName.value = "${attestation.profile.firstName} ${attestation.profile.lastName}"
_attestations = attestationRepository.getAttestations() as MutableLiveData<ArrayList<Attestation>>
}
}

57
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/qrcode/QrCodeFragment.kt Normal file
View File

@ -0,0 +1,57 @@
package fr.sanchezm.attestationsCovid19.ui.qrcode
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.databinding.DataBindingUtil
import androidx.lifecycle.ViewModelProvider
import fr.sanchezm.attestationsCovid19.R
import fr.sanchezm.attestationsCovid19.databinding.QrCodeFragmentBinding
import fr.sanchezm.attestationsCovid19.utilities.InjectorUtils
class QrCodeFragment : Fragment() {
companion object {
fun newInstance() = QrCodeFragment()
}
private lateinit var qrCodeViewModel: QrCodeViewModel
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
arguments?.getBoolean("toCreate", false)?.let {
arguments?.getLong("createAt", 0)?.let { it1 ->
initializeUi(
it1,
it
)
}
}
val binding = DataBindingUtil.inflate<QrCodeFragmentBinding>(
inflater,
R.layout.qr_code_fragment,
container,
false
).apply {
this.lifecycleOwner = this@QrCodeFragment
this.viewModel = qrCodeViewModel
}
return binding.root
}
private fun initializeUi(createAt: Long, toCreate: Boolean) {
val factory = context?.let { InjectorUtils.provideQrCodeViewModel(it) }
qrCodeViewModel = factory?.let {
ViewModelProvider(this, it)
.get(QrCodeViewModel::class.java)
}!!
qrCodeViewModel.addData(createAt, toCreate)
}
}

24
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/qrcode/QrCodeViewModel.kt Normal file
View File

@ -0,0 +1,24 @@
package fr.sanchezm.attestationsCovid19.ui.qrcode
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import fr.sanchezm.attestationsCovid19.data.db.entity.Attestation
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
class QrCodeViewModel(private val attestationRepository: AttestationRepository) : ViewModel() {
private val _attestation = MutableLiveData<Attestation>()
private var toCreate: Boolean = false
fun addData(createAt: Long, toCreate: Boolean) {
this.toCreate = toCreate
_attestation.value = attestationRepository.getAttestation(createAt)
if (toCreate) {
createPdf()
}
}
fun createPdf() {
}
}

14
app/src/main/java/fr/sanchezm/attestationsCovid19/ui/qrcode/QrCodeViewModelFactory.kt Normal file
View File

@ -0,0 +1,14 @@
package fr.sanchezm.attestationsCovid19.ui.qrcode
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
class QrCodeViewModelFactory(private val attestationRepository: AttestationRepository) :
ViewModelProvider.NewInstanceFactory() {
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return QrCodeViewModel(attestationRepository) as T
}
}

8
app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/InjectorUtils.kt
View File

@ -7,6 +7,7 @@ import fr.sanchezm.attestationsCovid19.data.repository.AttestationRepository
import fr.sanchezm.attestationsCovid19.data.repository.ProfileRepository
import fr.sanchezm.attestationsCovid19.ui.add.AddViewModelFactory
import fr.sanchezm.attestationsCovid19.ui.attestations.AttestationsViewModelFactory
import fr.sanchezm.attestationsCovid19.ui.qrcode.QrCodeViewModelFactory
object InjectorUtils {
@ -26,6 +27,13 @@ object InjectorUtils {
return AttestationsViewModelFactory(attestationRepository)
}
fun provideQrCodeViewModel(context: Context): QrCodeViewModelFactory {
val attestationRepository =
AttestationRepository.getInstance(MyDatabase.invoke(context).attestationDao())
return QrCodeViewModelFactory(attestationRepository)
}
fun providePdfUtils(context: Context): PdfUtils {
return PdfUtils.getInstance(context.assets, getMyFilesDir(context))
}

1
app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt
View File

@ -38,7 +38,6 @@ class PdfUtils private constructor(
// Adding data
setFieldsData(acroForm, attestation)
setCheckboxFields(acroForm, attestation)
attestation.createAt = Date().time
addPageWithQrCode(document, attestation)
Log.v("PdfUtils", "Save File to ${getPath(attestation.createAt)}")

7
app/src/main/res/layout/qr_code_activity.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".QrCodeActivity" />

28
app/src/main/res/layout/qr_code_fragment.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="viewModel"
type="fr.sanchezm.attestationsCovid19.ui.qrcode.QrCodeViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/qrcode"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.qrcode.QrCodeFragment">
<androidx.core.widget.ContentLoadingProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>