upgrade

.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\79833\.android\avd\Pixel_XL_API_32.avd" />
+            <value value="C:\Users\79833\.android\avd\Pixel_5_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-04-10T10:30:23.157224Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-04-10T11:38:25.392768700Z" />
   </component>
 </project>

app/src/main/java/com/ethosa/ktc/ui/activities/AlbumActivity.kt

@@ -4,13 +4,13 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.bumptech.glide.Glide
-import com.ethosa.ktc.R
 import com.ethosa.ktc.college.CollegeApi
 import com.ethosa.ktc.college.CollegeCallback
 import com.ethosa.ktc.college.gallery.Album
 import com.ethosa.ktc.databinding.ActivityAlbumBinding
 import com.ethosa.ktc.ui.adapters.AlbumAdapter
 import com.ethosa.ktc.ui.decoration.SpacingItemDecoration
+import com.ethosa.ktc.utils.AppDynamicTheme
 import com.google.gson.Gson
 import jp.wasabeef.glide.transformations.BlurTransformation
 import okhttp3.Call
@@ -31,7 +31,8 @@ class AlbumActivity(
 
         binding = ActivityAlbumBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(binding.toolbar)
+        AppDynamicTheme(this).loadTheme()
 
         // Setup recycler view
         val layoutManager = StaggeredGridLayoutManager(spanCount, StaggeredGridLayoutManager.VERTICAL)

app/src/main/java/com/ethosa/ktc/ui/activities/MainActivity.kt

@@ -20,7 +20,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         Preferences(this).load()
-        Preferences.currentTheme = "material3"
         AppDynamicTheme(this).loadTheme()
 
         binding = ActivityMainBinding.inflate(layoutInflater)

app/src/main/java/com/ethosa/ktc/ui/activities/WallPostActivity.kt

@@ -11,6 +11,7 @@ import com.ethosa.ktc.college.CollegeCallback
 import com.ethosa.ktc.college.news.News
 import com.ethosa.ktc.databinding.ActivityWallPostBinding
 import com.ethosa.ktc.glide.transformation.CenterInsideBlur
+import com.ethosa.ktc.utils.AppDynamicTheme
 import com.ethosa.ktc.utils.HtmlImageGetter
 import com.google.gson.Gson
 import okhttp3.Call
@@ -30,6 +31,8 @@ class WallPostActivity : AppCompatActivity(), CollegeCallback {
         // Setup view binding
         binding = ActivityWallPostBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
+        AppDynamicTheme(this).loadTheme()
 
         binding.albumBackButton.setOnClickListener { finish() }
 
@@ -56,8 +59,7 @@ class WallPostActivity : AppCompatActivity(), CollegeCallback {
         // Create animation object
         val animate = ObjectAnimator.ofFloat(
             binding.content.progressBar, "alpha", 1f, 0f
-        )
-        animate.duration = 500
+        ).setDuration(500)
         // Fix <img/> tag
         new.body = new.body.replace(
             "src=\"/", "src=\"http://www.kansk-tc.ru/"

app/src/main/java/com/ethosa/ktc/utils/AppDynamicTheme.kt

@@ -16,8 +16,7 @@ class AppDynamicTheme(
      */
     fun loadTheme() {
         when(Preferences.currentTheme) {
-            "default" -> context.setTheme(R.style.Theme_KTC_NoActionBar)
-            "material3" ->
+            "default" ->
                 if (Build.VERSION.SDK_INT >= 31)
                     context.setTheme(R.style.Theme_KTC_MaterialYou)
                 else

app/src/main/res/layout/activity_album.xml

@@ -55,6 +55,7 @@
 
     <include
         android:id="@+id/album_content"
-        layout="@layout/activity_album_content" />
+        layout="@layout/activity_album_content"
+        android:background="?cardBackgroundColor" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_main.xml

@@ -25,7 +25,7 @@
         android:layout_width="0dp"
         android:layout_height="?actionBarSize"
         android:background="@drawable/navigation"
-        app:itemActiveIndicatorStyle="@null"
+        app:itemActiveIndicatorStyle="@style/Theme.KTC.MaterialYou.ActiveIndicator"
         app:itemIconTint="@drawable/selector_navigation"
         app:itemPaddingBottom="12dp"
         app:itemPaddingTop="8dp"

app/src/main/res/layout/activity_wall_post.xml

@@ -54,6 +54,7 @@
 
     <include
         android:id="@+id/content"
-        layout="@layout/activity_wall_post_content" />
+        layout="@layout/activity_wall_post_content"
+        android:background="?cardBackgroundColor" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_wall_post_content.xml

@@ -10,8 +10,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/body"

app/src/main/res/layout/fragment_gallery.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background"
     tools:context=".ui.fragments.GalleryFragment">
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_pro_college.xml

@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:backgroundTint="?cardBackgroundColor"
                 android:hint="@string/username"
-                tools:ignore="TextContrastCheck" />
+                android:textColor="?android:textColor" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -64,7 +64,7 @@
                 android:backgroundTint="?cardBackgroundColor"
                 android:hint="@string/password"
                 android:inputType="textPassword"
-                tools:ignore="TextContrastCheck" />
+                android:textColor="?android:textColor" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <Button
@@ -77,7 +77,8 @@
             android:textColor="?android:textColorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/password"/>
+            app:layout_constraintTop_toBottomOf="@+id/password"
+            tools:ignore="TextContrastCheck" />
 
         <TextView
             android:id="@+id/textView2"

app/src/main/res/menu/menu_album.xml

@@ -1,3 +0,0 @@
-<menu xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.activities.AlbumActivity">
-</menu>

app/src/main/res/menu/menu_wall_post.xml

@@ -1,3 +0,0 @@
-<menu xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.activities.WallPostActivity">
-</menu>

app/src/main/res/values-night/themes.xml

@@ -55,4 +55,8 @@
         <item name="tickColorInactive">@color/material_dynamic_neutral_variant60</item>
         <item name="tickColorActive">@color/material_dynamic_tertiary90</item>
     </style>
+
+    <style name="Theme.KTC.MaterialYou.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
+        <item name="android:color">@color/material_dynamic_neutral_variant50</item>
+    </style>
 </resources>

app/src/main/res/values/styles.xml

@@ -25,27 +25,22 @@
         <item name="android:textColor">@color/primary</item>
     </style>
 
-
     <style name="Theme.KTC.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-
     <style name="Theme.KTC.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="background">@color/background_secondary</item>
     </style>
 
-
     <style name="Theme.KTC.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-
     <style name="Theme.KTC.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
         <item name="appWidgetRadius">16dp</item>
         <item name="appWidgetInnerRadius">8dp</item>
     </style>
 
-
     <style name="Theme.KTC.AppWidgetContainer" parent="Theme.KTC.AppWidgetContainerParent">
         <item name="appWidgetPadding">16dp</item>
     </style>

app/src/main/res/values/themes.xml

@@ -56,4 +56,8 @@
         <item name="tickColorInactive">@color/material_dynamic_neutral_variant20</item>
         <item name="tickColorActive">@color/material_dynamic_tertiary40</item>
     </style>
+
+    <style name="Theme.KTC.MaterialYou.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
+        <item name="android:color">@color/material_dynamic_tertiary90</item>
+    </style>
 </resources>