cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to DisplayLogFragment

Browse Source
This commit is contained in:
Tobias Erthal
2016-09-12 17:47:20 +02:00
parent bef769e22a
commit 1fedf5a9eb
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/NestedLogAdapter.java
View File

@@ -24,6 +24,8 @@ import java.util.List;
public class NestedLogAdapter extends RecyclerView.Adapter<NestedLogAdapter.LogEntryViewHolder> { public class NestedLogAdapter extends RecyclerView.Adapter<NestedLogAdapter.LogEntryViewHolder> {
private static final int ENTRY_TYPE_REGULAR = 0; private static final int ENTRY_TYPE_REGULAR = 0;
private static final int ENTRY_TYPE_SUBLOG = 1; private static final int ENTRY_TYPE_SUBLOG = 1;
private static final int LOG_ENTRY_ITEM_INDENT = 2;
private final int mIndentFactor; private final int mIndentFactor;
private LogActionListener mListener; private LogActionListener mListener;
@@ -57,7 +59,7 @@ public class NestedLogAdapter extends RecyclerView.Adapter<NestedLogAdapter.LogE
int lastSection = 0; int lastSection = 0;
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
OperationResult.LogEntryParcel parcel = list.get(i); OperationResult.LogEntryParcel parcel = list.get(i);
if(parcel.mIndent < 1) { if(parcel.mIndent < LOG_ENTRY_ITEM_INDENT) {
lastSection = i; lastSection = i;
} }

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/recyclerview/RecyclerFragment.java
View File

@@ -38,6 +38,8 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
public class RecyclerFragment<A extends RecyclerView.Adapter> extends Fragment { public class RecyclerFragment<A extends RecyclerView.Adapter> extends Fragment {
@@ -135,6 +137,10 @@ public class RecyclerFragment<A extends RecyclerView.Adapter> extends Fragment {
RecyclerView listView = new RecyclerView(context); RecyclerView listView = new RecyclerView(context);
listView.setId(INTERNAL_LIST_VIEW_ID); listView.setId(INTERNAL_LIST_VIEW_ID);
int padding = FormattingUtils.dpToPx(context, 8);
listView.setPadding(padding, 0, padding, 0);
listView.setClipToPadding(false);
listContainer.addView(listView, new FrameLayout.LayoutParams( listContainer.addView(listView, new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));

17
OpenKeychain/src/main/res/layout/log_display_activity.xml
View File

@@ -7,20 +7,11 @@
android:id="@+id/toolbar_include" android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" /> layout="@layout/toolbar_standalone" />
<LinearLayout <fragment
android:id="@+id/list"
android:layout_below="@id/toolbar_include" android:layout_below="@id/toolbar_include"
android:orientation="vertical" android:name="org.sufficientlysecure.keychain.ui.LogDisplayFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:paddingLeft="8dp"
android:paddingRight="8dp">
<fragment
android:id="@+id/list"
android:name="org.sufficientlysecure.keychain.ui.LogDisplayFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.9" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>