keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Removed Spinkit dependency and replaced with indeterminate spinners

Browse Source
pull/1713/head
ThomasSession 4 weeks ago
parent 3448fcde7f
commit a6d121c194
18 changed files with 104 additions and 106 deletions
Show Stats Download Patch File Download Diff File

1
app/build.gradle
Unescape Escape View File

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

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt
Unescape Escape View File

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

15
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
Unescape Escape View File

@ -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> media) {
controller.onSendClicked(media, composeText.getTextTrimmed());
Util.cancelRunnableOnMain(progressTimer);
if (dialog != null) {
dialog.dismiss();
}
loader.setVisibility(View.GONE);
renderTimer.stop(TAG);
}
}.execute();

10
app/src/main/res/layout/activity_conversation_v2.xml
Unescape Escape View File

@ -292,13 +292,13 @@
android:clickable="true"
android:visibility="gone">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
app:SpinKit_Color="@android:color/white" />
android:layout_gravity="center"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</FrameLayout>

8
app/src/main/res/layout/activity_edit_closed_group.xml
Unescape Escape View File

@ -162,13 +162,13 @@
android:visibility="gone"
android:alpha="0">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@android:color/white" />
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

8
app/src/main/res/layout/activity_path.xml
Unescape Escape View File

@ -34,13 +34,13 @@
android:orientation="vertical"
android:layout_centerInParent="true" />
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
<ProgressBar
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:SpinKit_Color="?android:textColorPrimary" />
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

10
app/src/main/res/layout/activity_settings.xml
Unescape Escape View File

@ -127,13 +127,13 @@
android:background="#A4000000"
android:visibility="gone">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="8dp"
app:SpinKit_Color="@android:color/white" />
android:layout_centerInParent="true"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

26
app/src/main/res/layout/activity_webrtc.xml
Unescape Escape View File

@ -74,18 +74,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"/>
<com.github.ybq.android.spinkit.SpinKitView
<ProgressBar
android:id="@+id/remote_loading_view"
style="@style/SpinKitView.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:foregroundGravity="center"
android:visibility="gone"
app:SpinKit_Color="@color/core_white"
android:layout_width="@dimen/very_large_spacing"
android:layout_height="@dimen/large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
app:layout_constraintEnd_toEndOf="@+id/contactAvatar"
app:layout_constraintStart_toStartOf="@+id/contactAvatar"
app:layout_constraintTop_toBottomOf="@id/contactAvatar"
android:visibility="gone"
android:indeterminateTint="?android:textColorPrimary"
android:indeterminate="true"
tools:visibility="visible" />
<TextView
@ -146,13 +145,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<com.github.ybq.android.spinkit.SpinKitView
<ProgressBar
android:id="@+id/local_loading_view"
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:SpinKit_Color="?android:textColorPrimary"
android:layout_width="@dimen/large_spacing"
android:layout_height="@dimen/large_spacing"
android:layout_gravity="center"
android:indeterminateTint="?android:textColorPrimary"
android:indeterminate="true"
tools:visibility="visible"
android:visibility="gone" />

9
app/src/main/res/layout/contact_selection_list_fragment.xml
Unescape Escape View File

@ -31,13 +31,12 @@
tools:visibility="visible"
tools:listitem="@layout/view_user"/>
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
<ProgressBar
android:id="@+id/loader"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:SpinKit_Color="?android:textColorPrimary" />
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</FrameLayout>

15
app/src/main/res/layout/dialog_clear_all_data.xml
Unescape Escape View File

@ -39,7 +39,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dialog_button_height"
android:orientation="horizontal">
<Button
@ -58,14 +58,17 @@
android:layout_weight="1"
android:text="@string/cancel" />
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Small.ThreeBounce"
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
android:layout_height="@dimen/large_spacing"
android:layout_gravity="center_vertical"
android:layout_weight="1"
app:SpinKit_Color="?colorAccent"
android:visibility="gone" />
android:indeterminateTint="?colorAccent"
android:indeterminate="true"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>

10
app/src/main/res/layout/fragment_create_group.xml
Unescape Escape View File

@ -163,13 +163,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="8dp"
app:SpinKit_Color="@android:color/white" />
android:layout_centerInParent="true"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

15
app/src/main/res/layout/fragment_enter_community_url.xml
Unescape Escape View File

@ -39,19 +39,20 @@
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginTop="56dp"
android:visibility="gone"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/communityUrlEditText">
<com.github.ybq.android.spinkit.SpinKitView
<ProgressBar
android:id="@+id/defaultRoomsLoader"
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_width="@dimen/large_spacing"
android:layout_height="@dimen/large_spacing"
android:visibility="gone"
app:SpinKit_Color="?android:textColorPrimary" />
tools:visibility="visible"
android:layout_centerInParent="true"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

10
app/src/main/res/layout/fragment_join_community.xml
Unescape Escape View File

@ -77,13 +77,13 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="8dp"
app:SpinKit_Color="@android:color/white" />
android:layout_centerInParent="true"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</RelativeLayout>

9
app/src/main/res/layout/giphy_fragment.xml
Unescape Escape View File

@ -11,15 +11,14 @@
android:layout_height="match_parent"
android:scrollbars="vertical"/>
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
<ProgressBar
android:id="@+id/loading_progress"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_gravity="center"
android:visibility="visible"
app:SpinKit_Color="?android:textColorPrimary" />
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
<TextView
android:id="@+id/no_results"

20
app/src/main/res/layout/mediasend_fragment.xml
Unescape Escape View File

@ -168,4 +168,24 @@
</FrameLayout>
<FrameLayout
android:id="@+id/loader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#A4000000"
android:focusable="true"
android:clickable="true"
android:visibility="gone"
tools:visibility="visible">
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_gravity="center"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"/>
</FrameLayout>
</FrameLayout>

16
app/src/main/res/layout/progress_dialog.xml
Unescape Escape View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/medium_spacing">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:SpinKit_Color="?colorAccent" />
</RelativeLayout>

13
app/src/main/res/layout/view_link_preview_draft.xml
Unescape Escape View File

@ -61,12 +61,13 @@
</RelativeLayout>
<com.github.ybq.android.spinkit.SpinKitView
<ProgressBar
android:id="@+id/linkPreviewDraftLoader"
style="@style/SpinKitView.Large.ThreeBounce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:SpinKit_Color="?android:textColorPrimary"
android:layout_centerInParent="true" />
android:layout_width="@dimen/large_spacing"
android:layout_height="@dimen/large_spacing"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
android:indeterminateTint="?android:textColorPrimary"
android:indeterminate="true"/>
</RelativeLayout>

12
app/src/main/res/layout/view_search_bottom_bar.xml
Unescape Escape View File

@ -55,15 +55,17 @@
android:text="37 of 73"
android:textStyle="bold"/>
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.DoubleBounce"
<ProgressBar
android:id="@+id/searchProgressWheel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp"
android:padding="@dimen/medium_spacing"
android:layout_centerInParent="true"
android:indeterminateTint="?colorAccent"
android:indeterminate="true"
android:background="?backgroundSecondary"
app:SpinKit_Color="?android:textColorPrimary"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
</RelativeLayout>

Write Preview
Loading…
Cancel
Save