Refactor: Implement project/branch/topic/age control as view
This way it can be reused in other places.
Change-Id: If0ad73022c2237500cdc10c5330e26ffc2c582e9
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/app/src/main/java/com/google/reviewit/widget/ChangeBox.java b/app/src/main/java/com/google/reviewit/widget/ChangeBox.java
index bab77d8..9089e99 100644
--- a/app/src/main/java/com/google/reviewit/widget/ChangeBox.java
+++ b/app/src/main/java/com/google/reviewit/widget/ChangeBox.java
@@ -84,12 +84,9 @@
public void display(ReviewItApp app, Change change) {
configureInfo(app);
+ ((ProjectBranchTopicAgeView)v(R.id.projectBranchTopicAge)).init(change);
+
ChangeInfo info = change.info;
- WidgetUtil.setText(v(R.id.project), info.project);
- WidgetUtil.setText(v(R.id.branch), info.branch);
- WidgetUtil.setText(v(R.id.topic), info.topic);
- WidgetUtil.setText(v(R.id.age),
- FormatUtil.formatDate(getContext(), info.updated));
WidgetUtil.setText(v(R.id.subject), info.subject);
WidgetUtil.setText(v(R.id.commitMessage),
FormatUtil.formatMessage(change));
diff --git a/app/src/main/java/com/google/reviewit/widget/ProjectBranchTopicAgeView.java b/app/src/main/java/com/google/reviewit/widget/ProjectBranchTopicAgeView.java
new file mode 100644
index 0000000..12bab21
--- /dev/null
+++ b/app/src/main/java/com/google/reviewit/widget/ProjectBranchTopicAgeView.java
@@ -0,0 +1,54 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.reviewit.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.google.gerrit.extensions.common.ChangeInfo;
+import com.google.reviewit.R;
+import com.google.reviewit.app.Change;
+import com.google.reviewit.util.FormatUtil;
+import com.google.reviewit.util.WidgetUtil;
+
+import static com.google.reviewit.util.WidgetUtil.setVisible;
+
+public class ProjectBranchTopicAgeView extends LinearLayout {
+ public ProjectBranchTopicAgeView(Context context) {
+ this(context, null, 0);
+ }
+
+ public ProjectBranchTopicAgeView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public ProjectBranchTopicAgeView(
+ Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+
+ inflate(context, R.layout.project_branch_topic_age, this);
+ }
+
+ public void init(Change change) {
+ ChangeInfo info = change.info;
+ WidgetUtil.setText(findViewById(R.id.project), info.project);
+ WidgetUtil.setText(findViewById(R.id.branch), info.branch);
+ WidgetUtil.setText(findViewById(R.id.topic), info.topic);
+ WidgetUtil.setText(findViewById(R.id.age),
+ FormatUtil.formatDate(getContext(), info.updated));
+
+ }
+}
diff --git a/app/src/main/res/layout/change_box.xml b/app/src/main/res/layout/change_box.xml
index e8eeccf..7f42d22 100644
--- a/app/src/main/res/layout/change_box.xml
+++ b/app/src/main/res/layout/change_box.xml
@@ -29,77 +29,10 @@
android:layout_height="match_parent"
android:layout_weight="1">
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dp"
- android:textSize="9sp"
- android:text="@string/project"/>
-
- <TextView
- android:id="@+id/project"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="9sp"/>
- </LinearLayout>
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dp"
- android:textSize="9sp"
- android:text="@string/branch"/>
-
- <TextView
- android:id="@+id/branch"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="9sp"/>
- </LinearLayout>
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dp"
- android:textSize="9sp"
- android:text="@string/topic"/>
-
- <TextView
- android:id="@+id/topic"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="9sp"/>
- </LinearLayout>
-
- <TextView
- android:id="@+id/age"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="9sp"/>
- </LinearLayout>
+ <com.google.reviewit.widget.ProjectBranchTopicAgeView
+ android:id="@+id/projectBranchTopicAge"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
<View
android:background="@color/separator"
diff --git a/app/src/main/res/layout/project_branch_topic_age.xml b/app/src/main/res/layout/project_branch_topic_age.xml
new file mode 100644
index 0000000..8c945bf
--- /dev/null
+++ b/app/src/main/res/layout/project_branch_topic_age.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="3dp"
+ android:textSize="9sp"
+ android:text="@string/project"/>
+
+ <TextView
+ android:id="@+id/project"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="9sp"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="3dp"
+ android:textSize="9sp"
+ android:text="@string/branch"/>
+
+ <TextView
+ android:id="@+id/branch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="9sp"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="3dp"
+ android:textSize="9sp"
+ android:text="@string/topic"/>
+
+ <TextView
+ android:id="@+id/topic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="9sp"/>
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/age"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="9sp"/>
+</LinearLayout>
