mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-27 11:12:15 -05:00
multi-decrypt: use indeterminate progress only
This commit is contained in:
parent
2e8fb9cbdd
commit
b2dec85421
@ -42,8 +42,6 @@ import android.support.v7.widget.DefaultItemAnimator;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.ContextMenu;
|
||||
import android.view.ContextMenu.ContextMenuInfo;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
@ -597,8 +595,10 @@ public class DecryptListFragment
|
||||
|
||||
holder.vProgress.setProgress(model.mProgress);
|
||||
holder.vProgress.setMax(model.mMax);
|
||||
if (model.mProgressMsg != null) {
|
||||
holder.vProgressMsg.setText(model.mProgressMsg);
|
||||
}
|
||||
}
|
||||
|
||||
private void bindItemSuccess(ViewHolder holder, final ViewModel model) {
|
||||
if (holder.vAnimator.getDisplayedChild() != 1) {
|
||||
@ -627,7 +627,6 @@ public class DecryptListFragment
|
||||
holder.vFilesize.setText(FileHelper.readableFileSize(size));
|
||||
}
|
||||
|
||||
// TODO thumbnail from OpenPgpMetadata?
|
||||
if (model.mIcon != null) {
|
||||
holder.vThumbnail.setImageDrawable(model.mIcon);
|
||||
} else {
|
||||
|
@ -24,33 +24,34 @@
|
||||
android:outAnimation="@anim/fade_out"
|
||||
android:id="@+id/view_animator"
|
||||
android:measureAllChildren="false"
|
||||
custom:initialView="2"
|
||||
custom:initialView="0"
|
||||
android:minHeight="?listPreferredItemHeightSmall"
|
||||
android:animateLayoutChanges="true"
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="4dp"
|
||||
android:paddingBottom="4dp">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:indeterminate="false"
|
||||
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
|
||||
android:progress="40"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:padding="4dp"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/progress_msg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text=""
|
||||
tools:text="Progress Message"
|
||||
android:layout_gravity="center_vertical" />
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:text="@string/progress_processing"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
<!-- -->
|
||||
@ -244,11 +245,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
@ -270,6 +266,7 @@
|
||||
android:layout_weight="1"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text=""
|
||||
@ -289,8 +286,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
@ -1341,5 +1341,6 @@
|
||||
<string name="view_internal">"View in OpenKeychain"</string>
|
||||
<string name="error_preparing_data">"Error preparing data!"</string>
|
||||
<string name="label_clip_title">"Encrypted Data"</string>
|
||||
<string name="progress_processing">Processing…</string>
|
||||
|
||||
</resources>
|
||||
|
Loading…
Reference in New Issue
Block a user