From 333f7bfa162f9f6b34c3a09dbd10bb4f3ee8ab1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 7 Apr 2019 10:59:27 +0200
Subject: [PATCH 1/2] Add privacy policy link (#320)

---
 .../ui/modules/login/form/LoginFormFragment.kt       |  2 ++
 app/src/main/res/layout/fragment_login_form.xml      | 12 +++++++++++-
 app/src/main/res/values-pl/strings.xml               |  1 +
 app/src/main/res/values/strings.xml                  |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 54fd0704..5c0a6ed8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -53,6 +54,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
         loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
         loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+        loginFormPrivacyPolicyLink.movementMethod = LinkMovementMethod.getInstance()
         loginFormSignIn.setOnClickListener { presenter.attemptLogin() }
 
         loginFormPass.setOnEditorActionListener { _, id, _ ->
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 81baf4af..7a82eaf7 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -124,7 +124,8 @@
                 <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/loginFormHost"
                     android:layout_width="match_parent"
-                    android:layout_height="56dp" />
+                    android:layout_height="56dp"
+                    android:entries="@array/endpoints_keys" />
             </LinearLayout>
 
             <TextView
@@ -144,6 +145,15 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout" />
 
+            <TextView
+                android:id="@+id/loginFormPrivacyPolicyLink"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="@string/login_privacy_policy"
+                app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormSignIn"
                 style="@style/Widget.MaterialComponents.Button"
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dcc73526..0a13ab1c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -26,6 +26,7 @@
     <string name="login_password_hint">Hasło</string>
     <string name="login_host_hint">Dziennik</string>
     <string name="login_symbol_hint">Symbol</string>
+    <string name="login_privacy_policy"><a href="https://wulkanowy.github.io/polityka-prywatnosci.html">Polityka prywatności</a></string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
     <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1debed7b..e12d94fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
     <string name="login_password_hint">Password</string>
     <string name="login_host_hint">Register</string>
     <string name="login_symbol_hint">Symbol</string>
+    <string name="login_privacy_policy"><a href="https://wulkanowy.github.io/polityka-prywatnosci.html">Privacy policy</a></string>
     <string name="login_sign_in">Sign in</string>
     <string name="login_invalid_password">This password is too short</string>
     <string name="login_incorrect_password">Login details are incorrect</string>

From 6cd6cae1e0fa7f6f4b08c50ba212a82862efe2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 7 Apr 2019 11:08:46 +0200
Subject: [PATCH 2/2] Version 0.7.6

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c58c1e33..48f0e65c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 31
-        versionName "0.7.5"
+        versionCode 32
+        versionName "0.7.6"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -86,7 +86,7 @@ play {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.7.5') { exclude module: "threetenbp" }
+    implementation('io.github.wulkanowy:api:0.7.6') { exclude module: "threetenbp" }
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 78576903..d0f12e55 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,9 @@
 Wersja 0.7.5
 
+Uwaga! Jeżeli w aplikacji przestały wyświetlać się oceny, prosimy o wylogowanie i zalogowanie się ponownie!
+
 Naprawiliśmy:
-- problem z brakiem aktywnego semestru (jeśli doświadczysz jakichś problemów - wyloguj i zaloguj się ponownie)
+- problem z brakiem aktywnego semestru
 - logowanie w niestandardowych dziennikach na vulcan.net.pl
 - oznaczanie lekcji w planie jako odwołanej, jeśli brak opisu tej zmiany
 - ładowanie wiadomości, jeśli byli zalogowani jednocześnie uczeń i rodzic