This repository has been archived by the owner on Dec 4, 2022. It is now read-only.
generated from mobiledevpro/Android-Kotlin-MVVM-Template
-
-
Notifications
You must be signed in to change notification settings - Fork 9
Added country details screen #5 #24
Merged
dmitriy-chernysh
merged 31 commits into
master
from
feature/added-country-details-screen-SO-5
Apr 3, 2020
Merged
Added country details screen #5 #24
dmitriy-chernysh
merged 31 commits into
master
from
feature/added-country-details-screen-SO-5
Apr 3, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* configured koin * added repository for statistic * added jsoup to gradle dependencies * added models for statistic from API and from html parser * renamed total models and repository, interactor * added statistic api [SO-5]
# Conflicts: # app/src/main/java/com/mobiledevpro/app/di/Module.kt # app/src/main/java/com/mobiledevpro/app/ui/total/viewmodel/TotalViewModel.kt # build.gradle # data-remote/src/main/java/com/mobiledevpro/remote/service/RemoteServiceFactory.kt # data-remote/src/main/java/com/mobiledevpro/remote/service/interceptor/ApiResponseInterceptor.kt # data/src/main/java/com/mobiledevpro/data/mapper/MapperExtension.kt # data/src/main/java/com/mobiledevpro/data/repository/userdata/DefaultTotalDataRepository.kt
* fixed merge conflicts [SO-5]
* refactored module DI * implemented logic for saving data [SO-5]
* added ID [SO-5]
* created two primary keys [SO-5]
* changed primary key to province [SO-5]
* added inject StatisticCovidCache to Module.kt [SO-5]
* renamed Country.kt to TotalCountry.kt * created model StatisticCountry.kt * added mapping for StatisticCountry.kt [SO-5]
* created viewmodel * created fragment * create views for fragment, recycler item * create DiffUtil callback [SO-5]
…ithub.com/dmitriy-chernysh/covid-19-tracker-android into feature/added-country-details-screen-SO-5 � Conflicts: � data-local/src/main/java/com/mobiledevpro/local/database/statistic/model/CachedStatisticCountryWithDailyStatistic.kt
* created throwable for parser * implemented logic for mapping * added error to strings.xml * added icon for StatisticCountryFragment.kt [SO-5]
* fixed data format value in mapper for xml * fixed parser, changed urls and remove const count countries * remove deprecated databinding execute method and added recommended by IDE [CO-5]
* added click listener to CountriesListAdapter.kt * added inject logic to DI * added safe args to gradle * added show country statistic method to NavigationExtensions.kt [CO-5]
* added to DayStatistic three confirmed-deaths-recovered [SO-5]
* fixed fetching statistic data * fixed calculating statistic by day [CO-5]
* added draggable icon * configured fragment_statistic_country.xml * changed colorPrimaryLight * added BottomSheetBehaviour init method to StatisticCountryFragment.kt [SO-5]
* added MPAChart lib * added RxRelay lib * added temp chart to fragment * added time format method to DateExtensions.kt * added behavior relay to StatisticCountryViewModel.kt [SO-5]
* incremented chart lib * created custom view chart * added map-method for float to FormatExtensions.kt [SO-5]
…reen-SO-5' into feature/added-country-details-screen-SO-5 # Conflicts: # app/src/main/java/com/mobiledevpro/app/ui/statistic/StatisticCountryFragment.kt # app/src/main/java/com/mobiledevpro/app/ui/statistic/viewmodel/StatisticCountryViewModel.kt
* changed time format from string to long in data layers * created view for total data * removed unusable methods form cache layer [SO-5]
…ithub.com/dmitriy-chernysh/covid-19-tracker-android into feature/added-country-details-screen-SO-5
* added total * added total string * created total view model * renamed chart view model * fixed url for parser [SO-5]
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.