diff --git a/README.md b/README.md index dea733d..2959cd5 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.7, na některých verzích Androidu se zobrazování může jevit špatně - konkrétně Android 12 je problémový) +# 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.8, funguje nejlépe na displejích s xxhdpi hustotou pixelů) diff --git a/mobile/.idea/deploymentTargetSelector.xml b/mobile/.idea/deploymentTargetSelector.xml index b268ef3..5a312d0 100644 --- a/mobile/.idea/deploymentTargetSelector.xml +++ b/mobile/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index 8d365b7..6b0d671 100644 --- a/mobile/app/build.gradle.kts +++ b/mobile/app/build.gradle.kts @@ -12,7 +12,7 @@ android { minSdk = 28 targetSdk = 34 versionCode = 1 - versionName = "1.0.7" + versionName = "1.0.8" } buildTypes { diff --git a/mobile/app/src/main/java/com/odweta/solon/AboutFragment.kt b/mobile/app/src/main/java/com/odweta/solon/AboutFragment.kt index f38bfe7..d304727 100644 --- a/mobile/app/src/main/java/com/odweta/solon/AboutFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/AboutFragment.kt @@ -50,10 +50,10 @@ class AboutFragment : DialogFragment() { val link = view.findViewById(R.id.link) val underlinedText = SpannableString(link.text) - underlinedText.setSpan(UnderlineSpan(), 1, link.text.length, 0) + underlinedText.setSpan(UnderlineSpan(), 8, link.text.length, 0) link.text = underlinedText - makeTextViewClickable(link, "https://gitlab.com/Odweta", 1) + makeTextViewClickable(link, "https://gitlab.com/Odweta", 8) val srcLink = view.findViewById(R.id.sourceCode) 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 742ccf9..829f7bd 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.textSize = 28f + //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.textSize = 33f + //subjectNumberTextView.textSize = 33f subjectNumberTextView.setPadding(20, 20, 20, 20) subjectNumberTextView.gravity = Gravity.CENTER // Center text vertically subjectNumberTextView.setTextColor( @@ -399,7 +399,7 @@ class DayFragment : Fragment() { subjectNameTextView.text = subj.name.uppercase() } subjectNameTextView.setTypeface(customFont, Typeface.BOLD) - subjectNameTextView.textSize = 29f + //subjectNameTextView.textSize = 29f subjectNameTextView.setPadding(0, 0, 0, 0) subjectNameTextView.gravity = Gravity.CENTER_VERTICAL subjectNameTextView.setTextColor( @@ -422,7 +422,7 @@ class DayFragment : Fragment() { subjectPlaceTextView.setTypeface(customFont, Typeface.ITALIC) subjectPlaceTextView.text = "Volno " } - subjectPlaceTextView.textSize = 22f + //subjectPlaceTextView.textSize = 22f subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL subjectPlaceTextView.setTextColor( ContextCompat.getColor( @@ -454,7 +454,7 @@ class DayFragment : Fragment() { val subjectTimeString = subj.start + "–" + subj.end subjectTimeTextView.typeface = customFont subjectTimeTextView.text = subjectTimeString - subjectTimeTextView.textSize = 20f + //subjectTimeTextView.textSize = 20f subjectTimeTextView.setPadding(10, 0, 20, 0) subjectTimeTextView.gravity = Gravity.END subjectTimeTextView.isSingleLine = true @@ -469,7 +469,7 @@ class DayFragment : Fragment() { val subjectTeacherTextView = TextView(requireContext()) subjectTeacherTextView.text = subj.teacher subjectTeacherTextView.typeface = customFont - subjectTeacherTextView.textSize = 15f + //subjectTeacherTextView.textSize = 15f subjectTeacherTextView.setPadding(0, 10, 20, 10) subjectTeacherTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTeacherTextView.setTextColor( @@ -575,6 +575,18 @@ class DayFragment : Fragment() { dayLayout.addView(subjectSeparator) } + subjectNumberTextView.textSize = resources.getDimension(R.dimen.text_size_subject_number) / resources.displayMetrics.scaledDensity + subjectNameTextView.textSize = resources.getDimension(R.dimen.text_size_subject_name) / resources.displayMetrics.scaledDensity + if (subj.free) { + subjectPlaceTextView.textSize = + resources.getDimension(R.dimen.text_size_subject_place_free) / resources.displayMetrics.scaledDensity + } else { + subjectPlaceTextView.textSize = + resources.getDimension(R.dimen.text_size_subject_place) / resources.displayMetrics.scaledDensity + } + subjectTimeTextView.textSize = resources.getDimension(R.dimen.text_size_subject_time) / resources.displayMetrics.scaledDensity + subjectTeacherTextView.textSize = resources.getDimension(R.dimen.text_size_subject_teacher) / resources.displayMetrics.scaledDensity + dayLayout.addView(subjectLayout) prevSubj = subj @@ -593,7 +605,7 @@ class DayFragment : Fragment() { Vars.dayEndString = "Den končí v $endTime" dayEndTextView.text = Vars.dayEndString dayEndTextView.typeface = customFont - dayEndTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 85, 1, 0) + //dayEndTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 85, 1, 0) dayEndTextView.setPadding(0, 25, 0, 25) dayEndTextView.textAlignment = View.TEXT_ALIGNMENT_CENTER dayEndTextView.gravity = Gravity.CENTER @@ -661,6 +673,9 @@ class DayFragment : Fragment() { ) rootLayout.addView(sepr) + + nameDateTextView.textSize = resources.getDimension(R.dimen.text_size_name_date) / resources.displayMetrics.scaledDensity + dayEndTextView.textSize = resources.getDimension(R.dimen.text_size_day_end) / resources.displayMetrics.scaledDensity } } diff --git a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt index dff9692..8f730e0 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt @@ -37,7 +37,8 @@ class MainFragment : Fragment() { private fun setup(view: View) { toolbar = view.findViewById(R.id.toolbar) - toolbar.setAutoSizeTextTypeUniformWithConfiguration(60, 65, 1, 0) + //toolbar.setAutoSizeTextTypeUniformWithConfiguration(60, 65, 1, 0) + toolbar.textSize = resources.getDimension(R.dimen.text_size_toolbar) / resources.displayMetrics.scaledDensity toolbar.ellipsize = null toolbar.setHorizontallyScrolling(false) diff --git a/mobile/app/src/main/res/layout/activity_about.xml b/mobile/app/src/main/res/layout/activity_about.xml index 7786a7a..eee1091 100644 --- a/mobile/app/src/main/res/layout/activity_about.xml +++ b/mobile/app/src/main/res/layout/activity_about.xml @@ -27,7 +27,7 @@ android:padding="10dp" android:text="@string/about_app" android:textColor="@color/white" - android:textSize="25sp" /> + android:textSize="@dimen/text_size_toolbar" /> @@ -82,30 +82,13 @@ style="@style/LinkText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="1dp" - android:layout_marginEnd="139dp" - android:text="@string/odweta" + android:text="Vývoj: @Odweta" android:textColor="#FFFFFF" android:textFontWeight="400" android:textSize="20sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/textView3" - app:layout_constraintTop_toBottomOf="@+id/textView" - app:layout_constraintVertical_bias="0.3" /> - - diff --git a/mobile/app/src/main/res/values/dimens.xml b/mobile/app/src/main/res/values/dimens.xml index 8a22b39..85eae8b 100644 --- a/mobile/app/src/main/res/values/dimens.xml +++ b/mobile/app/src/main/res/values/dimens.xml @@ -1,4 +1,15 @@ - + 16dp 8dp + 35sp + 40sp + 30sp + 24sp + 28sp + 24sp + 15sp + 28sp + 26sp + 15sp + 15sp \ No newline at end of file diff --git a/release/solon.apk b/release/solon.apk index 8abb83f..8b21094 100644 Binary files a/release/solon.apk and b/release/solon.apk differ