From 67b210c4e6ee0ff7d9096ad734e007405c0a4740 Mon Sep 17 00:00:00 2001 From: Odweta Date: Sat, 21 Sep 2024 22:00:00 +0200 Subject: [PATCH] fixwd display layout in weekly timetable --- mobile/.idea/deploymentTargetSelector.xml | 10 ++++++++++ mobile/.idea/misc.xml | 1 + .../src/main/java/com/odweta/solon/CalWeekFragment.kt | 3 ++- mobile/build.gradle.kts | 2 +- mobile/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 mobile/.idea/deploymentTargetSelector.xml diff --git a/mobile/.idea/deploymentTargetSelector.xml b/mobile/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/mobile/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/mobile/.idea/misc.xml b/mobile/.idea/misc.xml index 481db9d..e837843 100644 --- a/mobile/.idea/misc.xml +++ b/mobile/.idea/misc.xml @@ -1,3 +1,4 @@ + 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 61bd855..742ccf9 100644 --- a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt @@ -420,6 +420,7 @@ class DayFragment : Fragment() { if (subj.free) { // italic subjectPlaceTextView.setTypeface(customFont, Typeface.ITALIC) + subjectPlaceTextView.text = "Volno " } subjectPlaceTextView.textSize = 22f subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL @@ -434,7 +435,7 @@ class DayFragment : Fragment() { namePlaceLL.addView(subjectPlaceTextView) } - namePlaceLL.setPadding(30, 0, 0, 0) + namePlaceLL.setPadding(30, 15, 0, 15) subjectLayout.addView(namePlaceLL) diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 98de0e4..898d03c 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.1" apply false + id("com.android.application") version "8.6.0" apply false id("org.jetbrains.kotlin.android") version "1.9.22" apply false } \ No newline at end of file diff --git a/mobile/gradle/wrapper/gradle-wrapper.properties b/mobile/gradle/wrapper/gradle-wrapper.properties index ece3c89..0308a70 100644 --- a/mobile/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jan 07 18:04:36 GMT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists