update README

This commit is contained in:
Odweta
2024-03-27 15:02:58 +01:00
parent f4131d504a
commit e7f6b8eab4
3 changed files with 24 additions and 25 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
![solon-logo](./solon_logo.png) ![solon-logo](./solon_logo.png)
# Zorientujte se rychleji v této odlehčené verzi Školy OnLine # Zorientujte se rychleji v této odlehčené verzi Školy OnLine
# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false) (verze 1.0.6) # Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false) (verze 1.0.6, určeno pro verzi Androidu 9-11, na jiných verzích se zobrazování může lišit)
@@ -263,7 +263,7 @@ class DayFragment : Fragment() {
val nameDateTextView = TextView(requireContext()) val nameDateTextView = TextView(requireContext())
nameDateTextView.text = String.format("%s %s", day.name, day.date) nameDateTextView.text = String.format("%s %s", day.name, day.date)
nameDateTextView.setTypeface(customFont, Typeface.BOLD_ITALIC) nameDateTextView.setTypeface(customFont, Typeface.BOLD_ITALIC)
nameDateTextView.setAutoSizeTextTypeUniformWithConfiguration(75, 90, 1, 0) nameDateTextView.textSize = 28f
nameDateTextView.setTextColor( nameDateTextView.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
requireContext(), requireContext(),
@@ -366,7 +366,7 @@ class DayFragment : Fragment() {
val subjectNumberTextView = TextView(requireContext()) val subjectNumberTextView = TextView(requireContext())
subjectNumberTextView.typeface = customFont subjectNumberTextView.typeface = customFont
subjectNumberTextView.text = subj.number subjectNumberTextView.text = subj.number
subjectNumberTextView.setAutoSizeTextTypeUniformWithConfiguration(60, 80, 1, 0) subjectNumberTextView.textSize = 33f
subjectNumberTextView.setPadding(20, 20, 20, 20) subjectNumberTextView.setPadding(20, 20, 20, 20)
subjectNumberTextView.gravity = Gravity.CENTER // Center text vertically subjectNumberTextView.gravity = Gravity.CENTER // Center text vertically
subjectNumberTextView.setTextColor( subjectNumberTextView.setTextColor(
@@ -391,13 +391,16 @@ class DayFragment : Fragment() {
subjectLayout.addView(frameLayout) subjectLayout.addView(frameLayout)
} }
val namePlaceLL = LinearLayout(requireContext())
namePlaceLL.orientation = LinearLayout.VERTICAL
val subjectNameTextView = TextView(requireContext()) val subjectNameTextView = TextView(requireContext())
if (subj.name != "Volno") { if (subj.name != "Volno") {
subjectNameTextView.text = subj.name.uppercase() subjectNameTextView.text = subj.name.uppercase()
} }
subjectNameTextView.setTypeface(customFont, Typeface.BOLD) subjectNameTextView.setTypeface(customFont, Typeface.BOLD)
subjectNameTextView.setAutoSizeTextTypeUniformWithConfiguration(70, 85, 1, 0) subjectNameTextView.textSize = 29f
subjectNameTextView.setPadding(60, 35, 0, 35) subjectNameTextView.setPadding(0, 0, 0, 0)
subjectNameTextView.gravity = Gravity.CENTER_VERTICAL subjectNameTextView.gravity = Gravity.CENTER_VERTICAL
subjectNameTextView.setTextColor( subjectNameTextView.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
@@ -405,27 +408,21 @@ class DayFragment : Fragment() {
R.color.white R.color.white
) )
) )
subjectNameTextView.layoutParams = LinearLayout.LayoutParams(
(2 * Util.getDisplayWidth(requireContext())) / 9,
LinearLayout.LayoutParams.MATCH_PARENT
)
subjectLayout.addView(subjectNameTextView) if (!subj.free) {
namePlaceLL.addView(subjectNameTextView)
}
val subjectPlaceTextView = TextView(requireContext()) val subjectPlaceTextView = TextView(requireContext())
subjectPlaceTextView.typeface = customFont subjectPlaceTextView.typeface = customFont
subjectPlaceTextView.text = subj.place subjectPlaceTextView.text = subj.place
subjectPlaceTextView.setPadding(20, 20, 20, 20) subjectPlaceTextView.setPadding(0, 0, 0, 0)
if (subj.free) { if (subj.free) {
// italic // italic
subjectPlaceTextView.setTypeface(customFont, Typeface.ITALIC) subjectPlaceTextView.setTypeface(customFont, Typeface.ITALIC)
} }
subjectPlaceTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 85, 1, 0) subjectPlaceTextView.textSize = 22f
subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL
subjectPlaceTextView.layoutParams = LinearLayout.LayoutParams(
Util.getDisplayWidth(requireContext())/4+30,
110
)
subjectPlaceTextView.setTextColor( subjectPlaceTextView.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
requireContext(), requireContext(),
@@ -434,9 +431,13 @@ class DayFragment : Fragment() {
) )
if (subj.substitute != "2") { if (subj.substitute != "2") {
subjectLayout.addView(subjectPlaceTextView) namePlaceLL.addView(subjectPlaceTextView)
} }
namePlaceLL.setPadding(30, 0, 0, 0)
subjectLayout.addView(namePlaceLL)
val params = LinearLayout.LayoutParams( val params = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT LinearLayout.LayoutParams.MATCH_PARENT
@@ -452,13 +453,10 @@ class DayFragment : Fragment() {
val subjectTimeString = subj.start + "" + subj.end val subjectTimeString = subj.start + "" + subj.end
subjectTimeTextView.typeface = customFont subjectTimeTextView.typeface = customFont
subjectTimeTextView.text = subjectTimeString subjectTimeTextView.text = subjectTimeString
subjectTimeTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 75, 1, 0) subjectTimeTextView.textSize = 20f
subjectTimeTextView.setPadding(10, 0, 20, 0) subjectTimeTextView.setPadding(10, 0, 20, 0)
subjectTimeTextView.gravity = Gravity.END subjectTimeTextView.gravity = Gravity.END
subjectTimeTextView.layoutParams = LinearLayout.LayoutParams( subjectTimeTextView.isSingleLine = true
Util.getDisplayWidth(requireContext())/3+20,
70
)
subjectTimeTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTimeTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END
subjectTimeTextView.setTextColor( subjectTimeTextView.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
@@ -470,7 +468,7 @@ class DayFragment : Fragment() {
val subjectTeacherTextView = TextView(requireContext()) val subjectTeacherTextView = TextView(requireContext())
subjectTeacherTextView.text = subj.teacher subjectTeacherTextView.text = subj.teacher
subjectTeacherTextView.typeface = customFont subjectTeacherTextView.typeface = customFont
subjectTeacherTextView.setAutoSizeTextTypeUniformWithConfiguration(30, 31, 1, 0) subjectTeacherTextView.textSize = 15f
subjectTeacherTextView.setPadding(0, 10, 20, 10) subjectTeacherTextView.setPadding(0, 10, 20, 10)
subjectTeacherTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTeacherTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END
subjectTeacherTextView.setTextColor( subjectTeacherTextView.setTextColor(
@@ -530,11 +528,12 @@ class DayFragment : Fragment() {
) )
if (subj.substitute == "2") { if (subj.substitute == "2") {
namePlaceLL.textAlignment = View.TEXT_ALIGNMENT_CENTER
namePlaceLL.setPadding(0, 0, 0, 0)
subjectNameTextView.layoutParams = LinearLayout.LayoutParams( subjectNameTextView.layoutParams = LinearLayout.LayoutParams(
subjectLayout.width, subjectLayout.width,
LinearLayout.LayoutParams.MATCH_PARENT LinearLayout.LayoutParams.MATCH_PARENT
) )
subjectNameTextView.setPadding(30, 35, 30, 35)
subjectNameTextView.textAlignment = View.TEXT_ALIGNMENT_CENTER subjectNameTextView.textAlignment = View.TEXT_ALIGNMENT_CENTER
subjectNameTextView.gravity = Gravity.CENTER_VERTICAL subjectNameTextView.gravity = Gravity.CENTER_VERTICAL
} }
+1 -1
View File
@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.3.0" apply false id("com.android.application") version "8.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false id("org.jetbrains.kotlin.android") version "1.9.22" apply false
} }