phase 2 i forgor

This commit is contained in:
Odweta
2024-02-09 18:50:50 +01:00
parent 51ed015ebd
commit d8e52335cb
46 changed files with 850 additions and 315 deletions
+5 -3
View File
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<!-- fade_in.xml -->
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:duration="200" />
+5 -3
View File
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<!-- fade_in.xml -->
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="200" />
+5 -2
View File
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<translate
android:fromYDelta="0"
android:toYDelta="100%"
android:duration="300" />
</set>
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<translate
android:fromXDelta="100%p"
android:toXDelta="0"
android:duration="250" />
</set>
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<translate
android:fromXDelta="0"
android:toXDelta="-100%p"
android:duration="250" />
</set>
+6 -2
View File
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
</set>
<translate
android:fromYDelta="100%"
android:toYDelta="0%"
android:duration="600"
android:interpolator="@android:anim/accelerate_interpolator" />
</set>
@@ -4,6 +4,6 @@
android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/pastel_orange_transparent" />
<stroke android:width="5dp" android:color="@color/pastel_orange" />
<solid android:color="@color/black" />
<stroke android:width="5dp" android:color="@color/pastel_yellow" />
</shape>
@@ -4,6 +4,6 @@
android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/pastel_orange_transparent" />
<stroke android:width="5dp" android:color="@color/pastel_orange" />
<solid android:color="@color/pastel_yellow_transparent" />
<stroke android:width="5dp" android:color="@color/pastel_yellow" />
</shape>

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

@@ -4,6 +4,6 @@
android:shape="rectangle">
<corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/pastel_orange_transparent" />
<stroke android:width="5dp" android:color="@color/pastel_orange" />
<solid android:color="@color/transparent" />
<stroke android:width="10px" android:color="@color/pastel_yellow" />
</shape>
@@ -5,46 +5,61 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/link"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/solen" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/roboto_src"
android:theme="@style/Theme.Solen.AppBarOverlay">
android:background="@color/black">
<androidx.appcompat.widget.Toolbar
android:id="@+id/settingsToolbar"
<TextView
android:id="@+id/toolbar"
android:fontFamily="@font/roboto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:theme="@style/Theme.Solen.AppBarOverlay"
app:popupTheme="@style/Theme.Solen.PopupOverlay"
app:title="@string/about_app">
</androidx.appcompat.widget.Toolbar>
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="20dp"
android:text="@string/about_app"
android:background="@drawable/toolbar_background"
android:gravity="center"
android:padding="10dp"
android:textColor="@color/white"
android:textSize="25dp" />
</com.google.android.material.appbar.AppBarLayout>
<ImageView
android:id="@+id/imageView2"
android:layout_width="300dp"
android:layout_height="300dp"
app:layout_constraintBottom_toTopOf="@+id/podstata"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
app:srcCompat="@drawable/solon_500_yellow" />
<TextView
android:id="@+id/podstata"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="8dp"
android:fontFamily="monospace"
android:text="Přehlednost je podstata."
android:textAllCaps="false"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:textStyle="italic"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2" />
<TextView
android:id="@+id/textView"
android:layout_width="299dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="300dp"
android:layout_marginBottom="250dp"
android:text="Vylepšená verze mobilní aplikace ŠkolaOnLine"
android:textAlignment="center"
android:textColor="#FFFFFF"
@@ -54,23 +69,7 @@
app:layout_constraintHorizontal_bias="0.416"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:layout_constraintVertical_bias="0.658" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="144dp"
android:layout_marginTop="70dp"
android:layout_marginEnd="1dp"
android:text="Vývoj:"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/link"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="0.106" />
app:layout_constraintVertical_bias="1.0" />
<TextView
android:id="@+id/link"
@@ -78,7 +77,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="70dp"
android:layout_marginEnd="139dp"
android:text=" Odweta"
android:textColor="#FFFFFF"
@@ -89,7 +87,22 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="0.106" />
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="144dp"
android:layout_marginEnd="1dp"
android:text="Vývoj:"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/link"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="0.3" />
<ImageView
android:id="@+id/imageView7"
@@ -100,8 +113,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.303"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/link"
app:layout_constraintVertical_bias="1.0"
app:layout_constraintVertical_bias="0.54"
app:srcCompat="@mipmap/gitlab_logo_foreground" />
<TextView
@@ -109,31 +121,13 @@
style="@style/LinkText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="59dp"
android:layout_marginEnd="96dp"
android:layout_marginBottom="102dp"
android:layout_marginBottom="100dp"
android:text="Zdrojový kód"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView7"
app:layout_constraintTop_toBottomOf="@+id/link"
app:layout_constraintVertical_bias="1.0" />
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="40dp"
android:fontFamily="monospace"
android:text="Přehlednost je podstata."
android:textAllCaps="false"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:textStyle="italic"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toEndOf="@+id/imageView7" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/app_root">
</FrameLayout>
@@ -17,10 +17,11 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button_background"
android:gravity="center"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="20dp"
android:layout_marginHorizontal="5dp"
android:background="@drawable/toolbar_background"
android:gravity="center"
android:fontFamily="@font/roboto"
android:padding="10dp"
android:textColor="@color/white"
android:textSize="25dp" />
@@ -42,8 +43,15 @@
android:id="@+id/bottomNav"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/toolbar_background"
android:layout_marginHorizontal="20dp"
android:layout_marginVertical="20dp"
android:fontFamily="@font/roboto"
app:itemTextColor="@color/white"
app:layout_constraintTop_toBottomOf="@+id/fragmentContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/menu_navbar" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -10,25 +10,26 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/roboto_src"
android:theme="@style/Theme.Solen.AppBarOverlay">
android:background="@color/black">
<androidx.appcompat.widget.Toolbar
android:id="@+id/settingsToolbar"
<TextView
android:id="@+id/toolbar"
android:fontFamily="@font/roboto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:theme="@style/Theme.Solen.AppBarOverlay"
app:popupTheme="@style/Theme.Solen.PopupOverlay"
app:title="@string/settings">
</androidx.appcompat.widget.Toolbar>
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="20dp"
android:text="@string/settings"
android:background="@drawable/toolbar_background"
android:gravity="center"
android:padding="10dp"
android:textColor="@color/white"
android:textSize="25dp" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:id="@+id/scrollView2"
android:id="@+id/scrollViewSettings"
android:layout_width="409dp"
android:layout_height="673dp"
android:layout_marginStart="1dp"
@@ -41,41 +42,41 @@
app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
<LinearLayout
android:id="@+id/scrollViewLinear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/setting_language"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:paddingRight="20dp"
android:paddingBottom="10dp">
android:id="@+id/setting_language"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:paddingRight="20dp"
android:paddingBottom="10dp">
<TextView
android:id="@+id/settings_language_text"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lang_change"
android:textColor="#FFFFFF"
android:textColorHighlight="#FFFFFF"
android:textColorHint="#FFFFFF"
android:textColorLink="#FFFFFF"
android:textSize="20sp" />
<TextView
android:id="@+id/settings_language_text"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lang_change"
android:textColor="#FFFFFF"
android:textColorHighlight="#FFFFFF"
android:textColorHint="#FFFFFF"
android:textColorLink="#FFFFFF"
android:textSize="20sp" />
<Button
android:id="@+id/setting_language_button_choice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lang_choose"
android:background="@drawable/button_background" />
<Button
android:id="@+id/setting_language_button_choice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/button_background"
android:text="@string/lang_choose" />
</LinearLayout>
</LinearLayout>
</ScrollView>
@@ -15,14 +15,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.528"
app:srcCompat="@drawable/solen" />
app:srcCompat="@drawable/solon_500_yellow" />
<EditText
android:id="@+id/usernameField"
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginTop="292dp"
android:background="@color/primary"
android:background="@drawable/button_background"
android:ems="10"
android:hint="Uživatelské jméno"
android:inputType="text"
@@ -44,7 +44,7 @@
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginBottom="224dp"
android:background="@color/primary"
android:background="@drawable/button_background"
android:ems="10"
android:hint="Heslo"
android:inputType="textPassword"
@@ -60,15 +60,16 @@
<Button
android:id="@+id/signInButton"
android:layout_width="wrap_content"
android:layout_width="240dp"
android:layout_height="80dp"
android:layout_marginStart="137dp"
android:layout_marginTop="72dp"
android:layout_marginEnd="137dp"
android:layout_marginBottom="88dp"
android:text="Přihlásit se"
android:fontFamily="@font/roboto"
android:textSize="20sp"
app:cornerRadius="@dimen/corner_radius"
android:background="@drawable/button_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -3,20 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView4"
android:layout_width="700dp"
android:layout_height="900dp"
android:contentDescription="@string/background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.562"
app:srcCompat="@color/black" />
android:layout_height="match_parent"
android:id="@+id/splash_root">
<ImageView
android:id="@+id/imageView3"
@@ -31,13 +19,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.16"
app:srcCompat="@drawable/solen" />
app:srcCompat="@drawable/solon_500_yellow" />
<ImageView
android:id="@+id/loading_gif"
android:layout_width="200dp"
android:layout_height="200dp"
android:src="@drawable/loading"
android:src="@drawable/loading3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center">
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/heading"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/sign_out_warning"
android:textColor="@color/white"
android:textSize="20sp"
android:windowBackground="@drawable/button_background"
android:layout_margin="20dp"
android:gravity="start" />
</LinearLayout>
@@ -1,24 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<RadioGroup
android:id="@+id/settings_language_choice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" >
android:layout_weight="1"
android:padding="20dp">
<RadioButton
android:id="@+id/radio_button_language_cz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lang_cz" />
android:text="@string/lang_cz"
android:textColor="@color/white"
android:layout_marginHorizontal="20dp"
android:theme="@style/Theme.Solen.RadioButton" />
<RadioButton
android:id="@+id/radio_button_language_en"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lang_en" />
android:text="@string/lang_en"
android:textColor="@color/white"
android:layout_marginHorizontal="20dp"
android:theme="@style/Theme.Solen.RadioButton" />
</RadioGroup>
</androidx.constraintlayout.widget.ConstraintLayout>
Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

+6 -3
View File
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="old_primary">#FFED7D31</color>
<color name="primary">#FFFF9933</color>
<color name="older_primary">#FFED7D31</color>
<color name="old_primary">#FFFF9933</color>
<color name="primary">#FFFFCC33</color>
<color name="secondary">#FF000000</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="red">#FFFF0000</color>
<color name="gray_69">#FF696969</color>
<color name="transparent">#00000000</color>
<color name="pastel_red">#FFFF6666</color>
<color name="pastel_green">#FF00CC99</color>
@@ -32,5 +34,6 @@
<color name="cal_week_free">#FF00CC99</color>
<color name="cal_week_free_transparent_bg">#5000CC99</color>
<color name="primary_transparent_bg">#50ED7D31</color>
<color name="old_primary_transparent_bg">#50ED7D31</color>
<color name="primary_transparent_bg">#50FFCC33</color>
</resources>
@@ -16,4 +16,5 @@
<string name="lang_choose">Vybrat</string>
<string name="splash_screen">splash screen</string>
<string name="about_app">O aplikaci</string>
<string name="sign_out_warning">Opravdu se chcete odhlásit? Tato akce zavře aplikaci.</string>
</resources>
+17
View File
@@ -75,4 +75,21 @@
<item name="android:strokeWidth">5</item>
<item name="cornerRadius">@dimen/corner_radius</item>
</style>
<style name="Theme.Solen.RadioButton">
<item name="colorControlActivated">@color/primary</item>
</style>
<style name="Theme.Solen.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@drawable/alert_dialog_background</item>
</style>
<style name="Theme.Solen.DialogAnimation">
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
<style name="Theme.Solen.Scrollbar">
<item name="color">@color/primary</item>
</style>
</resources>