diff --git a/.travis.yml b/.travis.yml index 0977a9623..a430c90ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -branches: - only: - - master - android: licenses: - android-sdk-preview-license-.+ @@ -58,8 +54,8 @@ script: - | if [ $TRAVIS_TAG ]; then gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg; - openssl aes-256-cbc -d -in ./app/key-encrypted.p12 -k $ENCRYPT_KEY >> ./app/key.p12; - openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks; + gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg; + gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg; ./gradlew publishRelease -PenableCrashlytics --stacktrace; fi diff --git a/app/build.gradle b/app/build.gradle index b4cc74bab..6382469da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 15 targetSdkVersion 28 - versionCode 18 - versionName "0.5.4" + versionCode 19 + versionName "0.6.0" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -81,7 +81,7 @@ configurations.all { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation('com.github.wulkanowy:api:afc019d0b7') { exclude module: "threetenbp" } + implementation('io.github.wulkanowy:api:0.6.0') { exclude module: "threetenbp" } implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.appcompat:appcompat:1.0.2" diff --git a/app/key.p12.gpg b/app/key.p12.gpg new file mode 100644 index 000000000..e9b6d06eb Binary files /dev/null and b/app/key.p12.gpg differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 530402ca8..de216d36b 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt index 7f4b886fe..3c58ea4bd 100644 --- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt +++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt @@ -33,6 +33,8 @@ internal class RepositoryModule { fun provideApi(): Api { return Api().apply { logLevel = NONE + androidVersion = android.os.Build.VERSION.RELEASE + buildTag = android.os.Build.MODEL setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC)) } } diff --git a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png b/app/src/main/play/pl-PL/listing/featureGraphic/feature.png index 15e6ebbfc..094b25b6c 100644 Binary files a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png and b/app/src/main/play/pl-PL/listing/featureGraphic/feature.png differ diff --git a/app/src/main/play/pl-PL/listing/fulldescription b/app/src/main/play/pl-PL/listing/fulldescription index 4af6238a1..7c1f99fdf 100644 --- a/app/src/main/play/pl-PL/listing/fulldescription +++ b/app/src/main/play/pl-PL/listing/fulldescription @@ -1,10 +1,13 @@ Aplikacja jest we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami. Wyróżnione cechy i funkcje: -- Całkowicie darmowa i otwarta (brak jakichkolwiek reklam i mikropłatności) -- Powiadomienia -- Tryb offline -- Aktywne wsparcie i rozwój +- brak reklam, +- tryb offline, +- powiadomienia, +- obliczanie średniej ważonej, +- procentowy podgląd frekwencji, +- ciemny motyw. GitHub: https://github.com/wulkanowy/wulkanowy Discord: https://discord.gg/vccAQBr +Trello: https://trello.com/b/A97NUM1s/wulkanowy diff --git a/app/src/main/play/pl-PL/listing/icon/icon.png b/app/src/main/play/pl-PL/listing/icon/icon.png index 7cad5c2f4..de216d36b 100644 Binary files a/app/src/main/play/pl-PL/listing/icon/icon.png and b/app/src/main/play/pl-PL/listing/icon/icon.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png new file mode 100644 index 000000000..8a52d8de8 Binary files /dev/null and b/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png index 3f4ceb7e1..c65085747 100644 Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png and b/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png new file mode 100644 index 000000000..376fc3c3f Binary files /dev/null and b/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png deleted file mode 100644 index 5a055ff42..000000000 Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/exams.png and /dev/null differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png index 58c22c519..6b4089b02 100644 Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png and b/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png new file mode 100644 index 000000000..c3dc523ff Binary files /dev/null and b/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png new file mode 100644 index 000000000..511433d45 Binary files /dev/null and b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png index 832db0b68..1d5024707 100644 Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png and b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png b/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png deleted file mode 100644 index e9e66bbb9..000000000 Binary files a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable.png and /dev/null differ diff --git a/app/src/main/play/pl-PL/listing/shortdescription b/app/src/main/play/pl-PL/listing/shortdescription index b5fc7491b..c850c159a 100644 --- a/app/src/main/play/pl-PL/listing/shortdescription +++ b/app/src/main/play/pl-PL/listing/shortdescription @@ -1 +1 @@ -Nieoficjalna aplikacja dla dziennika VULCAN UONET+. +Nieoficjalna aplikacja ucznia i rodzica dla dziennika VULCAN UONET+ diff --git a/app/src/main/play/pl-PL/listing/title b/app/src/main/play/pl-PL/listing/title index e491efb90..2d53a62a8 100644 --- a/app/src/main/play/pl-PL/listing/title +++ b/app/src/main/play/pl-PL/listing/title @@ -1 +1 @@ -Wulkanowy Dzienniczek UONET+ +Wulkanowy Dzienniczek diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew index 205817c54..e6916874a 100644 --- a/app/src/main/play/pl-PL/whatsnew +++ b/app/src/main/play/pl-PL/whatsnew @@ -1,2 +1,16 @@ -Wersja 0.5.4: -- naprawiono błąd logowania +Wersja 0.6.0 + +Aplikacja została całkowicie przepisana! +Przez wielkie zmian, które w niej zaszły, wymagane jest ponowne logowanie w aplikacji +oraz ponowne dodanie widgetu planu lekcji do ekranu głównego. + +Mamy nową ikonę aplikacji! 🎉 + +Dodaliśmy nowe funkcje: +- przeglądanie wiadomości (wysyłanie pojawi się w przyszłości) +- zadania domowe +- statystyki frekwencji +- menadżer kont +- możliwość zmiany wagi plusów i minusów + +Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.0 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 0f1a52ac5..d7b2384d4 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index e21e05b69..9a06371a8 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index e0e5dbbda..d793e53c7 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 82a30d8fe..615311e02 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 06856261b..ddd0325f8 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/upload-key.jks.gpg b/app/upload-key.jks.gpg new file mode 100644 index 000000000..6ec04a294 Binary files /dev/null and b/app/upload-key.jks.gpg differ