From a6d121c19479dd4f3f0ee26b1e9e7c6da1524893 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Mon, 24 Mar 2025 11:42:18 +1100 Subject: [PATCH] Removed Spinkit dependency and replaced with indeterminate spinners --- app/build.gradle | 1 - .../conversation/v2/search/SearchBottomBar.kt | 3 --- .../mediasend/MediaSendFragment.java | 15 +++-------- .../res/layout/activity_conversation_v2.xml | 10 +++---- .../res/layout/activity_edit_closed_group.xml | 8 +++--- app/src/main/res/layout/activity_path.xml | 8 +++--- app/src/main/res/layout/activity_settings.xml | 10 +++---- app/src/main/res/layout/activity_webrtc.xml | 26 +++++++++---------- .../contact_selection_list_fragment.xml | 9 +++---- .../main/res/layout/dialog_clear_all_data.xml | 15 ++++++----- .../main/res/layout/fragment_create_group.xml | 10 +++---- .../layout/fragment_enter_community_url.xml | 15 ++++++----- .../res/layout/fragment_join_community.xml | 10 +++---- app/src/main/res/layout/giphy_fragment.xml | 9 +++---- .../main/res/layout/mediasend_fragment.xml | 20 ++++++++++++++ app/src/main/res/layout/progress_dialog.xml | 16 ------------ .../res/layout/view_link_preview_draft.xml | 13 +++++----- .../res/layout/view_search_bottom_bar.xml | 12 +++++---- 18 files changed, 104 insertions(+), 106 deletions(-) delete mode 100644 app/src/main/res/layout/progress_dialog.xml diff --git a/app/build.gradle b/app/build.gradle index e31de5ba9c..0c5eb7e40c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -350,7 +350,6 @@ dependencies { implementation "nl.komponents.kovenant:kovenant:$kovenantVersion" implementation "nl.komponents.kovenant:kovenant-android:$kovenantVersion" implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0" - implementation "com.github.ybq:Android-SpinKit:1.4.0" implementation "com.opencsv:opencsv:4.6" testImplementation "junit:junit:$junitVersion" testImplementation 'org.assertj:assertj-core:3.11.1' diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt index a379a23445..5f2fd73ab6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt @@ -5,11 +5,8 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout -import com.squareup.phrase.Phrase import network.loki.messenger.R import network.loki.messenger.databinding.ViewSearchBottomBarBinding -import org.session.libsession.utilities.StringSubstitutionConstants.COUNT_KEY -import org.session.libsession.utilities.StringSubstitutionConstants.TOTAL_COUNT_KEY class SearchBottomBar : LinearLayout { private lateinit var binding: ViewSearchBottomBarBinding diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 169ac83ead..a9d9e20639 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -91,6 +91,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl private ViewGroup playbackControlsContainer; private TextView charactersLeft; private View closeButton; + private View loader; private ControllableViewPager fragmentPager; private MediaSendFragmentPagerAdapter fragmentPagerAdapter; @@ -152,6 +153,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl playbackControlsContainer = view.findViewById(R.id.mediasend_playback_controls_container); charactersLeft = view.findViewById(R.id.mediasend_characters_left); closeButton = view.findViewById(R.id.mediasend_close_button); + loader = view.findViewById(R.id.loader); View sendButtonBkg = view.findViewById(R.id.mediasend_send_button_bkg); @@ -423,19 +425,12 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl private Stopwatch renderTimer; private Runnable progressTimer; - private AlertDialog dialog; @Override protected void onPreExecute() { renderTimer = new Stopwatch("ProcessMedia"); progressTimer = () -> { - dialog = new AlertDialog.Builder(new ContextThemeWrapper(requireContext(), R.style.Theme_TextSecure_Dialog_MediaSendProgress)) - .setView(R.layout.progress_dialog) - .setCancelable(false) - .create(); - dialog.show(); - dialog.getWindow().setLayout(getResources().getDimensionPixelSize(R.dimen.mediasend_progress_dialog_size), - getResources().getDimensionPixelSize(R.dimen.mediasend_progress_dialog_size)); + loader.setVisibility(View.VISIBLE); }; Util.runOnMainDelayed(progressTimer, 250); } @@ -476,9 +471,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl protected void onPostExecute(List media) { controller.onSendClicked(media, composeText.getTextTrimmed()); Util.cancelRunnableOnMain(progressTimer); - if (dialog != null) { - dialog.dismiss(); - } + loader.setVisibility(View.GONE); renderTimer.stop(TAG); } }.execute(); diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml index 55fa1bd1af..83f5ac3c99 100644 --- a/app/src/main/res/layout/activity_conversation_v2.xml +++ b/app/src/main/res/layout/activity_conversation_v2.xml @@ -292,13 +292,13 @@ android:clickable="true" android:visibility="gone"> - + android:layout_gravity="center" + android:indeterminateTint="?colorAccent" + android:indeterminate="true"/> diff --git a/app/src/main/res/layout/activity_edit_closed_group.xml b/app/src/main/res/layout/activity_edit_closed_group.xml index d6881200ce..b7e8f4bb31 100644 --- a/app/src/main/res/layout/activity_edit_closed_group.xml +++ b/app/src/main/res/layout/activity_edit_closed_group.xml @@ -162,13 +162,13 @@ android:visibility="gone" android:alpha="0"> - + android:indeterminateTint="?colorAccent" + android:indeterminate="true"/> diff --git a/app/src/main/res/layout/activity_path.xml b/app/src/main/res/layout/activity_path.xml index 6c8198c06f..b91b0ccbe9 100644 --- a/app/src/main/res/layout/activity_path.xml +++ b/app/src/main/res/layout/activity_path.xml @@ -34,13 +34,13 @@ android:orientation="vertical" android:layout_centerInParent="true" /> - + android:indeterminateTint="?colorAccent" + android:indeterminate="true"/> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3bfc9c65b0..46b29c6a40 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -127,13 +127,13 @@ android:background="#A4000000" android:visibility="gone"> - + android:layout_centerInParent="true" + android:indeterminateTint="?colorAccent" + android:indeterminate="true"/> diff --git a/app/src/main/res/layout/activity_webrtc.xml b/app/src/main/res/layout/activity_webrtc.xml index f84750480a..421e308aca 100644 --- a/app/src/main/res/layout/activity_webrtc.xml +++ b/app/src/main/res/layout/activity_webrtc.xml @@ -74,18 +74,17 @@ android:layout_width="0dp" android:layout_height="wrap_content"/> - - diff --git a/app/src/main/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml index 943eae9567..910191c1ad 100644 --- a/app/src/main/res/layout/contact_selection_list_fragment.xml +++ b/app/src/main/res/layout/contact_selection_list_fragment.xml @@ -31,13 +31,12 @@ tools:visibility="visible" tools:listitem="@layout/view_user"/> - - + android:indeterminateTint="?colorAccent" + android:indeterminate="true"/> diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml index ba8bf82283..0d60ea8551 100644 --- a/app/src/main/res/layout/dialog_clear_all_data.xml +++ b/app/src/main/res/layout/dialog_clear_all_data.xml @@ -39,7 +39,7 @@