spiced up the theme a bit (still needs work though), started to work on offline stuff, also fixed some bugs and done some polishing

2024-02-02 15:54:31 +01:00
parent 8654ca5ac4
commit 1a63e86bdc
57 changed files with 1008 additions and 607 deletions
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
+</vector>
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
+</vector>
@@ -1,21 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    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">

-    <Button
-        android:id="@+id/settingsBackButton"
-        android:layout_width="wrap_content"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="315dp"
-        android:layout_marginBottom="675dp"
-        android:text="Zpět"
+        android:fontFamily="@font/roboto_src"
+        android:theme="@style/Theme.Solen.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/settingsToolbar"
+            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">
+
+            <!-- Add an ImageView for the image in the Toolbar -->
+            <ImageView
+                android:id="@+id/settingsBackButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:contentDescription="@string/back_button"
+                app:srcCompat="@drawable/ic_back_arrow" />  <!-- Adjust margin as needed -->
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+        android:id="@+id/scrollView2"
+        android:layout_width="409dp"
+        android:layout_height="673dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginEnd="1dp"
+        android:layout_marginBottom="1dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/setting_language"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <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: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" />
+            </LinearLayout>
+
+        </LinearLayout>
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -5,44 +5,67 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="457dp"
+        android:layout_height="307dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="17dp"
+        app:layout_constraintBottom_toTopOf="@+id/usernameField"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/solen" />
+
    <EditText
        android:id="@+id/usernameField"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_width="237dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="292dp"
+        android:layout_marginBottom="52dp"
+        android:background="@color/primary"
        android:ems="10"
        android:hint="Uživatelské jméno"
        android:inputType="text"
+        android:paddingHorizontal="20dp"
+        android:textColor="@color/white"
+        android:textColorHighlight="@color/white"
+        android:textColorHint="@color/white"
+        android:textColorLink="@color/white"
+        app:circularflow_radiusInDP="20dp"
        app:layout_constraintBottom_toTopOf="@+id/passwordField"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <EditText
        android:id="@+id/passwordField"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_width="237dp"
+        android:layout_height="50dp"
+        android:layout_marginBottom="288dp"
+        android:background="@color/primary"
        android:ems="10"
        android:hint="Heslo"
        android:inputType="textPassword"
+        android:paddingHorizontal="20dp"
+        android:textColor="@color/white"
+        android:textColorHighlight="@color/white"
+        android:textColorHint="@color/white"
+        android:textColorLink="@color/white"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/usernameField" />
+        app:layout_constraintStart_toStartOf="parent" />

    <Button
        android:id="@+id/signInButton"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        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:textSize="20sp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -12,8 +12,10 @@
        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" />

    <ImageView
@@ -25,8 +27,10 @@
        android:contentDescription="@string/kolaonline_enhanced"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.495"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.16"
        app:srcCompat="@drawable/solen" />

    <ImageView
@@ -35,10 +39,11 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="205dp"
        android:layout_marginEnd="206dp"
+        android:contentDescription="@string/splash_screen"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/imageView3"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintVertical_bias="0.36" />

 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -9,7 +9,7 @@
        android:id="@+id/layoutDayMain"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:fontFamily="@font/roboto">
-    </LinearLayout>
+        android:background="@color/black"
+        android:fontFamily="@font/roboto"
+        android:orientation="vertical"></LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,24 @@
+<?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">
+
+    <RadioGroup
+        android:id="@+id/settings_language_choice"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1" >
+
+        <RadioButton
+            android:id="@+id/radio_button_language_cz"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lang_cz" />
+
+        <RadioButton
+            android:id="@+id/radio_button_language_en"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lang_en" />
+    </RadioGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
    <item
-        android:id="@+id/item_sign_in"
-        android:title="@string/sign_in" />
+        android:id="@+id/item_settings"
+        android:title="@string/settings" />
+    <item
+        android:id="@+id/item_refresh"
+        android:title="@string/refresh" />
    <item
        android:id="@+id/item_sign_out"
        android:title="@string/sign_out" />
    <item
-        android:id="@+id/item_refresh"
-        android:icon="@android:drawable/ic_popup_sync"
-        android:title="@string/refresh" />
-    <item
-        android:id="@+id/item_settings"
-        android:icon="@android:drawable/ic_menu_manage"
-        android:title="@string/settings" />
+        android:id="@+id/item_sign_in"
+        android:title="@string/sign_in" />
 </menu>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/left_arrow_background"/>
+    <foreground android:drawable="@mipmap/left_arrow_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/left_arrow_background"/>
+    <foreground android:drawable="@mipmap/left_arrow_foreground"/>
+</adaptive-icon>
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Solen" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFED7D31</color>
-    <color name="purple_500">#FF6C5F5B</color>
-    <color name="purple_700">#FF000000</color>
-    <!--<color name="purple_700">#FF4F4A45</color>-->
-    <color name="teal_200">#FFF6F1EE</color>
-    <color name="teal_700">#FFF6F1EE</color>
+    <color name="primary">#FFED7D31</color>
+    <color name="secondary">#FF000000</color>
+
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>

@@ -6,7 +6,13 @@
    <string name="splash_image">splash image</string>
    <string name="background">background</string>
    <string name="settings">Nastavení</string>
-    <string name="sign_in">Přihlásit se</string>
+    <string name="sign_in">Změnit přihlášení</string>
    <string name="sign_out">Odhlásit se</string>
    <string name="refresh">Znovu načíst data</string>
+    <string name="back_button">Back button</string>
+    <string name="lang_cz">Čeština</string>
+    <string name="lang_en">English</string>
+    <string name="lang_change">Změnit jazyk</string>
+    <string name="lang_choose">Vybrat</string>
+    <string name="splash_screen">splash screen</string>
 </resources>
@@ -1,17 +1,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
    <!-- Base application theme. -->
    <style name="Theme.Solen" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+
        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary</item>
        <item name="colorOnPrimary">@color/white</item>
        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorSecondaryVariant">@color/secondary</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+        <item name="android:statusBarColor">@color/black</item>
+        <!-- Background color -->
+        <item name="android:colorBackground">@color/black</item>
    </style>

    <style name="Theme.Solen.NoActionBar">
@@ -24,4 +28,11 @@
    <style name="Theme.Solen.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
        <item name="android:textColor">@color/white</item>
    </style>
+
+    <style name="Theme.Solen.FullScreenDialog" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
 </resources>