github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Refactor multi logs support (#165)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-10-14 15:42:36 +02:00
committed by Rafał Borcz
parent 5cd8ed88c0
commit bb69d1b643
19 changed files with 433 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/fragment_login_form.xml
View File

@ -66,10 +66,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:hint="@string/login_email_hint">
android:hint="@string/login_nickname_hint">
<android.support.design.widget.TextInputEditText
android:id="@+id/loginEmailEdit"
android:id="@+id/loginNicknameEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
@ -80,6 +80,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:hint="@string/login_password_hint">
<android.support.design.widget.TextInputEditText
@ -93,6 +94,12 @@
app:fontFamily="sans-serif" />
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/loginHostEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/login_host_hint" />
</LinearLayout>
<android.support.design.widget.TextInputLayout

4
app/src/main/res/values-pl/strings.xml
View File

@ -15,13 +15,13 @@
<!--Login form-->
<string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
<string name="login_header_symbol">Podaj symbol dziennika VULCAN</string>
<string name="login_email_hint">Email</string>
<string name="login_nickname_hint">Email lub nick</string>
<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_sign_in">Zaloguj</string>
<string name="login_progress">Logowanie&#8230;</string>
<string name="login_sync">Synchronizacja</string>
<string name="login_invalid_email">Ten adres email nie jest poprawny</string>
<string name="login_invalid_password">To hasło jest za krótkie</string>
<string name="login_incorrect_password">To hasło jest niepoprawne</string>
<string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprwadź symbol</string>

21
app/src/main/res/values/api_endpoints.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string-array name="endpoints_keys">
<item>Vulcan</item>
<item>Opolska eSzkoła</item>
<item>Gdańska Platforma Edukacyjna</item>
<item>EduNet Miasta Tarnowa</item>
<item>ResMan Rzeszów</item>
<item>Fakelog</item>
<item>Fakelog lokalnie</item>
</string-array>
<string-array name="endpoints_values">
<item>https://vulcan.net.pl</item>
<item>https://eszkola.opolskie.pl</item>
<item>https://edu.gdansk.pl</item>
<item>https://umt.tarnow.pl</item>
<item>https://resman.pl</item>
<item>https://fakelog.cf</item>
<item>http://fakelog.localhost:3000</item>
</string-array>
</resources>

356
app/src/main/res/values/api_symbols.xml
View File

File diff suppressed because it is too large Load Diff

4
app/src/main/res/values/strings.xml
View File

@ -15,13 +15,13 @@
<!--Login form-->
<string name="login_header_default">Sign in with the student or parent account</string>
<string name="login_header_symbol">Enter the VULCAN diary symbol</string>
<string name="login_email_hint">Email</string>
<string name="login_nickname_hint">Email or nick</string>
<string name="login_password_hint">Password</string>
<string name="login_host_hint">Log</string>
<string name="login_symbol_hint">Symbol</string>
<string name="login_sign_in">Sign in</string>
<string name="login_progress">Logging in&#8230;</string>
<string name="login_sync">Synchronization&#8230;</string>
<string name="login_invalid_email">This email address is invalid</string>
<string name="login_invalid_password">This password is too short</string>
<string name="login_incorrect_password">This password is incorrect</string>
<string name="login_incorrect_symbol">Student not found. Check the symbol</string>