Commits

Ville Saalo committed 28d1f5e Merge
  • Participants
  • Parent commits 12024ac, e39290c

Comments (0)

Files changed (3)

File res/layout/changeset.xml

     android:layout_height="match_parent">
 
     <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="4dip">
             android:text="@string/description">
         </TextView>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:id="@+id/changeset_branch"
+            android:text="@string/nothing">
+        </TextView>
+
     </LinearLayout>
 
     <LinearLayout

File res/values/strings.xml

     
     <!-- ChangesetActivity.java -->
     <string name="changeset">Changeset:</string>
+    <string name="branch_label">Branch:</string>
     
     <!-- LoginActivity.java -->
     <string name="logging_in">Logging in&#8230;</string>

File src/com/saibotd/bitbeaker/ChangesetActivity.java

 			e1.printStackTrace();
 		}
 		TextView message = (TextView) findViewById(R.id.changeset_message);
+		TextView branch = (TextView) findViewById(R.id.changeset_branch);
 		try {
 			message.setText(mData.getString("message"));
+			String branch_tmp = mData.getString("branch");
+			if (!branch_tmp.equals("null")) branch.setText(this.getString(R.string.branch_label)+" "+branch_tmp);
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();