Extract strings

Author: Tunous

app/src/main/java/com/gh4a/activities/ReviewActivity.java

@@ -40,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         ActionBar actionBar = getSupportActionBar();
-        mTitle = getResources().getString(R.string.pull_request_title) + " #" + mIssueNumber + " - Review";
+        mTitle = getString(R.string.review_title_format, mIssueNumber);
         actionBar.setTitle(mTitle);
         actionBar.setSubtitle(mRepoOwner + "/" + mRepoName);
         actionBar.setDisplayHomeAsUpEnabled(true);

app/src/main/java/com/gh4a/adapter/timeline/ReplyViewHolder.java

@@ -63,7 +63,7 @@ public void onClick(DialogInterface dialog, int which) {
 
             AlertDialog d = new AlertDialog.Builder(v.getContext())
                     .setCancelable(true)
-                    .setTitle("Reply to review comments")
+                    .setTitle(R.string.reply_to_review_comments)
                     .setView(commentDialog)
                     .setPositiveButton(R.string.reply, saveCb)
                     .setNegativeButton(R.string.cancel, null)

app/src/main/java/com/gh4a/adapter/timeline/ReviewViewHolder.java

@@ -7,6 +7,7 @@
 import android.support.annotation.AttrRes;
 import android.support.annotation.DrawableRes;
 import android.support.v7.widget.PopupMenu;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -25,6 +26,7 @@
 import com.gh4a.utils.IntentUtils;
 import com.gh4a.utils.StringUtils;
 import com.gh4a.utils.UiUtils;
+import com.gh4a.widget.StyleableTextView;
 
 import org.eclipse.egit.github.core.CommitComment;
 import org.eclipse.egit.github.core.Review;
@@ -46,7 +48,7 @@ class ReviewViewHolder
     private final Callback mCallback;
 
     private final ImageView mAvatarView;
-    private final TextView mMessageView;
+    private final StyleableTextView mMessageView;
     private final TextView mBodyView;
     private final Button mShowDetailsButton;
     private final View mAvatarContainer;
@@ -79,7 +81,7 @@ public ReviewViewHolder(View itemView, HttpImageGetter imageGetter,
         mCallback = callback;
 
         mAvatarView = (ImageView) itemView.findViewById(R.id.iv_gravatar);
-        mMessageView = (TextView) itemView.findViewById(R.id.tv_message);
+        mMessageView = (StyleableTextView) itemView.findViewById(R.id.tv_message);
         mBodyView = (TextView) itemView.findViewById(R.id.tv_desc);
         mShowDetailsButton = (Button) itemView.findViewById(R.id.btn_show_details);
         mShowDetailsButton.setOnClickListener(this);
@@ -220,25 +222,31 @@ private int getEventIconResId(Review review) {
     }
 
     private void formatTitle(Review review) {
-        String login = review.getUser().getLogin();
-        CharSequence time = review.getSubmittedAt() != null
-                ? StringUtils.formatRelativeTime(mContext, review.getSubmittedAt(), true) : "";
-
+        int textResId;
         switch (review.getState()) {
             case Review.STATE_APPROVED:
-                mMessageView.setText(login + " approved these changes " + time);
+                textResId = R.string.pull_request_event_review_approved;
                 break;
             case Review.STATE_CHANGES_REQUESTED:
-                mMessageView.setText(login + " requested changes" + time);
+                textResId = R.string.pull_request_event_review_requested_changes;
                 break;
             case Review.STATE_DISMISSED:
             case Review.STATE_COMMENTED:
-                mMessageView.setText(login + " reviewed " + time);
+            default:
+                textResId = R.string.pull_request_event_review_reviewed;
                 break;
             case Review.STATE_PENDING:
-                mMessageView.setText(login + " started a review " + time);
+                textResId = R.string.pull_request_event_review_started_review;
                 break;
         }
+
+        String login = review.getUser().getLogin();
+        CharSequence time = review.getSubmittedAt() != null
+                ? StringUtils.formatRelativeTime(mContext, review.getSubmittedAt(), true) : "";
+        String rawMessage = mContext.getString(textResId, login, time);
+        SpannableStringBuilder message = StringUtils.applyBoldTags(mContext, rawMessage,
+                mMessageView.getTypefaceValue());
+        mMessageView.setText(message);
     }
 
     @Override

app/src/main/res/layout/row_timeline_review.xml

@@ -41,7 +41,7 @@
         android:layout_below="@id/details_container_divider"
         android:paddingLeft="@dimen/content_padding"
         android:paddingRight="@dimen/content_padding"
-        android:text="Reviewed files:" />
+        android:text="@string/reviewed_files" />
 
     <LinearLayout
         android:id="@+id/details_container"
@@ -56,6 +56,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/details_container"
-        android:text="Show details" />
+        android:text="@string/show_details" />
 
 </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -124,6 +124,9 @@
     <string name="undo">Undo</string>
     <string name="raw">Raw</string>
     <string name="view_in_file">View in file</string>
+    <string name="reply_to_review_comments">Reply to review comments</string>
+    <string name="reviewed_files">Reviewed files:</string>
+    <string name="show_details">Show details</string>
 
     <string name="reaction_plus_one" translatable="false">+1</string>
     <string name="reaction_minus_one" translatable="false">-1</string>
@@ -299,6 +302,10 @@
     <string name="pull_request_event_unassigned_self">Pull request was self-unassigned from %1$s</string>
     <string name="pull_request_event_locked">Pull request was [b]locked[/b] by %1$s</string>
     <string name="pull_request_event_unlocked">Pull request was unlocked by %1$s</string>
+    <string name="pull_request_event_review_approved">[b]%1$s[/b] approved these changes %2$s</string>
+    <string name="pull_request_event_review_requested_changes">[b]%1$s[/b] requested changes %2$s</string>
+    <string name="pull_request_event_review_reviewed">[b]%1$s[/b] reviewed %2$s</string>
+    <string name="pull_request_event_review_started_review">[b]%1$s[/b] started a review %2$s</string>
 
     <!-- Commit -->
     <string name="commit_title">Commit %1$s</string>
@@ -405,6 +412,7 @@
 
     <!-- Pull Request -->
     <string name="pull_request_title">Pull Request</string>
+    <string name="review_title_format">Pull Request #%1$d - Review</string>
     <string name="pull_request_conversation">Conversation</string>
     <string name="pull_request_files">Files</string>
     <string name="pull_requests">Pull Requests</string>