diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index dc77eaa..989b83a 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.2" + versionName = "1.0.3" } buildTypes { 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 3c58a70..80e3a8a 100644 --- a/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt @@ -412,6 +412,10 @@ class DayFragment : Fragment() { } subjectPlaceTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 85, 1, 0) subjectPlaceTextView.gravity = Gravity.CENTER_VERTICAL + subjectPlaceTextView.layoutParams = LinearLayout.LayoutParams( + Util.getDisplayWidth(requireContext())/4+30, + 110 + ) subjectPlaceTextView.setTextColor( ContextCompat.getColor( requireContext(), @@ -440,6 +444,11 @@ class DayFragment : Fragment() { subjectTimeTextView.text = subjectTimeString subjectTimeTextView.setAutoSizeTextTypeUniformWithConfiguration(55, 75, 1, 0) subjectTimeTextView.setPadding(10, 0, 20, 0) + subjectTimeTextView.gravity = Gravity.END + subjectTimeTextView.layoutParams = LinearLayout.LayoutParams( + Util.getDisplayWidth(requireContext())/3+20, + 70 + ) subjectTimeTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTimeTextView.setTextColor( ContextCompat.getColor( @@ -452,7 +461,7 @@ class DayFragment : Fragment() { subjectTeacherTextView.text = subj.teacher subjectTeacherTextView.typeface = customFont subjectTeacherTextView.setAutoSizeTextTypeUniformWithConfiguration(30, 31, 1, 0) - subjectTeacherTextView.setPadding(0, 0, 20, 10) + subjectTeacherTextView.setPadding(0, 10, 20, 10) subjectTeacherTextView.textAlignment = View.TEXT_ALIGNMENT_TEXT_END subjectTeacherTextView.setTextColor( ContextCompat.getColor( diff --git a/mobile/app/src/main/java/com/odweta/solon/Dialogs.kt b/mobile/app/src/main/java/com/odweta/solon/Dialogs.kt index b7b3d7d..5bcda77 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Dialogs.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Dialogs.kt @@ -3,11 +3,8 @@ package com.odweta.solon import android.annotation.SuppressLint import android.app.AlertDialog import android.content.Context -import android.content.res.Resources -import android.util.Log import android.view.LayoutInflater import androidx.core.content.ContextCompat -import androidx.core.content.res.ResourcesCompat class Dialogs { @SuppressLint("InflateParams") 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 20d7288..21639a2 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt @@ -1,7 +1,6 @@ package com.odweta.solon import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/mobile/app/src/main/java/com/odweta/solon/MarkDetailsFragment.kt b/mobile/app/src/main/java/com/odweta/solon/MarkDetailsFragment.kt index 3875a07..13465c1 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MarkDetailsFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MarkDetailsFragment.kt @@ -3,10 +3,7 @@ package com.odweta.solon import android.annotation.SuppressLint import android.app.Dialog import android.graphics.Typeface -import android.graphics.drawable.Drawable -import android.graphics.drawable.GradientDrawable import android.os.Bundle -import android.util.Log import android.view.GestureDetector import android.view.Gravity import android.view.LayoutInflater @@ -17,15 +14,10 @@ import android.view.Window import android.widget.LinearLayout import android.widget.ScrollView import android.widget.Space -import android.widget.TableLayout -import android.widget.TableRow import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.DialogFragment -import java.text.SimpleDateFormat -import kotlin.math.abs - // details for the marks of one subject class MarkDetailsFragment : DialogFragment() { diff --git a/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt b/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt index f84b33c..756fee1 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt @@ -3,7 +3,6 @@ package com.odweta.solon import android.graphics.Typeface import android.graphics.drawable.GradientDrawable import android.os.Bundle -import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.View diff --git a/mobile/app/src/main/java/com/odweta/solon/Network.kt b/mobile/app/src/main/java/com/odweta/solon/Network.kt index aa89cd9..8a79d8f 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Network.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Network.kt @@ -1,6 +1,5 @@ package com.odweta.solon -import android.util.Log import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.FormBody @@ -144,10 +143,7 @@ class Network { try { val resp = Vars.client.newCall(request).execute() - val s = resp.body?.string().toString() - val s2 = JSONObject(s).getJSONArray("days").getString(1) - Log.d("TIMETABLE", s2) - s + resp.body?.string().toString() } catch (e: IOException) { """{"error": "network"}""" } diff --git a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt index 019ca40..3baa2db 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt @@ -1,6 +1,5 @@ package com.odweta.solon -import android.util.Log import org.json.JSONObject import java.time.LocalDateTime import java.time.format.DateTimeFormatter @@ -263,11 +262,12 @@ class Parsing { day.date = date day.subjects = auxSubjects + // get rid of dulicates val nextSubjects: MutableList = mutableListOf() var prevSubject: Subject = Subject.empty() for (s in day.subjects) { - if (prevSubject.name != s.name) { + if (prevSubject.name != s.name || s.substitute != "2") { nextSubjects.add(s) } prevSubject = s diff --git a/release/solon.apk b/release/solon.apk index 2959ee1..a67e1ce 100644 Binary files a/release/solon.apk and b/release/solon.apk differ