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

made 0.8 release, cosmetic fixes, added scrollviews into mark fragments for accessibility (people w/ small phones)

Browse Source
This commit is contained in:
Odweta
2024-02-16 18:06:06 +01:00
parent 6817dd29b6
commit d789665d4b
29 changed files with 288 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/app/src/main/res/drawable/button_background.xml
-1
View File
@@ -5,5 +5,4 @@
<corners android:radius="@dimen/corner_radius" />
<solid android:color="@color/pastel_yellow_transparent" />
<stroke android:width="5dp" android:color="@color/pastel_yellow" />
</shape>
mobile/app/src/main/res/drawable/button_clicked_background.xml
-1
View File
@@ -5,5 +5,4 @@
<corners android:radius="@dimen/corner_radius" />
<solid android:color="#90FFCC33" />
<stroke android:width="5dp" android:color="@color/pastel_yellow" />
</shape>
mobile/app/src/main/res/layout/activity_mark_details.xml
+17 -7
View File
@@ -5,15 +5,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/one_mark_root"
<ScrollView
android:id="@+id/mark_detail_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
android:layout_marginTop="0dp"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/one_mark_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_marks_one_subject.xml
+15 -5
View File
@@ -4,14 +4,24 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/mark_details_root"
<ScrollView
android:id="@+id/mark_details_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/mark_details_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/layout/activity_sign_in.xml
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView 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"
android:fillViewport="true">
mobile/app/src/main/res/layout/radio_group_language.xml
+2 -2
View File
@@ -15,7 +15,7 @@
android:text="@string/lang_cz"
android:textColor="@color/white"
android:layout_marginHorizontal="20dp"
android:theme="@style/Theme.Solen.RadioButton" />
android:theme="@style/Theme.Solon.RadioButton" />
<RadioButton
android:layout_width="match_parent"
@@ -23,6 +23,6 @@
android:text="@string/lang_en"
android:textColor="@color/white"
android:layout_marginHorizontal="20dp"
android:theme="@style/Theme.Solen.RadioButton" />
android:theme="@style/Theme.Solon.RadioButton" />
</RadioGroup>
</androidx.constraintlayout.widget.ConstraintLayout>
mobile/app/src/main/res/menu/menu_navbar.xml
+1 -61
View File
@@ -19,64 +19,4 @@
android:layout_height="wrap_content"
android:icon="@drawable/menu_240"
android:title="@string/menu" />
</menu>
<!--
options menu for future reference
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/item_settings"
android:title="@string/settings" />
<item
android:id="@+id/item_sign_out"
android:title="@string/sign_out" />
<item
android:id="@+id/item_sign_in"
android:title="@string/sign_in" />
<item
android:id="@+id/item_about"
android:title="@string/about_app" />
</menu>
item click callbacks
// Override onOptionsItemSelected to handle menu item clicks
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
// TODO: IMPLEMENT MARKS/GRADES
// TODO: NOTE -> IN A NAVBAR
/*R.id.item_marks -> {
showMarksScreen()
return true
}*/
R.id.item_sign_in -> {
SignInFragment().show(supportFragmentManager, "fragment_sign_in")
return true
}
R.id.item_settings -> {
showSettingsScreen()
return true
}
R.id.item_sign_out -> {
Dialogs.SignOut(this).show()
return true
}
R.id.item_about -> {
AboutFragment().show(supportFragmentManager, "fragment_about")
return true
}
}
return super.onOptionsItemSelected(item)
}
-->
</menu>
mobile/app/src/main/res/values/dimens.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<resources>
<dimen name="cal_week_separator_height">20dp</dimen>
<dimen name="cal_week_separator_height">16dp</dimen>
<dimen name="corner_radius">8dp</dimen>
</resources>
mobile/app/src/main/res/values/strings.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<string name="slogan">Přehlednost je podstata.</string>
<string name="desc_about">Vylepšená verze mobilní aplikace ŠkolaOnLine</string>
<string name="odweta"> Odweta</string>
<string name="development_vyvoj">Vývoj:</string>
<string name="development_vyvoj">Vývoj: </string>
<string name="source_code">Zdrojový kód</string>
<string name="username">Uživatelské jméno</string>
<string name="password">Heslo</string>
mobile/app/src/main/res/values/themes.xml
+8 -8
View File
@@ -1,6 +1,6 @@
<resources>
<!-- Base application theme. -->
<style name="Theme.Solen" parent="Theme.AppCompat">
<style name="Theme.Solon" parent="Theme.AppCompat">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="iconTint">@color/white</item>
@@ -21,7 +21,7 @@
<item name="android:colorBackground">@color/black</item>
</style>
<style name="LinkText" parent="Theme.Solen">
<style name="LinkText" parent="Theme.Solon">
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
<item name="android:textColor">@color/white</item>
<item name="android:textStyle">normal</item>
@@ -37,26 +37,26 @@
<item name="cornerRadius">@dimen/corner_radius</item>
</style>
<style name="Theme.Solen.RadioButton">
<style name="Theme.Solon.RadioButton">
<item name="colorControlActivated">@color/primary</item>
</style>
<style name="Theme.Solen.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.Solon.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@drawable/alert_dialog_background</item>
<item name="android:buttonBarButtonStyle">@style/Theme.Solen.DialogButton</item>
<item name="android:buttonBarButtonStyle">@style/Theme.Solon.DialogButton</item>
</style>
<style name="Theme.Solen.DialogButton" parent="Widget.AppCompat.Button">
<style name="Theme.Solon.DialogButton" parent="Widget.AppCompat.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@color/transparent</item>
</style>
<style name="Theme.Solen.DialogAnimation">
<style name="Theme.Solon.DialogAnimation">
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
<style name="Theme.Solen.Scrollbar">
<style name="Theme.Solon.Scrollbar">
<item name="color">@color/primary</item>
</style>
</resources>
mobile/app/src/main/res/xml/data_extraction_rules.xml
+1 -1
View File
@@ -5,7 +5,7 @@
-->
<data-extraction-rules>
<cloud-backup>
<!-- TODO: Use <include> and <exclude> to control what is backed up.
<!--
<include .../>
<exclude .../>
-->