diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2737b34..f49b83e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,11 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Create google-services.json + run: echo "$GOOGLE_SERVICES_JSON" > app/google-services.json + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} + - name: Run Lint run: ./gradlew lint diff --git a/app/.gitignore b/app/.gitignore index 42afabf..607adf0 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/app/google-services.json \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index a590690..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "project_info": { - "project_number": "1059643006132", - "project_id": "devhub-4912b", - "storage_bucket": "devhub-4912b.firebasestorage.app" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:1059643006132:android:459aaa892b0f25fdf6cbe1", - "android_client_info": { - "package_name": "com.delecrode.devhub" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyCclTzmPM0pdKLYQQJESqx0ZHdXJ7-vxdM" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/main/java/com/delecrode/devhub/data/model/User.kt b/app/src/main/java/com/delecrode/devhub/data/model/UserDto.kt similarity index 100% rename from app/src/main/java/com/delecrode/devhub/data/model/User.kt rename to app/src/main/java/com/delecrode/devhub/data/model/UserDto.kt diff --git a/app/src/main/java/com/delecrode/devhub/data/repository/RepoRepositoryImpl.kt b/app/src/main/java/com/delecrode/devhub/data/repository/RepoRepositoryImpl.kt index d19b975..43ced05 100644 --- a/app/src/main/java/com/delecrode/devhub/data/repository/RepoRepositoryImpl.kt +++ b/app/src/main/java/com/delecrode/devhub/data/repository/RepoRepositoryImpl.kt @@ -28,22 +28,16 @@ class RepoRepositoryImpl(val repoApi: RepoApiService) : RepoRepository { } override suspend fun getLanguagesRepo(owner: String, repo: String) : Languages{ - try { + return try { val response = repoApi.getRepoLanguages(owner, repo) if (response.isSuccessful) { val body = response.body() - if (body != null) { - return body.toLanguagesDomain() - }else{ - throw Exception("Resposta vazia do servidor") - - } - }else{ - throw Exception("Erro na requisição ${response.code()}") + body?.toLanguagesDomain() ?: Languages(emptyList()) + } else { + Languages(emptyList()) } - - }catch (e: Exception){ - throw e + } catch (e: Exception) { + Languages(emptyList()) } } } \ No newline at end of file diff --git a/app/src/main/java/com/delecrode/devhub/domain/model/RepoDetail.kt b/app/src/main/java/com/delecrode/devhub/domain/model/RepoDetail.kt index bf7588d..7421331 100644 --- a/app/src/main/java/com/delecrode/devhub/domain/model/RepoDetail.kt +++ b/app/src/main/java/com/delecrode/devhub/domain/model/RepoDetail.kt @@ -18,6 +18,6 @@ data class RepoDetail( ) data class Languages( - val languages: List + val languages: List? ) diff --git a/app/src/main/java/com/delecrode/devhub/ui/profile/ProfileScreen.kt b/app/src/main/java/com/delecrode/devhub/ui/profile/ProfileScreen.kt new file mode 100644 index 0000000..617e247 --- /dev/null +++ b/app/src/main/java/com/delecrode/devhub/ui/profile/ProfileScreen.kt @@ -0,0 +1,2 @@ +package com.delecrode.devhub.ui.profile + diff --git a/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailScreen.kt b/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailScreen.kt index b29bbce..c673024 100644 --- a/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailScreen.kt +++ b/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailScreen.kt @@ -70,6 +70,7 @@ fun RepoDetailScreen( LaunchedEffect(state.error) { if (state.error != null) { Toast.makeText(context, state.error, Toast.LENGTH_SHORT).show() + Log.i("RepoDetailScreen", "RepoDetailScreen: ${state.error}") viewModel.clearState() } } diff --git a/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailViewModel.kt b/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailViewModel.kt index dbe377a..5124e07 100644 --- a/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailViewModel.kt +++ b/app/src/main/java/com/delecrode/devhub/ui/repo/RepoDetailViewModel.kt @@ -36,17 +36,15 @@ class RepoDetailViewModel(val repository: RepoRepository) : ViewModel() { fun getLanguagesForRepo(owner: String, repo: String){ viewModelScope.launch { - _uiState.value = _uiState.value.copy( - isLoading = true, - error = null - ) try{ val result = repository.getLanguagesRepo(owner, repo) _uiState.value = _uiState.value.copy( - languages = result.languages, - isLoading = false + languages = result.languages ) }catch (e: Exception){ + _uiState.value = _uiState.value.copy( + languages = emptyList() + ) } } }