diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e72e58ebd..9451581d5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -163,7 +163,6 @@ dependencies { implementation("me.saket:better-link-movement-method:2.2.0") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") implementation("com.google.code.gson:gson:2.8.6") - implementation("com.github.rey5137:material:1.3.0") implementation("com.google.android.material:material:1.1.0") implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta4") diff --git a/app/licenses.yml b/app/licenses.yml index 4c62badc2..ee423e93e 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -141,12 +141,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/topic/libraries/architecture/index.html -- artifact: com.github.rey5137:material:+ - name: Material Library - copyrightHolder: Rey Pham - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://github.com/rey5137/material - artifact: commons-codec:commons-codec:+ name: Apache Commons Codec copyrightHolder: The Apache Software Foundation diff --git a/app/proguard.pro b/app/proguard.pro index 68c3a8c2e..d4d2ce34a 100644 --- a/app/proguard.pro +++ b/app/proguard.pro @@ -2,8 +2,6 @@ -keep class org.tasks.** { *; } --dontwarn com.rey.material.** - # remove logging statements -assumenosideeffects class timber.log.Timber* { public static *** v(...); diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 0149b43fa..c841f47fe 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -384,22 +384,6 @@ "version": "2.2.0" } }, - { - "notice": null, - "copyrightHolder": "Rey Pham", - "copyrightStatement": "Copyright © Rey Pham. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "year": null, - "url": "https://github.com/rey5137/material", - "libraryName": "Material Library", - "artifactId": { - "name": "material", - "group": "com.github.rey5137", - "version": "1.3.0" - } - }, { "notice": null, "copyrightHolder": "The Apache Software Foundation", diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java index 17c955288..5ecb1f39f 100644 --- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java @@ -7,12 +7,12 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; import android.view.inputmethod.InputMethodManager; +import android.widget.ProgressBar; import android.widget.Toast; import androidx.lifecycle.ViewModelProviders; import butterknife.BindView; import com.google.android.material.textfield.TextInputEditText; import com.google.api.services.tasks.model.TaskList; -import com.rey.material.widget.ProgressView; import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.GtasksFilter; @@ -42,7 +42,7 @@ public class GoogleTaskListSettingsActivity extends BaseListSettingsActivity { TextInputEditText name; @BindView(R.id.progress_bar) - ProgressView progressView; + ProgressBar progressView; private boolean isNewList; private GoogleTaskList gtasksList; diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java index cd6d4d997..cfdc945b3 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java @@ -8,6 +8,7 @@ import android.os.Bundle; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; +import android.widget.ProgressBar; import androidx.core.content.ContextCompat; import at.bitfire.dav4jvm.exception.HttpException; import butterknife.BindView; @@ -15,7 +16,6 @@ import butterknife.OnTextChanged; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import com.rey.material.widget.ProgressView; import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.CaldavFilter; @@ -48,7 +48,7 @@ public abstract class BaseCaldavCalendarSettingsActivity extends BaseListSetting TextInputLayout nameLayout; @BindView(R.id.progress_bar) - ProgressView progressView; + ProgressBar progressView; private CaldavCalendar caldavCalendar; private CaldavAccount caldavAccount; diff --git a/app/src/main/res/layout/progress_view.xml b/app/src/main/res/layout/progress_view.xml index a7f6fe348..538a88598 100644 --- a/app/src/main/res/layout/progress_view.xml +++ b/app/src/main/res/layout/progress_view.xml @@ -1,11 +1,15 @@ - + android:layout_width="match_parent" + android:paddingTop="0dp" + android:paddingBottom="0dp" + android:layout_gravity="top" + android:layout_marginTop="-7dp" + android:layout_marginBottom="-7dp" + android:layout_height="wrap_content" + android:visibility="gone" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 149e9b1c7..f6033c899 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -152,11 +152,6 @@ false - -