moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

multi-decrypt: use indeterminate progress only

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-22 14:27:18 +02:00
parent 2e8fb9cbdd
commit b2dec85421
3 changed files with 49 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@ -42,8 +42,6 @@ import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -597,7 +595,9 @@ public class DecryptListFragment
holder.vProgress.setProgress(model.mProgress); holder.vProgress.setProgress(model.mProgress);
holder.vProgress.setMax(model.mMax); holder.vProgress.setMax(model.mMax);
holder.vProgressMsg.setText(model.mProgressMsg); if (model.mProgressMsg != null) {
holder.vProgressMsg.setText(model.mProgressMsg);
}
} }
private void bindItemSuccess(ViewHolder holder, final ViewModel model) { private void bindItemSuccess(ViewHolder holder, final ViewModel model) {
@ -627,7 +627,6 @@ public class DecryptListFragment
holder.vFilesize.setText(FileHelper.readableFileSize(size)); holder.vFilesize.setText(FileHelper.readableFileSize(size));
} }
// TODO thumbnail from OpenPgpMetadata?
if (model.mIcon != null) { if (model.mIcon != null) {
holder.vThumbnail.setImageDrawable(model.mIcon); holder.vThumbnail.setImageDrawable(model.mIcon);
} else { } else {

95
OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
View File

@ -24,33 +24,34 @@
android:outAnimation="@anim/fade_out" android:outAnimation="@anim/fade_out"
android:id="@+id/view_animator" android:id="@+id/view_animator"
android:measureAllChildren="false" android:measureAllChildren="false"
custom:initialView="2" custom:initialView="0"
android:minHeight="?listPreferredItemHeightSmall"
android:animateLayoutChanges="true"
> >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="vertical" android:orientation="horizontal">
android:paddingTop="4dp"
android:paddingBottom="4dp">
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"
android:layout_width="match_parent" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="30dp"
android:indeterminate="false" android:padding="4dp"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:progress="40"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/progress_msg" android:id="@+id/progress_msg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:text="" android:layout_marginLeft="8dp"
tools:text="Progress Message" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
android:text="@string/progress_processing"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
</LinearLayout> </LinearLayout>
<!-- --> <!-- -->
@ -245,49 +246,43 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> tools:ignore="UseCompoundDrawables">
<LinearLayout <ImageView
android:orientation="horizontal" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:ignore="UseCompoundDrawables"> android:padding="4dp"
android:src="@drawable/status_signature_invalid_cutout_24dp"
android:tint="@color/android_red_light"
android:layout_gravity="center_vertical" />
<ImageView <TextView
android:layout_width="wrap_content" android:id="@+id/result_error_msg"
android:layout_height="wrap_content" android:layout_width="0dp"
android:padding="4dp" android:layout_height="wrap_content"
android:src="@drawable/status_signature_invalid_cutout_24dp" android:layout_weight="1"
android:tint="@color/android_red_light" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical" /> android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text=""
android:layout_gravity="center_vertical"
tools:text="Error processing data!" />
<TextView <ImageView
android:id="@+id/result_error_msg" android:id="@+id/result_error_log"
android:layout_width="0dp" android:scaleType="center"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="match_parent"
android:textAppearance="?android:attr/textAppearanceMedium" android:clickable="true"
android:layout_marginLeft="8dp" android:padding="6dp"
android:layout_marginTop="8dp" android:background="?android:selectableItemBackground"
android:layout_marginBottom="8dp" android:src="@drawable/ic_view_list_grey_24dp"
android:text="" android:layout_gravity="center_vertical" />
android:layout_gravity="center_vertical"
tools:text="Error processing data!" />
<ImageView
android:id="@+id/result_error_log"
android:scaleType="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:padding="6dp"
android:background="?android:selectableItemBackground"
android:src="@drawable/ic_view_list_grey_24dp"
android:layout_gravity="center_vertical" />
</LinearLayout>
</LinearLayout> </LinearLayout>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@ -1341,5 +1341,6 @@
<string name="view_internal">"View in OpenKeychain"</string> <string name="view_internal">"View in OpenKeychain"</string>
<string name="error_preparing_data">"Error preparing data!"</string> <string name="error_preparing_data">"Error preparing data!"</string>
<string name="label_clip_title">"Encrypted Data"</string> <string name="label_clip_title">"Encrypted Data"</string>
<string name="progress_processing">Processing…</string>
</resources> </resources>