Ethosa 3 anni fa
parent
commit
35bc9ca637

+ 2 - 2
app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.ethosa.ktc"
         minSdk 21
         targetSdk 32
-        versionCode 3
-        versionName "0.2.1"
+        versionCode 4
+        versionName "0.3.0"
         ndk {
             abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
         }

+ 4 - 1
app/src/main/java/com/ethosa/ktc/college/news/LastNews.kt

@@ -3,4 +3,7 @@ package com.ethosa.ktc.college.news
 /**
  * List of last news.
  */
-data class LastNews(val anonce: List<News>)
+data class LastNews(
+    val anonce: List<News>,
+    val news: List<News>
+)

+ 1 - 1
app/src/main/java/com/ethosa/ktc/ui/fragments/NewsFragment.kt

@@ -67,7 +67,7 @@ class NewsFragment : Fragment(), CollegeCallback {
         animate.duration = 500
         activity?.runOnUiThread {
             animate.start()
-            binding.newsContainer.adapter = NewsAdapter(news.anonce)
+            binding.newsContainer.adapter = NewsAdapter(news.anonce + news.news)
         }
     }
 }

+ 1 - 0
app/src/main/res/layout/activity_wall_post_content.xml

@@ -18,6 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="16dp"
+            android:textColor="@color/text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

+ 1 - 0
app/src/main/res/layout/fragment_about_app.xml

@@ -51,6 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:text="@string/about_app_desc"
+            android:textColor="@color/text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/about_app_title"

+ 1 - 0
app/src/main/res/layout/fragment_timetable.xml

@@ -49,6 +49,7 @@
             android:layout_height="wrap_content"
             android:text="@string/placeholder"
             android:textAlignment="center"
+            android:textColor="@color/text"
             android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"

+ 1 - 0
app/src/main/res/layout/layout_album_preview.xml

@@ -37,6 +37,7 @@
             android:shadowRadius="5"
             android:text="@string/placeholder"
             android:textAlignment="center"
+            android:textColor="@color/text"
             android:textStyle="bold"
             app:flow_wrapMode="aligned"
             app:layout_constraintEnd_toEndOf="parent"

+ 1 - 0
app/src/main/res/layout/layout_course.xml

@@ -25,6 +25,7 @@
             android:layout_height="wrap_content"
             android:padding="10dp"
             android:text="@string/course_string"
+            android:textColor="@color/text"
             android:textSize="20sp"
             android:textStyle="bold" />
     </com.google.android.material.chip.ChipGroup>

+ 7 - 0
app/src/main/res/layout/layout_lesson.xml

@@ -25,6 +25,7 @@
             android:padding="0dp"
             android:text="@string/lesson_title"
             android:textSize="14sp"
+            android:textColor="@color/text"
             app:layout_constraintEnd_toStartOf="@+id/lesson_classroom"
             app:layout_constraintStart_toEndOf="@+id/hr_time"
             app:layout_constraintTop_toTopOf="parent"
@@ -37,6 +38,7 @@
             android:layout_marginStart="8dp"
             android:text="@string/lesson_number"
             android:textStyle="bold"
+            android:textColor="@color/text"
             app:layout_constraintBottom_toBottomOf="@+id/lesson_teacher"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/lesson_title" />
@@ -47,6 +49,7 @@
             android:layout_height="wrap_content"
             android:text="@string/lesson_time"
             android:textSize="12sp"
+            android:textColor="@color/text"
             app:layout_constraintEnd_toEndOf="@+id/hr_time"
             app:layout_constraintStart_toStartOf="@+id/hr_time"
             app:layout_constraintTop_toBottomOf="@+id/lesson_from" />
@@ -57,6 +60,7 @@
             android:layout_height="wrap_content"
             android:text="@string/lesson_time"
             android:textSize="12sp"
+            android:textColor="@color/text"
             app:layout_constraintBottom_toTopOf="@+id/hr_time"
             app:layout_constraintEnd_toEndOf="@+id/hr_time"
             app:layout_constraintStart_toStartOf="@+id/hr_time" />
@@ -68,6 +72,7 @@
             android:layout_marginStart="2dp"
             android:background="@color/text"
             android:orientation="horizontal"
+            android:textColor="@color/text"
             app:layout_constraintBottom_toBottomOf="@+id/lesson_number"
             app:layout_constraintStart_toEndOf="@+id/lesson_number"
             app:layout_constraintTop_toTopOf="@+id/lesson_number" />
@@ -78,6 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:text="@string/lesson_classroom"
+            android:textColor="@color/text"
             app:layout_constraintBottom_toBottomOf="@+id/lesson_from"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/lesson_to" />
@@ -89,6 +95,7 @@
             android:gravity="center"
             android:padding="0dp"
             android:text="@string/lesson_teacher"
+            android:textColor="@color/text"
             app:layout_constraintEnd_toEndOf="@+id/lesson_title"
             app:layout_constraintStart_toStartOf="@+id/lesson_title"
             app:layout_constraintTop_toBottomOf="@+id/lesson_title" />

+ 3 - 0
app/src/main/res/layout/layout_news.xml

@@ -21,6 +21,7 @@
         android:text="@string/news_title"
         android:textSize="18sp"
         android:textStyle="bold"
+        android:textColor="@color/text"
         app:layout_constraintStart_toStartOf="@+id/left_padding"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -31,6 +32,7 @@
         android:layout_marginTop="-4dp"
         android:text="@string/news_date"
         android:textSize="12sp"
+        android:textColor="@color/text"
         app:layout_constraintStart_toStartOf="@+id/wall_title"
         app:layout_constraintTop_toBottomOf="@+id/wall_title"
         tools:ignore="TextContrastCheck" />
@@ -41,6 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:text="@string/news_description"
+        android:textColor="@color/text"
         app:layout_constraintEnd_toStartOf="@+id/right_padding"
         app:layout_constraintStart_toStartOf="@+id/wall_title"
         app:layout_constraintTop_toBottomOf="@+id/wall_date"

+ 3 - 0
app/src/main/res/layout/layout_timetable.xml

@@ -19,6 +19,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/news_date"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />