Release v2.1. Merge branch 'develop'

Author: alexandr7035

README.md

@@ -14,6 +14,7 @@ GitStat is a simple android app designed to aggregate Github profile data into i
 ### Technology (some notes)
 
 - Used single activity approach and [Navigation component](https://developer.android.com/guide/navigation) to navigate across fragments.
+- Used [Hilt](https://dagger.dev/hilt/) for dependency injection.
 - [View binding](https://developer.android.com/topic/libraries/view-binding) is used to interact with views within fragments and recyclerview adapters.
 - Kotlin coroutines are used for asynchronous operations.
 - [Retrofit](https://github.com/square/retrofit) is used to perform [Github API](https://docs.github.com/en/rest) calls to obtain the data. Also use [OkHttp Logging Interceptor](https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor) to log requests.
@@ -31,4 +32,4 @@ used to implement languages filter (see third screenshot).
 - Create personal access token with ```read:user``` and ```repo``` access scopes. (**Note**: full ```repo``` scope is used only to have access to your private repos data. No malicious write operations are performed by the app).
 - Use the obtained token as auth credetial in the application login form.
 
-More user-friendly auth method may be implemented later. Authorization process in the app **needs additional research and refactoring**.
+More user-friendly **OAuth** method may be implemented later.

app/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
+    id("dagger.hilt.android.plugin")
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -25,8 +26,8 @@ android {
         applicationId 'com.alexandr7035.gitstat'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 100
-        versionName "1.0"
+        versionCode 300
+        versionName "2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -71,7 +72,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
@@ -90,4 +91,15 @@ dependencies {
     annotationProcessor "androidx.room:room-compiler:$room_version"
     kapt("androidx.room:room-compiler:$room_version")
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
+
+
+    // Hilt
+    implementation("com.google.dagger:hilt-android:2.38.1")
+    kapt("com.google.dagger:hilt-android-compiler:2.38.1")
+
+}
+
+// Allow references to generated code
+kapt {
+    correctErrorTypes true
 }

app/src/main/java/com/alexandr7035/gitstat/core/App.kt

@@ -1,7 +1,9 @@
 package com.alexandr7035.gitstat.core
 
 import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class App: Application() {
 
     lateinit var progLangManager: ProgLangManager

app/src/main/java/com/alexandr7035/gitstat/core/AppPreferences.kt

@@ -0,0 +1,19 @@
+package com.alexandr7035.gitstat.core
+
+import android.app.Application
+import android.content.Context
+import com.alexandr7035.gitstat.R
+import javax.inject.Inject
+
+class AppPreferences @Inject constructor(private val application: Application) {
+    private val PREFS_NAME = application.getString(R.string.app_name)
+    private val prefs = application.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+
+    var token: String?
+        get() = prefs.getString(application.getString(R.string.shared_pref_token), null)
+        set(value) = prefs.edit().putString(application.getString(R.string.shared_pref_token), value).apply()
+
+    var repositoriesFilters: String?
+        get() = prefs.getString(application.getString(R.string.shared_prefs_filters), null)
+        set(value) = prefs.edit().putString(application.getString(R.string.shared_prefs_filters), value).apply()
+}

app/src/main/java/com/alexandr7035/gitstat/core/BaseViewModel.kt

@@ -0,0 +1,8 @@
+package com.alexandr7035.gitstat.core
+
+interface BaseViewModel {
+    // Presumably, we should logout when receive 401 code in any fragment
+    // (E.g. the token has expired
+    // So make it necessary by default
+    fun doLogOut()
+}

app/src/main/java/com/alexandr7035/gitstat/data/LoginRepository.kt

@@ -0,0 +1,54 @@
+package com.alexandr7035.gitstat.data
+
+import androidx.lifecycle.MutableLiveData
+import com.alexandr7035.gitstat.core.AppPreferences
+import com.alexandr7035.gitstat.data.local.CacheDao
+import com.alexandr7035.gitstat.data.remote.NetworkModule
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class LoginRepository @Inject constructor(private val appPreferences: AppPreferences, private val api: NetworkModule, private val dao: CacheDao) {
+
+    fun doLoginRequest(loginLiveData: MutableLiveData<Int>, token: String) {
+
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val res = api.loginRequest(token)
+
+                withContext(Dispatchers.Main) {
+                    loginLiveData.value = res.code()
+                }
+            }
+            catch (e: Exception) {
+                withContext(Dispatchers.Main) {
+                    loginLiveData.value = 0
+                }
+            }
+        }
+
+    }
+
+
+    fun saveToken(token: String) {
+        appPreferences.token = token
+    }
+
+    fun checkIfLoggedIn(): Boolean {
+        return when (appPreferences.token) {
+            null -> false
+            else -> true
+        }
+    }
+
+    fun clearToken() {
+        appPreferences.token = null
+    }
+
+    suspend fun clearCache() {
+        dao.clearUserCache()
+        dao.clearRepositoriesCache()
+    }
+}

app/src/main/java/com/alexandr7035/gitstat/data/ReposRepository.kt

@@ -0,0 +1,97 @@
+package com.alexandr7035.gitstat.data
+
+import androidx.lifecycle.MutableLiveData
+import com.alexandr7035.gitstat.core.AppPreferences
+import com.alexandr7035.gitstat.core.Language
+import com.alexandr7035.gitstat.core.ProgLangManager
+import com.alexandr7035.gitstat.core.SyncStatus
+import com.alexandr7035.gitstat.data.local.CacheDao
+import com.alexandr7035.gitstat.data.local.model.RepositoryEntity
+import com.alexandr7035.gitstat.data.remote.NetworkModule
+import com.alexandr7035.gitstat.data.remote.mappers.RepositoryRemoteToCacheMapper
+import com.alexandr7035.gitstat.data.remote.model.RepositoryModel
+import com.alexandr7035.gitstat.view.repositories.filters.ReposFilters
+import com.google.gson.Gson
+import javax.inject.Inject
+
+class ReposRepository @Inject constructor(
+    private val api: NetworkModule,
+    private val dao: CacheDao,
+    private val repoMapper: RepositoryRemoteToCacheMapper,
+    private val appPreferences: AppPreferences,
+    private val gson: Gson,
+    private val langManager: ProgLangManager
+) {
+    private val syncStateLiveData = MutableLiveData<SyncStatus>()
+
+    suspend fun syncRepositoriesData() {
+
+        syncStateLiveData.postValue(SyncStatus.PENDING)
+
+        try {
+            val res = api.getRepositoriesData()
+
+            if (res.isSuccessful) {
+                syncStateLiveData.postValue(SyncStatus.SUCCESS)
+                val reposList: List<RepositoryModel> = res.body()!!
+
+                val cachedReposList = reposList.map { repositoryModel ->
+                    repoMapper.transform(repositoryModel)
+                }
+
+                dao.clearRepositoriesCache()
+                dao.insertRepositoriesCache(cachedReposList)
+            } else {
+                syncStateLiveData.postValue(SyncStatus.FAILED)
+            }
+        }
+
+        catch (e: Exception) {
+            ////Log.d(LOG_TAG, "exception ${e}")
+            syncStateLiveData.postValue(SyncStatus.FAILED)
+        }
+    }
+
+    fun getSyncStatusLiveData(): MutableLiveData<SyncStatus> {
+        return syncStateLiveData
+    }
+
+    suspend fun fetchAllRepositoriesFromDb(): List<RepositoryEntity> {
+        return dao.getRepositoriesCache()
+    }
+
+    suspend fun fetchActiveRepositoriesFromDb(): List<RepositoryEntity> {
+        return dao.getActiveRepositoriesCache()
+    }
+
+    suspend fun fetchArchivedRepositoriesFromDb(): List<RepositoryEntity> {
+        return dao.getArchivedRepositoriesCache()
+    }
+
+
+    // Filters
+    fun getRepositoriesFilters(): ReposFilters {
+        val filtersStr = appPreferences.repositoriesFilters
+
+        return if (filtersStr == null) {
+            // New instance with default params
+            // See filters class
+            ReposFilters()
+        } else {
+            // Load from persistent storage
+            gson.fromJson(filtersStr, ReposFilters::class.java)
+        }
+    }
+
+
+    fun saveRepositoriesFilters(filters: ReposFilters) {
+        appPreferences.repositoriesFilters = gson.toJson(filters)
+    }
+
+
+    // Prog languages
+    fun getLanguagesForReposList(repos: List<RepositoryEntity>): List<Language> {
+        return langManager.getLanguagesList(repos)
+    }
+
+}