bump version number, UI fixes
This commit is contained in:
@@ -12,7 +12,7 @@ android {
|
||||
minSdk = 28
|
||||
targetSdk = 34
|
||||
versionCode = 1
|
||||
versionName = "1.0.2"
|
||||
versionName = "1.0.3"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"}"""
|
||||
}
|
||||
|
||||
@@ -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<Subject> = 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
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user