Merge pull request #11 from anangkur/dashboard

Dashboard

Author: anangkur

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.anangkur.mediku"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 23
-        versionName "2.3"
+        versionCode 30
+        versionName "v3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -16,8 +16,7 @@
         android:supportsRtl="true"
         android:theme="@style/MaterialTheme"
         android:usesCleartextTraffic="true">
-
-        <activity android:name=".feature.about.AboutActivity"/>
+        <activity android:name=".feature.about.AboutActivity" />
         <activity android:name=".feature.mens.menstrualEdit.MenstrualEditActivity" />
         <activity android:name=".feature.mens.menstrual.MenstrualActivity" />
         <activity android:name=".feature.originalNews.OriginalNewsActivity" />
@@ -26,22 +25,20 @@
         <activity android:name=".feature.covid.covid19.CovidActivity" />
         <activity android:name=".feature.medicalRecords.detailMedicalRecord.DetailMedicalRecordActivity" />
         <activity android:name=".feature.medicalRecords.addMedicalRecord.AddMedicalRecordActivity" />
-        <activity android:name=".feature.dashboard.home.HomeActivity" />
+        <activity android:name=".feature.medicalRecords.listMedicalRecords.MedicalRecordsActivity" />
         <activity android:name=".feature.auth.forgotPassword.ForgotPasswordActivity" />
         <activity android:name=".feature.auth.editPassword.EditPasswordActivity" />
         <activity android:name=".feature.profile.editProfile.EditProfileActivity" />
         <activity android:name=".feature.profile.userProfile.ProfileActivity" />
         <activity android:name=".feature.auth.signUp.SignUpActivity" />
         <activity android:name=".feature.auth.signIn.SignInActivity" />
-
         <activity android:name=".feature.splash.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
             android:theme="@style/Base.Theme.AppCompat" />
@@ -55,7 +52,6 @@
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </service>
-
     </application>
 
 </manifest>

app/src/main/java/com/anangkur/mediku/data/DataSource.kt

@@ -14,6 +14,9 @@ import retrofit2.http.Path
 
 interface DataSource {
 
+    fun saveFirebaseToken(firebaseToken: String) { throw Exception() }
+    fun loadFirebaseToken(): String { throw Exception() }
+
     suspend fun getTopHeadlinesNews(
         apiKey: String?,
         country: String?,

app/src/main/java/com/anangkur/mediku/data/Repository.kt

@@ -111,6 +111,14 @@ class Repository(val remoteRepository: RemoteRepository, private val localReposi
         return localRepository.loadCountry()
     }
 
+    fun saveFirebaseToken(firebaseToken: String){
+        localRepository.saveFirebaseToken(firebaseToken)
+    }
+
+    fun loadFirebaseToken(): String {
+        return localRepository.loadFirebaseToken()
+    }
+
     companion object{
         @Volatile private var INSTANCE: Repository? = null
         fun getInstance(remoteRepository: RemoteRepository, localRepository: LocalRepository) = INSTANCE ?: synchronized(

app/src/main/java/com/anangkur/mediku/data/ViewModelFactory.kt

@@ -15,7 +15,7 @@ import com.anangkur.mediku.feature.medicalRecords.detailMedicalRecord.DetailMedi
 import com.anangkur.mediku.feature.auth.editPassword.EditPasswordViewModel
 import com.anangkur.mediku.feature.profile.editProfile.EditProfileViewModel
 import com.anangkur.mediku.feature.auth.forgotPassword.ForgotPasswordViewModel
-import com.anangkur.mediku.feature.dashboard.home.HomeViewModel
+import com.anangkur.mediku.feature.medicalRecords.listMedicalRecords.MedicalRecordsViewModel
 import com.anangkur.mediku.feature.dashboard.main.home.HomeViewModel as HomeViewModelFragment
 import com.anangkur.mediku.feature.dashboard.main.MainViewModel
 import com.anangkur.mediku.feature.mens.menstrual.MenstrualViewModel
@@ -49,7 +49,7 @@ class ViewModelFactory(private val repository: Repository): ViewModelProvider.Ne
 
                 isAssignableFrom(HomeViewModelFragment::class.java) -> HomeViewModelFragment(repository)
                 isAssignableFrom(MainViewModel::class.java) -> MainViewModel(repository)
-                isAssignableFrom(HomeViewModel::class.java) -> HomeViewModel(repository)
+                isAssignableFrom(MedicalRecordsViewModel::class.java) -> MedicalRecordsViewModel(repository)
 
                 isAssignableFrom(AddMedicalRecordViewModel::class.java) -> AddMedicalRecordViewModel(repository)
                 isAssignableFrom(DetailMedicalRecordViewModel::class.java) -> DetailMedicalRecordViewModel(repository)

app/src/main/java/com/anangkur/mediku/data/local/LocalRepository.kt

@@ -1,23 +1,30 @@
 package com.anangkur.mediku.data.local
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import com.anangkur.mediku.data.DataSource
 import com.anangkur.mediku.data.local.room.AppDao
-import com.anangkur.mediku.data.model.covid19.Covid19ApiResponse
 import com.anangkur.mediku.data.model.covid19.Covid19Data
 import com.anangkur.mediku.data.model.newCovid19.NewCovid19DataCountry
 import com.anangkur.mediku.data.model.newCovid19.NewCovid19Summary
 import com.anangkur.mediku.data.model.news.Article
-import com.anangkur.mediku.util.Const.EXTRA_COUNTRY
+import com.anangkur.mediku.util.Const
+import com.anangkur.mediku.util.Const.PREF_COUNTRY
 
 class LocalRepository(
     private val preferences: SharedPreferences,
     private val dao: AppDao
 ): DataSource {
 
+    override fun saveFirebaseToken(firebaseToken: String) {
+        preferences.edit().putString(Const.PREF_FIREBASE_TOKEN, firebaseToken).apply()
+    }
+
+    override fun loadFirebaseToken(): String {
+        return preferences.getString(Const.PREF_FIREBASE_TOKEN, "") ?: ""
+    }
+
     /**
      * News
      */
@@ -87,11 +94,11 @@ class LocalRepository(
      * preferences
      */
     override fun saveCountry(country: String) {
-        preferences.edit().putString(EXTRA_COUNTRY, country).apply()
+        preferences.edit().putString(PREF_COUNTRY, country).apply()
     }
 
     override fun loadCountry(): String {
-        return preferences.getString(EXTRA_COUNTRY, "")?:""
+        return preferences.getString(PREF_COUNTRY, "")?:""
     }
 
     companion object{

app/src/main/java/com/anangkur/mediku/data/model/auth/User.kt

@@ -7,5 +7,6 @@ data class User(
     var height: Int = 0,
     var weight: Int = 0,
     var photo: String = "",
-    var providerName: String = ""
+    var providerName: String = "",
+    var firebaseToken: String = ""
 )

app/src/main/java/com/anangkur/mediku/feature/about/AboutActionListener.kt

@@ -7,4 +7,5 @@ interface AboutActionListener {
     fun onClickResourceChild(resourceChild: Resource.ResourceChild)
     fun onClickCovid19Api(url: String)
     fun onClickNewsApi(url: String)
+    fun onClickGiveRating(url: String)
 }

app/src/main/java/com/anangkur/mediku/feature/about/AboutActivity.kt

@@ -15,7 +15,7 @@ import com.anangkur.mediku.util.obtainViewModel
 import com.anangkur.mediku.util.openBrowser
 import com.anangkur.mediku.util.setupRecyclerViewLinear
 import kotlinx.android.synthetic.main.activity_about.*
-import kotlinx.android.synthetic.main.layout_toolbar.*
+import kotlinx.android.synthetic.main.layout_toolbar_back.*
 
 class AboutActivity: BaseActivity<AboutViewModel>(), AboutActionListener {
 
@@ -45,6 +45,7 @@ class AboutActivity: BaseActivity<AboutViewModel>(), AboutActionListener {
         tv_version_number.text = BuildConfig.VERSION_NAME
         tv_covid_19_data.setOnClickListener { this.onClickCovid19Api("https://covid19api.com") }
         tv_news_data.setOnClickListener { this.onClickNewsApi("https://newsapi.org") }
+        btn_rate.setOnClickListener { this.onClickGiveRating("https://play.google.com/store/apps/details?id=com.anangkur.mediku") }
     }
 
     private fun setupAdapter(){
@@ -78,4 +79,8 @@ class AboutActivity: BaseActivity<AboutViewModel>(), AboutActionListener {
     override fun onClickNewsApi(url: String) {
         openBrowser(url)
     }
+
+    override fun onClickGiveRating(url: String) {
+        openBrowser(url)
+    }
 }

app/src/main/java/com/anangkur/mediku/feature/about/AboutViewModel.kt

@@ -17,6 +17,7 @@ class AboutViewModel(private val repository: Repository): ViewModel() {
         listResource.add(createResourceGoodWare())
         listResource.add(createResourceNhorPhai())
         listResource.add(createResourceEducalyp())
+        listResource.add(createResourceIconixar())
         listResourceLive.postValue(listResource)
     }
 
@@ -63,6 +64,27 @@ class AboutViewModel(private val repository: Repository): ViewModel() {
                 link = "https://www.flaticon.com/free-icon/student_167750"
             )
         )
+        listResourceChild.add(
+            Resource.ResourceChild(
+                image = R.drawable.ic_medical_records,
+                name = "Prescription",
+                link = "https://www.flaticon.com/free-icon/prescription_2755093"
+            )
+        )
+        listResourceChild.add(
+            Resource.ResourceChild(
+                image = R.drawable.ic_covid_stat,
+                name = "Diagram",
+                link = "https://www.flaticon.com/free-icon/diagram_2585314"
+            )
+        )
+        listResourceChild.add(
+            Resource.ResourceChild(
+                image = R.drawable.ic_covid_check,
+                name = "Medical Report",
+                link = "https://www.flaticon.com/free-icon/medical-report_2718054"
+            )
+        )
         return Resource(
             title = "Icon made by Freepik from www.flaticon.com",
             child = listResourceChild,
@@ -156,4 +178,20 @@ class AboutViewModel(private val repository: Repository): ViewModel() {
             child = listResourceChild
         )
     }
+
+    private fun createResourceIconixar(): Resource {
+        val listResourceChild = ArrayList<Resource.ResourceChild>()
+        listResourceChild.add(
+            Resource.ResourceChild(
+                image = R.drawable.ic_menstrual_period,
+                link = "https://www.flaticon.com/free-icon/calendar_2413771",
+                name = "Calendar"
+            )
+        )
+        return Resource(
+            title = "Icon made by Iconixar from www.flaticon.com",
+            link = "https://www.flaticon.com/authors/iconixar",
+            child = listResourceChild
+        )
+    }
 }