From 452271e8c0a7b4ca6261aef2acb9eb2d36f54ba2 Mon Sep 17 00:00:00 2001 From: Tomasz F Date: Wed, 8 Sep 2021 19:11:14 +0200 Subject: [PATCH] [UI] Add list of contributors in Settings. (#15) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Contributors item in settings * Move contributors activity to settings package && actualize branch * Update AndroidManifest.xml * Getting contributors from github api * Cleaning code * Fetching data from szkolny api, displaying content, a lot of changes :D * Strings * Remove androidx legacy library * Revert manifest changes * Remove logging in SzkolnyApi * Fix app name spelling * Revert changes to dimens.xml * Refactor contributors code * Revert changes to dimens.xml Again * Revert changes to build.gradle * Revert changes to gradle-wrapper.properties * Revert changes to gradle.properties * Make user name nullable * Add caching, refactor plurals, add progress bar * Update contributors UI * Shorten activity name in manifest * Remove unneeded line break * Remove fragment_translators.xml Co-authored-by: Kuba Szczodrzyński --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 1 + .../pl/szczodrzynski/edziennik/Extensions.kt | 2 + .../edziennik/data/api/szkolny/SzkolnyApi.kt | 14 ++- .../data/api/szkolny/SzkolnyService.kt | 3 + .../szkolny/response/ContributorsResponse.kt | 20 ++++ .../lazypager/FragmentLazyPagerAdapter.kt | 2 +- .../settings/cards/SettingsAboutCard.kt | 9 ++ .../contributors/ContributorsActivity.kt | 83 +++++++++++++++ .../contributors/ContributorsAdapter.kt | 63 +++++++++++ .../contributors/ContributorsFragment.kt | 47 ++++++++ .../main/res/layout/contributors_activity.xml | 100 ++++++++++++++++++ .../res/layout/contributors_list_fragment.xml | 10 ++ .../res/layout/contributors_list_item.xml | 49 +++++++++ app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-en/plurals.xml | 11 +- app/src/main/res/values-en/strings.xml | 4 + app/src/main/res/values/plurals.xml | 11 ++ app/src/main/res/values/strings.xml | 6 ++ 19 files changed, 432 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ContributorsResponse.kt create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsActivity.kt create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsAdapter.kt create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsFragment.kt create mode 100644 app/src/main/res/layout/contributors_activity.xml create mode 100644 app/src/main/res/layout/contributors_list_fragment.xml create mode 100644 app/src/main/res/layout/contributors_list_item.xml diff --git a/app/build.gradle b/app/build.gradle index 29a434d8..827ae0d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-parcelize' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index af4b653a..cbe7bd48 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -146,6 +146,7 @@ android:configChanges="orientation|keyboardHidden" android:theme="@style/Base.Theme.AppCompat" /> + %d ocen + + + %d commit + %d commity + %d commit\'ów + + + %d tłumaczenie + %d tłumaczenia + %d tłumaczeń + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2043046f..b11631b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1391,6 +1391,10 @@ Zobacz także Wejdź na stronę aplikacji Uzyskaj pomoc lub wesprzyj autorów + Twórcy aplikacji + Lista twórców Szkolnego + Współtwórcy + Tłumacze Kod źródłowy Pomóż w rozwoju aplikacji na GitHubie Nazwa profilu @@ -1457,4 +1461,6 @@ Ocena: %s (waga %s)\nPrzedmiot: %s\nKategoria: %s\nOpis: %s\nNauczyciel: %s Rodzaj: %s\nNauczyciel: %s\nTreść: %s Rodzaj: %s\nTermin: %s, %s\nNr lekcji: %s\nPrzedmiot: %s\nNauczyciel: %s\nTemat lekcji: %s + \@%s - %s + Najłatwiejszy sposób na korzystanie z e-dziennika.