Skip to content

Commit aae29e2

Browse files
committed
cardview layout improved.
1 parent ef20629 commit aae29e2

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

mobile/src/main/java/io/syslogic/github/fragment/WorkflowRunsFragment.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
6666
super.onCreate(savedInstanceState);
6767
Bundle args = this.getArguments();
6868
if (args != null) {
69-
if (args.keySet().contains("android-support-nav:controller:deepLinkIntent")) {
70-
//noinspection DataFlowIssue
71-
this.setRepositoryId(Long.valueOf(args.getString(Constants.ARGUMENT_REPO_ID)));
72-
} else {
73-
this.setRepositoryId(args.getLong(Constants.ARGUMENT_REPO_ID));
69+
this.setRepositoryId(args.getLong(Constants.ARGUMENT_REPO_ID));
70+
71+
if (! args.keySet().contains("android-support-nav:controller:deepLinkIntent")) {
7472
this.setRepositoryOwner(args.getString(Constants.ARGUMENT_REPO_OWNER, null));
7573
this.setRepositoryName(args.getString(Constants.ARGUMENT_REPO_NAME, null));
7674
}

mobile/src/main/res/layout/cardview_workflow_run.xml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,37 @@
2929
android:layout_height="wrap_content"
3030
android:color="?android:colorControlHighlight"
3131
android:fontFamily="sans-serif-medium"
32-
android:layout_gravity="end"
32+
android:layout_gravity="start|center_vertical"
3333
android:padding="8dp"
3434
android:text='@{ "" + item.workflowId }'
3535
android:textColor="@color/colorText"
36-
android:textSize="14sp"/>
36+
android:textSize="14sp"
37+
android:visibility="gone"/>
3738

39+
<!-- runId -->
3840
<androidx.appcompat.widget.AppCompatTextView
3941
android:id="@+id/id"
4042
android:layout_width="wrap_content"
4143
android:layout_height="wrap_content"
4244
android:color="?android:colorControlHighlight"
4345
android:fontFamily="sans-serif-medium"
44-
android:layout_gravity="start"
46+
android:layout_gravity="start|center_vertical"
4547
android:padding="8dp"
4648
android:text='@{ "" + item.id }'
4749
android:textColor="@color/colorText"
50+
android:textSize="14sp"
51+
android:visibility="gone"/>
52+
53+
<androidx.appcompat.widget.AppCompatTextView
54+
android:id="@+id/runNumber"
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:color="?android:colorControlHighlight"
58+
android:fontFamily="sans-serif-medium"
59+
android:layout_gravity="start|center_vertical"
60+
android:padding="8dp"
61+
android:text='@{ "" + item.runNumber }'
62+
android:textColor="@color/colorText"
4863
android:textSize="14sp"/>
4964

5065
<androidx.appcompat.widget.AppCompatTextView
@@ -53,19 +68,32 @@
5368
android:layout_height="wrap_content"
5469
android:color="?android:colorControlHighlight"
5570
android:fontFamily="sans-serif-medium"
56-
android:layout_gravity="start"
71+
android:layout_gravity="start|center_vertical"
5772
android:padding="8dp"
5873
android:text='@{ item.name }'
5974
android:textColor="@color/colorText"
6075
android:textSize="14sp"/>
6176

77+
<androidx.appcompat.widget.AppCompatTextView
78+
android:id="@+id/displayTitle"
79+
android:layout_width="0dp"
80+
android:layout_height="wrap_content"
81+
android:layout_weight="1.00"
82+
android:color="?android:colorControlHighlight"
83+
android:fontFamily="sans-serif-medium"
84+
android:layout_gravity="start|center_vertical"
85+
android:padding="8dp"
86+
android:text='@{ item.displayTitle }'
87+
android:textColor="@color/colorText"
88+
android:textSize="14sp"/>
89+
6290
<androidx.appcompat.widget.AppCompatTextView
6391
android:id="@+id/conclusion"
6492
android:layout_width="wrap_content"
6593
android:layout_height="wrap_content"
6694
android:color="?android:colorControlHighlight"
6795
android:fontFamily="sans-serif-medium"
68-
android:layout_gravity="start"
96+
android:layout_gravity="end|center_vertical"
6997
android:padding="8dp"
7098
android:text='@{ item.conclusion }'
7199
android:textColor="@color/colorText"

0 commit comments

Comments
 (0)