diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7ec0e66 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt index 9aabf4d..c9e1e32 100644 --- a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt +++ b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt @@ -1,15 +1,11 @@ package com.denizk0461.studip.activity import android.os.Bundle -import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.core.view.WindowCompat import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp -import android.view.Menu -import android.view.MenuItem -import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle import com.denizk0461.studip.R @@ -86,21 +82,21 @@ class MainActivity : AppCompatActivity() { return true } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - // Inflate the menu; this adds items to the action bar if it is present. - menuInflater.inflate(R.menu.menu_main, menu) - return true - } +// override fun onCreateOptionsMenu(menu: Menu): Boolean { +// // Inflate the menu; this adds items to the action bar if it is present. +// menuInflater.inflate(R.menu.menu_main, menu) +// return true +// } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - return when (item.itemId) { - R.id.action_settings -> true - else -> super.onOptionsItemSelected(item) - } - } +// override fun onOptionsItemSelected(item: MenuItem): Boolean { +// // Handle action bar item clicks here. The action bar will +// // automatically handle clicks on the Home/Up button, so long +// // as you specify a parent activity in AndroidManifest.xml. +// return when (item.itemId) { +// R.id.action_settings -> true +// else -> super.onOptionsItemSelected(item) +// } +// } override fun onSupportNavigateUp(): Boolean { val navController = findNavController(R.id.nav_host_fragment_content_main) @@ -108,14 +104,14 @@ class MainActivity : AppCompatActivity() { || super.onSupportNavigateUp() } - private fun getFragmentByType(type: FragmentType): Fragment { -// Log.d("AAA!", "help") - return when (type) { - FragmentType.SCHEDULE -> EventFragment() - FragmentType.FOOD -> FoodFragment() // TODO once this fragment has been implemented - FragmentType.SETTINGS -> SettingsFragment() - } - } +// private fun getFragmentByType(type: FragmentType): Fragment { +//// Log.d("AAA!", "help") +// return when (type) { +// FragmentType.SCHEDULE -> EventFragment() +// FragmentType.FOOD -> FoodFragment() +// FragmentType.SETTINGS -> SettingsFragment() +// } +// } private fun bottomIdToType(id: Int): FragmentType = when (id) { R.id.food -> FragmentType.FOOD diff --git a/app/src/main/java/com/denizk0461/studip/adapter/StudIPEventAdapter.kt b/app/src/main/java/com/denizk0461/studip/adapter/StudIPEventAdapter.kt index ddf34e9..9772888 100644 --- a/app/src/main/java/com/denizk0461/studip/adapter/StudIPEventAdapter.kt +++ b/app/src/main/java/com/denizk0461/studip/adapter/StudIPEventAdapter.kt @@ -1,11 +1,7 @@ package com.denizk0461.studip.adapter -import android.content.res.ColorStateList -import android.util.AttributeSet -import android.util.Log import android.util.TypedValue import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.denizk0461.studip.R @@ -49,20 +45,14 @@ class StudIPEventAdapter( theme.resolveAttribute(R.attr.colorPrimary, colorPrimary, true) theme.resolveAttribute(R.attr.colorTextHintLighter, colorTextHint, true) -// Log.d("eek!", holder.binding.cardBackground.strokeWidth.toString()) - if (!isAnyCourseHighlighted && currentItem.isCurrentCourse(currentCalendar)) { // highlight isAnyCourseHighlighted = true -// holder.binding.textTitle.setTextColor(colorHighlight.data) holder.binding.cardBackground.strokeColor = colorPrimary.data holder.binding.cardBackground.strokeWidth = 6 -// holder.binding.cardBackground.cardForegroundColor = holder.binding.root.context.getColorStateList( // R.color.list_card_selected) } else { // un-highlight -// holder.binding.textTitle.setTextColor(colorUnhighlight.data) holder.binding.cardBackground.strokeColor = colorTextHint.data holder.binding.cardBackground.strokeWidth = 3 -// holder.binding.cardBackground.cardForegroundColor = Color.TRANSPARENT } holder.binding.cardBackground.setOnClickListener { @@ -77,15 +67,9 @@ class StudIPEventAdapter( } - private fun StudIPEvent.isCurrentCourse(calendar: Calendar): Boolean { -// if (calendar.get(Calendar.DAY_OF_WEEK) == this.day.toCalendarDay()) { - if (Calendar.THURSDAY == this.day.toCalendarDay()) { - if ((calendar.get(Calendar.MINUTE) + calendar.get(Calendar.HOUR_OF_DAY) * 60) < this.timeslotEnd.parseToMinutes()) { - return true - } - } - return false - } + private fun StudIPEvent.isCurrentCourse(calendar: Calendar): Boolean = + (calendar.get(Calendar.DAY_OF_WEEK) == this.day.toCalendarDay()) && + ((calendar.get(Calendar.MINUTE) + calendar.get(Calendar.HOUR_OF_DAY) * 60) < this.timeslotEnd.parseToMinutes()) // Converts day as defined in StudIPEvent.kt to day from Calendar private fun Int.toCalendarDay(): Int = when (this) { diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index d8d9987..c179fc4 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -37,8 +37,7 @@ app:layout_constraintBottom_toTopOf="@+id/nav_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/toolbar" - app:navGraph="@navigation/nav_graph"/> + app:layout_constraintTop_toBottomOf="@+id/toolbar"/> + android:textAlignment="center" + tools:ignore="SmallSp" /> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml deleted file mode 100644 index 54f4d8f..0000000 --- a/app/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml deleted file mode 100644 index ceb618b..0000000 --- a/app/src/main/res/navigation/nav_graph.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml new file mode 100644 index 0000000..e2bb88b --- /dev/null +++ b/app/src/main/res/values-de/strings.xml @@ -0,0 +1,32 @@ + + Stud.IP Timetable + + MONTAG + DIENSTAG + MITTWOCH + DONNERSTAG + FREITAG + + Dein Stundenplan + Mensen-Angebote + App-Einstellungen + + Stundenplan + esn + Einstellungen + + Dein Stundenplan wurde aktualisiert! + + Allgemein + Sonstiges + + Aktualisiere deinen Stud.IP-Stundenplan + Dies wird alle Anpassungen löschen! + Nutze akademisches Viertel + Wo es passt + App-Verison + + mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__* + + In our hearts, she lives forevermore + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 08f6c54..27eee04 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,11 +1,5 @@ Stud.IP Timetable - Settings - - First Fragment - Second Fragment - Next - Previous MONDAY TUESDAY @@ -28,7 +22,7 @@ Refresh your Stud.IP schedule This will clear any customisations! - Show academic quarter + Use academic quarter Where applicable App Version