diff --git a/README.md b/README.md index 2ca2758..c680c9f 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ ![solon-logo](./solon_logo.png) # 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) diff --git a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt index 5de4f71..61bd855 100644 --- a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt @@ -263,7 +263,7 @@ class DayFragment : Fragment() { val nameDateTextView = TextView(requireContext()) nameDateTextView.text = String.format("%s %s", day.name, day.date) nameDateTextView.setTypeface(customFont, Typeface.BOLD_ITALIC) - nameDateTextView.setAutoSizeTextTypeUniformWithConfiguration(75, 90, 1, 0) + nameDateTextView.textSize = 28f nameDateTextView.setTextColor( ContextCompat.getColor( requireContext(), @@ -366,7 +366,7 @@ class DayFragment : Fragment() { val subjectNumberTextView = TextView(requireContext()) subjectNumberTextView.typeface = customFont subjectNumberTextView.text = subj.number - subjectNumberTextView.setAutoSizeTextTypeUniformWithConfiguration(60, 80, 1, 0) + subjectNumberTextView.textSize = 33f subjectNumberTextView.setPadding(20, 20, 20, 20) subjectNumberTextView.gravity = Gravity.CENTER // Center text vertically subjectNumberTextView.setTextColor( @@ -391,13 +391,16 @@ class DayFragment : Fragment() { subjectLayout.addView(frameLayout) } + val namePlaceLL = LinearLayout(requireContext()) + namePlaceLL.orientation = LinearLayout.VERTICAL + val subjectNameTextView = TextView(requireContext()) if (subj.name != "Volno") { subjectNameTextView.text = subj.name.uppercase() } subjectNameTextView.setTypeface(customFont, Typeface.BOLD) - subjectNameTextView.setAutoSizeTextTypeUniformWithConfiguration(70, 85, 1, 0) - subjectNameTextView.setPadding(60, 35, 0, 35) + subjectNameTextView.textSize = 29f + subjectNameTextView.setPadding(0, 0, 0, 0) subjectNameTextView.gravity = Gravity.CENTER_VERTICAL subjectNameTextView.setTextColor( ContextCompat.getColor( @@ -405,27 +408,21 @@ class DayFragment : Fragment() { 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()) subjectPlaceTextView.typeface = customFont subjectPlaceTextView.text = subj.place - subjectPlaceTextView.setPadding(20, 20, 20, 20) + subjectPlaceTextView.setPadding(0, 0, 0, 0) if (subj.free) { // italic subjectPlaceTextView.setTypeface(customFont, Typeface.ITALIC) } - subjectPlaceTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 85, 1, 0) + subjectPlaceTextView.textSize = 22f subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL - subjectPlaceTextView.layoutParams = LinearLayout.LayoutParams( - Util.getDisplayWidth(requireContext())/4+30, - 110 - ) subjectPlaceTextView.setTextColor( ContextCompat.getColor( requireContext(), @@ -434,9 +431,13 @@ class DayFragment : Fragment() { ) if (subj.substitute != "2") { - subjectLayout.addView(subjectPlaceTextView) + namePlaceLL.addView(subjectPlaceTextView) } + namePlaceLL.setPadding(30, 0, 0, 0) + + subjectLayout.addView(namePlaceLL) + val params = LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT @@ -452,13 +453,10 @@ class DayFragment : Fragment() { val subjectTimeString = subj.start + "–" + subj.end subjectTimeTextView.typeface = customFont subjectTimeTextView.text = subjectTimeString - subjectTimeTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 75, 1, 0) + subjectTimeTextView.textSize = 20f subjectTimeTextView.setPadding(10, 0, 20, 0) subjectTimeTextView.gravity = Gravity.END - subjectTimeTextView.layoutParams = LinearLayout.LayoutParams( - Util.getDisplayWidth(requireContext())/3+20, - 70 - ) + subjectTimeTextView.isSingleLine = true subjectTimeTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTimeTextView.setTextColor( ContextCompat.getColor( @@ -470,7 +468,7 @@ class DayFragment : Fragment() { val subjectTeacherTextView = TextView(requireContext()) subjectTeacherTextView.text = subj.teacher subjectTeacherTextView.typeface = customFont - subjectTeacherTextView.setAutoSizeTextTypeUniformWithConfiguration(30, 31, 1, 0) + subjectTeacherTextView.textSize = 15f subjectTeacherTextView.setPadding(0, 10, 20, 10) subjectTeacherTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTeacherTextView.setTextColor( @@ -530,11 +528,12 @@ class DayFragment : Fragment() { ) if (subj.substitute == "2") { + namePlaceLL.textAlignment = View.TEXT_ALIGNMENT_CENTER + namePlaceLL.setPadding(0, 0, 0, 0) subjectNameTextView.layoutParams = LinearLayout.LayoutParams( subjectLayout.width, LinearLayout.LayoutParams.MATCH_PARENT ) - subjectNameTextView.setPadding(30, 35, 30, 35) subjectNameTextView.textAlignment = View.TEXT_ALIGNMENT_CENTER subjectNameTextView.gravity = Gravity.CENTER_VERTICAL } diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 31ed43c..98de0e4 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. 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 } \ No newline at end of file