github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 20:42:44 +01:00
Code

Replace progressBar with CircularProgressIndicator (#1117)

Browse Source
This commit is contained in:
Mateusz Idziejczak 2021-02-01 11:45:10 +01:00 committed by GitHub
parent 82b207b03a
commit 28fd7460cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 33 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -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"

3
app/src/main/res/layout/activity_send_message.xml
View File

@ -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"

3
app/src/main/res/layout/dialog_mobile_device.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_account.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_attendance.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_attendance_summary.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_conference.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_contributor.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_exam.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_grade.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_grade_details.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_grade_statistics.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_grade_summary.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_homework.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_license.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_login_advanced.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_login_form.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_login_recover.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_login_student_select.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_login_symbol.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_lucky_number.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_message.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_message_preview.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_message_tab.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_mobile_device.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_note.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_school.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_schoolandteachers.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_student_info.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_teacher.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_timetable.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_timetable_additional.xml
View File

@ -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"

3
app/src/main/res/layout/fragment_timetable_completed.xml
View File

@ -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"