Browse Source

little redesign

Ethosa 3 years ago
parent
commit
3d08f633e6

+ 1 - 1
.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-04-21T13:33:45.022014200Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-04-21T14:23:43.352835200Z" />
   </component>
 </project>

+ 4 - 4
app/src/main/java/com/ethosa/ktc/ui/widgets/TeacherTimetableWidget.kt

@@ -44,10 +44,10 @@ class TeacherTimetableWidget : AppWidgetProvider() {
      */
     @SuppressLint("UnspecifiedImmutableFlag")
     private fun updateWidgetPendingIntent(
-        context: Context,
+        context: Context?,
         appWidgetId: Int
     ): PendingIntent {
-        val intent = Intent(context, TeacherTimetableWidget::class.java)
+        val intent = Intent(context!!, TeacherTimetableWidget::class.java)
         val ids = AppWidgetManager.getInstance(context)
             .getAppWidgetIds(ComponentName(context, TeacherTimetableWidget::class.java))
         intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
@@ -68,10 +68,10 @@ class TeacherTimetableWidget : AppWidgetProvider() {
      */
     @SuppressLint("UnspecifiedImmutableFlag")
     private fun openAppPendingIntent(
-        context: Context,
+        context: Context?,
         appWidgetId: Int
     ): PendingIntent {
-        val intent = Intent(context, MainActivity::class.java)
+        val intent = Intent(context!!, MainActivity::class.java)
         return PendingIntent.getActivity(
             context,
             appWidgetId,

+ 4 - 4
app/src/main/java/com/ethosa/ktc/ui/widgets/TimetableWidget.kt

@@ -45,10 +45,10 @@ class TimetableWidget : AppWidgetProvider() {
      */
     @SuppressLint("UnspecifiedImmutableFlag")
     private fun updateWidgetPendingIntent(
-        context: Context,
+        context: Context?,
         appWidgetId: Int
     ): PendingIntent {
-        val intent = Intent(context, TimetableWidget::class.java)
+        val intent = Intent(context!!, TimetableWidget::class.java)
         val ids = AppWidgetManager.getInstance(context)
             .getAppWidgetIds(ComponentName(context, TimetableWidget::class.java))
         intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
@@ -69,10 +69,10 @@ class TimetableWidget : AppWidgetProvider() {
      */
     @SuppressLint("UnspecifiedImmutableFlag")
     private fun openAppPendingIntent(
-        context: Context,
+        context: Context?,
         appWidgetId: Int
     ): PendingIntent {
-        val intent = Intent(context, MainActivity::class.java)
+        val intent = Intent(context!!, MainActivity::class.java)
         return PendingIntent.getActivity(
             context,
             appWidgetId,

+ 1 - 1
app/src/main/res/layout/layout_story.xml

@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/roundedImageView"
         app:srcCompat="@mipmap/ic_launcher"
-        app:strokeColor="?colorPrimary"
+        app:strokeColor="?tickColorActive"
         app:strokeWidth="3dp"
         tools:ignore="ContentDescription" />
 

+ 1 - 1
app/src/main/res/values-night/colors.xml

@@ -16,7 +16,7 @@
     <color name="inactive">#b4bcca</color>
     <color name="active">#D7BBF2</color>
 
-    <color name="current_lesson">#271F42</color>
+    <color name="current_lesson">#3EFFFFFF</color>
 
     <color name="active_indicator">@color/material_dynamic_neutral_variant50</color>
 </resources>

+ 1 - 1
app/src/main/res/values/colors.xml

@@ -16,7 +16,7 @@
     <color name="inactive">#232427</color>
     <color name="active">#0026AE</color>
 
-    <color name="current_lesson">#CCD9E8</color>
+    <color name="current_lesson">#31000000</color>
 
     <color name="active_indicator">@color/material_dynamic_tertiary90</color>
 </resources>