From 28fd7460cb0da82dd1ecf34381629398eda6455e Mon Sep 17 00:00:00 2001
From: Mateusz Idziejczak <idziejczak3@gmail.com>
Date: Mon, 1 Feb 2021 11:45:10 +0100
Subject: [PATCH] Replace progressBar with CircularProgressIndicator (#1117)

---
 app/build.gradle                                          | 3 +--
 app/src/main/res/layout/activity_send_message.xml         | 3 +--
 app/src/main/res/layout/dialog_mobile_device.xml          | 3 +--
 app/src/main/res/layout/fragment_account.xml              | 3 +--
 app/src/main/res/layout/fragment_attendance.xml           | 3 +--
 app/src/main/res/layout/fragment_attendance_summary.xml   | 3 +--
 app/src/main/res/layout/fragment_conference.xml           | 3 +--
 app/src/main/res/layout/fragment_contributor.xml          | 3 +--
 app/src/main/res/layout/fragment_exam.xml                 | 3 +--
 app/src/main/res/layout/fragment_grade.xml                | 3 +--
 app/src/main/res/layout/fragment_grade_details.xml        | 3 +--
 app/src/main/res/layout/fragment_grade_statistics.xml     | 3 +--
 app/src/main/res/layout/fragment_grade_summary.xml        | 3 +--
 app/src/main/res/layout/fragment_homework.xml             | 3 +--
 app/src/main/res/layout/fragment_license.xml              | 3 +--
 app/src/main/res/layout/fragment_login_advanced.xml       | 3 +--
 app/src/main/res/layout/fragment_login_form.xml           | 3 +--
 app/src/main/res/layout/fragment_login_recover.xml        | 3 +--
 app/src/main/res/layout/fragment_login_student_select.xml | 3 +--
 app/src/main/res/layout/fragment_login_symbol.xml         | 3 +--
 app/src/main/res/layout/fragment_lucky_number.xml         | 3 +--
 app/src/main/res/layout/fragment_message.xml              | 3 +--
 app/src/main/res/layout/fragment_message_preview.xml      | 3 +--
 app/src/main/res/layout/fragment_message_tab.xml          | 3 +--
 app/src/main/res/layout/fragment_mobile_device.xml        | 3 +--
 app/src/main/res/layout/fragment_note.xml                 | 3 +--
 app/src/main/res/layout/fragment_school.xml               | 3 +--
 app/src/main/res/layout/fragment_schoolandteachers.xml    | 3 +--
 app/src/main/res/layout/fragment_student_info.xml         | 3 +--
 app/src/main/res/layout/fragment_teacher.xml              | 3 +--
 app/src/main/res/layout/fragment_timetable.xml            | 3 +--
 app/src/main/res/layout/fragment_timetable_additional.xml | 3 +--
 app/src/main/res/layout/fragment_timetable_completed.xml  | 3 +--
 33 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index af3f4aef0..0d42ad711 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -163,10 +163,9 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.google.android.material:material:1.3.0-rc01"
     implementation "com.github.wulkanowy:material-chips-input:2.1.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index e0ec52bb6..10b581f77 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -194,9 +194,8 @@
             tools:text="No messages" />
     </LinearLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/sendMessageProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 7b1286053..680f57197 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -86,9 +86,8 @@
                 android:text="@string/all_close" />
         </LinearLayout>
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/mobileDeviceDialogProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index a2cf73cf8..306dc2190 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -5,9 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/account_progress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 39b00d306..8016081b8 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/attendanceProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index da0ce7f28..613ea5063 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -49,9 +49,8 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/attendanceSummaryProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_conference.xml b/app/src/main/res/layout/fragment_conference.xml
index d7cac8786..730b46d55 100644
--- a/app/src/main/res/layout/fragment_conference.xml
+++ b/app/src/main/res/layout/fragment_conference.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.conference.ConferenceFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/conferenceProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_contributor.xml
index d913c5a4d..8b71ffed1 100644
--- a/app/src/main/res/layout/fragment_contributor.xml
+++ b/app/src/main/res/layout/fragment_contributor.xml
@@ -4,9 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/creatorProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index ed4094a50..ca88849c5 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/examProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 0bc864b2d..ed0447fb5 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -25,9 +25,8 @@
         android:visibility="invisible"
         tools:visibility="visible" />
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/gradeProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index a1faefe7a..c1b88580a 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -17,9 +17,8 @@
             tools:listitem="@layout/item_grade_details" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/gradeDetailsProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index b3fcac448..ca512dac2 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -95,9 +95,8 @@
                         android:layout_height="match_parent"
                         tools:listitem="@layout/item_grade_statistics_pie" />
 
-                    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/gradeStatisticsProgress"
-                        style="@style/Widget.MaterialProgressBar.ProgressBar"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 3f21e61c7..a3425513d 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -17,9 +17,8 @@
             tools:listitem="@layout/item_grade_summary" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/gradeSummaryProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 26381da6a..c0b5698d5 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/homeworkProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index f4105355c..5551d4f19 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -4,9 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/licenseProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 65af0b543..c7acaa70b 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.advanced.LoginAdvancedFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loginFormProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index d91d7b037..412502b52 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.form.LoginFormFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loginFormProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
index 205a4bea3..629ed54de 100644
--- a/app/src/main/res/layout/fragment_login_recover.xml
+++ b/app/src/main/res/layout/fragment_login_recover.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.recover.LoginRecoverFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loginRecoverProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index f9c6c1572..bf5431164 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loginStudentSelectProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 77f44d213..f1c9be4a0 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.symbol.LoginSymbolFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/loginSymbolProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index a6b9b8221..f6de01e69 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -5,9 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/luckyNumberProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index b4cc0c2fe..a61f37381 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -39,9 +39,8 @@
         android:tint="?colorOnSecondary"
         app:icon="@drawable/ic_menu_message_write" />
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/messageProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 0931990f6..4b15cf108 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -62,9 +62,8 @@
         </LinearLayout>
     </LinearLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/messagePreviewProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index e83d913e9..4a6948f09 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -16,9 +16,8 @@
             tools:listitem="@layout/item_message" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/messageTabProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index cf11c2831..afe1db8e0 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.mobiledevice.MobileDeviceFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/mobileDevicesProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index e55f0007f..f62a11a64 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -4,9 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/noteProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_school.xml b/app/src/main/res/layout/fragment_school.xml
index 23126b086..32be61db8 100644
--- a/app/src/main/res/layout/fragment_school.xml
+++ b/app/src/main/res/layout/fragment_school.xml
@@ -5,9 +5,8 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.schoolandteachers.school.SchoolFragment">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/schoolProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_schoolandteachers.xml b/app/src/main/res/layout/fragment_schoolandteachers.xml
index 6414abb92..f9fec1dd9 100644
--- a/app/src/main/res/layout/fragment_schoolandteachers.xml
+++ b/app/src/main/res/layout/fragment_schoolandteachers.xml
@@ -27,9 +27,8 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/schoolandteachersProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_student_info.xml b/app/src/main/res/layout/fragment_student_info.xml
index 371457272..7943b2db8 100644
--- a/app/src/main/res/layout/fragment_student_info.xml
+++ b/app/src/main/res/layout/fragment_student_info.xml
@@ -5,9 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/student_info_progress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_teacher.xml b/app/src/main/res/layout/fragment_teacher.xml
index 484bf0651..ef27d2c47 100644
--- a/app/src/main/res/layout/fragment_teacher.xml
+++ b/app/src/main/res/layout/fragment_teacher.xml
@@ -4,9 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/teacherProgress"
-        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 533af2fa1..df33b289e 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/timetableProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable_additional.xml b/app/src/main/res/layout/fragment_timetable_additional.xml
index d70306c9d..61eb44454 100644
--- a/app/src/main/res/layout/fragment_timetable_additional.xml
+++ b/app/src/main/res/layout/fragment_timetable_additional.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/additionalLessonsProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 4934327c5..1a890fe12 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -10,9 +10,8 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/completedLessonsProgress"
-            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"