odweta/solon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui redesign, marks v1 done, gonna build the next release

Browse Source
This commit is contained in:
Odweta
2024-02-07 21:41:09 +01:00
parent 9ea5758eac
commit 7f7b22029a
25 changed files with 740 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/app/src/main/res/drawable/button_background.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
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" />
</shape>
mobile/app/src/main/res/drawable/squiggly_line_100x100.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

mobile/app/src/main/res/drawable/squiggly_line_20x20.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

mobile/app/src/main/res/layout/activity_about.xml
+35 -22
View File
@@ -42,10 +42,10 @@
<TextView
android:id="@+id/textView"
android:layout_width="299dp"
android:layout_height="100dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="300dp"
android:text="Vylepšená verze školního informačního systému ŠkolaOnLine."
android:text="Vylepšená verze mobilní aplikace ŠkolaOnLine"
android:textAlignment="center"
android:textColor="#FFFFFF"
android:textSize="24sp"
@@ -54,7 +54,23 @@
app:layout_constraintHorizontal_bias="0.416"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:layout_constraintVertical_bias="0.804" />
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" />
<TextView
android:id="@+id/link"
@@ -64,7 +80,6 @@
android:layout_marginStart="1dp"
android:layout_marginTop="70dp"
android:layout_marginEnd="139dp"
android:layout_marginBottom="188dp"
android:text=" Odweta"
android:textColor="#FFFFFF"
android:textFontWeight="400"
@@ -74,24 +89,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="1.0" />
<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:layout_marginBottom="188dp"
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="1.0" />
app:layout_constraintVertical_bias="0.106" />
<ImageView
android:id="@+id/imageView7"
@@ -123,4 +121,19 @@
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" />
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_cal_week.xml
-5
View File
@@ -12,9 +12,4 @@
android:id="@+id/dayPager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_loading_with_bar.xml
-51
View File
@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.Solen.AppBarOverlay"
tools:ignore="MissingConstraints">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.Solen.PopupOverlay"
app:theme="@style/Theme.Solen.AppBarOverlay"/>
<TextView
android:id="@+id/loadingTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="93dp"
android:layout_marginTop="332dp"
android:layout_marginEnd="94dp"
android:layout_marginBottom="332dp"
android:gravity="center"
android:text="Načítání..."
android:textSize="50sp"
android:fontFamily="@font/roboto"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/dayPager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.google.android.material.appbar.AppBarLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_main.xml
+27 -31
View File
@@ -8,46 +8,42 @@
tools:context=".MainActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/roboto_src"
android:theme="@style/Theme.Solen.AppBarOverlay"
app:popupTheme="@style/Theme.Solen.PopupOverlay">
android:id="@+id/toolbarFrame"
android:background="@color/black">
<androidx.appcompat.widget.Toolbar
<TextView
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:subtitle=""
app:title="" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/dayPager"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.viewpager2.widget.ViewPager2>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
android:layout_height="wrap_content"
android:background="@drawable/button_background"
android:gravity="center"
android:layout_marginTop="20dp"
android:layout_marginHorizontal="5dp"
android:padding="10dp"
android:textColor="@color/white"
android:textSize="25dp" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/black"
app:layout_constraintBottom_toTopOf="@+id/bottomNav"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbarFrame"
app:layout_constraintVertical_bias="0.0" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNav"
android:layout_width="match_parent"
android:layout_height="60dp"
android:scrollIndicators="left"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/fragmentContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout2"
app:layout_constraintVertical_bias="1.0"
app:menu="@menu/menu_navbar"
tools:layout_editor_absoluteX="0dp" />
app:menu="@menu/menu_navbar" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_marks.xml
+19 -14
View File
@@ -6,21 +6,26 @@
android:layout_height="match_parent"
android:background="@color/black">
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="146dp"
android:layout_marginTop="262dp"
android:layout_marginEnd="182dp"
android:layout_marginBottom="442dp"
android:text="ZNAMKY"
android:textColor="#FFFFFF"
android:textSize="20sp"
<ScrollView
android:id="@+id/scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
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:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="1dp"
android:orientation="vertical">
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_menu.xml
+23 -12
View File
@@ -9,52 +9,63 @@
<Button
android:id="@+id/menu_button_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="190dp"
android:layout_height="80dp"
android:layout_marginTop="200dp"
android:layout_marginBottom="50dp"
android:text="@string/settings"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/menu_button_sign_out"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/button_background"/>
<Button
android:id="@+id/menu_button_sign_out"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="190dp"
android:layout_height="80dp"
android:layout_marginBottom="50dp"
android:text="@string/sign_out"
android:textSize="20sp"
app:cornerRadius="@dimen/corner_radius"
app:layout_constraintBottom_toTopOf="@+id/menu_button_sign_in"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/menu_button_settings" />
app:layout_constraintTop_toBottomOf="@+id/menu_button_settings"
android:background="@drawable/button_background" />
<Button
android:id="@+id/menu_button_sign_in"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="190dp"
android:layout_height="80dp"
android:layout_marginBottom="50dp"
android:text="@string/sign_in"
android:textSize="20sp"
app:cornerRadius="@dimen/corner_radius"
app:layout_constraintBottom_toTopOf="@+id/menu_button_about"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_out" />
app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_out"
android:background="@drawable/button_background" />
<Button
android:id="@+id/menu_button_about"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="190dp"
android:layout_height="80dp"
android:layout_marginStart="158dp"
android:layout_marginEnd="159dp"
android:layout_marginBottom="200dp"
android:text="@string/about_app"
android:textSize="20sp"
app:cornerRadius="@dimen/corner_radius"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_in" />
app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_in"
android:background="@drawable/button_background" />
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_settings.xml
+11 -2
View File
@@ -49,7 +49,11 @@
android:id="@+id/setting_language"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:paddingRight="20dp"
android:paddingBottom="10dp">
<TextView
android:id="@+id/settings_language_text"
@@ -57,6 +61,10 @@
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
@@ -64,7 +72,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/lang_choose" />
android:text="@string/lang_choose"
android:background="@drawable/button_background" />
</LinearLayout>
</LinearLayout>
mobile/app/src/main/res/layout/activity_sign_in.xml
+11 -8
View File
@@ -9,20 +9,19 @@
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:layout_constraintVertical_bias="0.528"
app:srcCompat="@drawable/solen" />
<EditText
android:id="@+id/usernameField"
android:layout_width="237dp"
android:layout_width="240dp"
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"
@@ -30,19 +29,21 @@
android:paddingHorizontal="20dp"
android:textColor="@color/white"
android:textColorHighlight="@color/white"
android:textColorHint="@color/white"
android:textColorHint="#C8FFFFFF"
android:textColorLink="@color/white"
android:theme="@style/sign_in_field"
app:circularflow_radiusInDP="20dp"
app:layout_constraintBottom_toTopOf="@+id/passwordField"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.85" />
<EditText
android:id="@+id/passwordField"
android:layout_width="237dp"
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginBottom="288dp"
android:layout_marginBottom="224dp"
android:background="@color/primary"
android:ems="10"
android:hint="Heslo"
@@ -50,8 +51,9 @@
android:paddingHorizontal="20dp"
android:textColor="@color/white"
android:textColorHighlight="@color/white"
android:textColorHint="@color/white"
android:textColorHint="#C8FFFFFF"
android:textColorLink="@color/white"
android:theme="@style/sign_in_field"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -66,6 +68,7 @@
android:layout_marginBottom="88dp"
android:text="Přihlásit se"
android:textSize="20sp"
app:cornerRadius="@dimen/corner_radius"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
mobile/app/src/main/res/squiggly_line_20x20.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

mobile/app/src/main/res/values/colors.xml
+24 -4
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary">#FFED7D31</color>
<color name="old_primary">#FFED7D31</color>
<color name="primary">#FFFF9933</color>
<color name="secondary">#FF000000</color>
<color name="black">#FF000000</color>
@@ -8,9 +9,28 @@
<color name="red">#FFFF0000</color>
<color name="gray_69">#FF696969</color>
<color name="pastel_red">#FFFF6666</color>
<color name="pastel_green">#FF00CC99</color>
<color name="pastel_blue">#FF6699CC</color>
<color name="pastel_orange">#FFFF9933</color>
<color name="pastel_yellow">#FFFFCC33</color>
<color name="pastel_red_transparent">#50FF6666</color>
<color name="pastel_green_transparent">#5000CC99</color>
<color name="pastel_blue_transparent">#506699CC</color>
<color name="pastel_orange_transparent">#50FF9933</color>
<color name="pastel_yellow_transparent">#50FFCC33</color>
<color name="cal_week_bg">#FF696969</color>
<color name="cal_week_subject">#FFF1F1F1</color>
<color name="cal_week_substitute">#FD411E</color>
<color name="cal_week_event">#FFFDAA22</color>
<color name="cal_week_free">#FFAAFF66</color>
<color name="cal_week_substitute">#FFFF6666</color>
<color name="cal_week_substitute_transparent_bg">#50FF6666</color>
<!--<color name="cal_week_event">#FFFDAA22</color>
<color name="cal_week_event_transparent_bg">#50FDAA22</color>-->
<color name="cal_week_event">#FF6699CC</color>
<color name="cal_week_event_transparent_bg">#506699CC</color>
<color name="cal_week_free">#FF00CC99</color>
<color name="cal_week_free_transparent_bg">#5000CC99</color>
<color name="primary_transparent_bg">#50ED7D31</color>
</resources>
mobile/app/src/main/res/values/themes.xml
+5
View File
@@ -70,4 +70,9 @@
<item name="android:linksClickable">true</item>
</style>
<style name="sign_in_field">
<item name="android:strokeColor">@color/white</item>
<item name="android:strokeWidth">5</item>
<item name="cornerRadius">@dimen/corner_radius</item>
</style>
</resources>