#152. Add review fixes.

Author: bogdan-evtushenko

app/src/main/java/com/bogdan/codeforceswatcher/adapter/ContestAdapter.kt

@@ -19,12 +19,12 @@ import java.net.URLEncoder
 import java.text.SimpleDateFormat
 import java.util.*
 
-class ContestAdapter(private var items: List<Contest>, private val ctx: Context) : RecyclerView.Adapter<ContestAdapter.ViewHolder>() {
+class ContestAdapter(private var items: List<Contest>, private val context: Context) : RecyclerView.Adapter<ContestAdapter.ViewHolder>() {
 
     override fun getItemCount() = items.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(ctx).inflate(R.layout.contests_list_view, parent, false))
+        return ViewHolder(LayoutInflater.from(context).inflate(R.layout.contests_list_view, parent, false))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -41,9 +41,9 @@ class ContestAdapter(private var items: List<Contest>, private val ctx: Context)
         val calendarEventLink = "$CALENDAR_LINK?action=TEMPLATE&text=$encodeName&dates=$timeStart/$timeEnd&details=$CODEFORCES_LINK"
         val intent = Intent(Intent.ACTION_VIEW).setData(Uri.parse(calendarEventLink))
         try {
-            ctx.startActivity(intent)
+            context.startActivity(intent)
         } catch (error: ActivityNotFoundException) {
-            Toast.makeText(ctx, ctx.resources.getString(R.string.google_calendar_not_found), Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, context.resources.getString(R.string.google_calendar_not_found), Toast.LENGTH_SHORT).show()
         }
         Analytics.logAddContestToCalendarEvent(contest.name)
     }

app/src/main/java/com/bogdan/codeforceswatcher/adapter/UserAdapter.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.users_list_view.view.*
 import java.text.SimpleDateFormat
 import java.util.*
 
-class UserAdapter(private var items: List<User>, private val ctx: Context) : RecyclerView.Adapter<UserAdapter.ViewHolder>() {
+class UserAdapter(private var items: List<User>, private val context: Context) : RecyclerView.Adapter<UserAdapter.ViewHolder>() {
 
     override fun getItemCount(): Int {
         return items.size
@@ -29,7 +29,7 @@ class UserAdapter(private var items: List<User>, private val ctx: Context) : Rec
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(ctx).inflate(R.layout.users_list_view, parent, false))
+        return ViewHolder(LayoutInflater.from(context).inflate(R.layout.users_list_view, parent, false))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -39,42 +39,42 @@ class UserAdapter(private var items: List<User>, private val ctx: Context) : Rec
             holder.tvRating.text = null
         } else holder.tvRating.text = user.rating.toString()
         if (user.rank == null) {
-            holder.tvHandle.setTextColor(ContextCompat.getColor(ctx, grey))
-            holder.tvRating.setTextColor(ContextCompat.getColor(ctx, grey))
+            holder.tvHandle.setTextColor(ContextCompat.getColor(context, grey))
+            holder.tvRating.setTextColor(ContextCompat.getColor(context, grey))
         } else {
             if (user.rank == "legendary grandmaster") {
                 val text = "<font color=black>${user.handle[0]}</font><font color=red>${user.handle.subSequence(1, user.handle.lastIndex + 1)}</font>"
                 holder.tvHandle.text = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY);
             } else {
-                holder.tvHandle.setTextColor(ContextCompat.getColor(ctx, getColor(user.rank)))
+                holder.tvHandle.setTextColor(ContextCompat.getColor(context, getColor(user.rank)))
             }
-            holder.tvRating.setTextColor(ContextCompat.getColor(ctx, getColor(user.rank)))
+            holder.tvRating.setTextColor(ContextCompat.getColor(context, getColor(user.rank)))
 
         }
         val lastRatingChange = user.ratingChanges.lastOrNull()
         if (lastRatingChange != null) {
             val ratingDelta = lastRatingChange.newRating - lastRatingChange.oldRating
-            holder.tvLastRatingUpdate.text = ctx.resources.getString(
+            holder.tvLastRatingUpdate.text = context.resources.getString(
                     R.string.last_rating_update,
                     getDateTime(lastRatingChange.ratingUpdateTimeSeconds)
             )
             if (ratingDelta >= 0) {
                 holder.ivDelta.setImageResource(R.drawable.ic_rating_up)
                 holder.tvRatingChange.text = ratingDelta.toString()
-                holder.tvRatingChange.setTextColor(ContextCompat.getColor(ctx, bright_green))
+                holder.tvRatingChange.setTextColor(ContextCompat.getColor(context, bright_green))
             } else {
                 holder.ivDelta.setImageResource(R.drawable.ic_rating_down)
                 holder.tvRatingChange.text = (-ratingDelta).toString()
-                holder.tvRatingChange.setTextColor(ContextCompat.getColor(ctx, red))
+                holder.tvRatingChange.setTextColor(ContextCompat.getColor(context, red))
             }
         } else {
-            holder.tvLastRatingUpdate.text = ctx.resources.getString(R.string.no_rating_update)
+            holder.tvLastRatingUpdate.text = context.resources.getString(R.string.no_rating_update)
             holder.ivDelta.setImageResource(0)
             holder.tvRatingChange.text = null
         }
 
         holder.itemView.setOnClickListener {
-            ctx.startActivity(TryActivity.newIntent(ctx, user.id))
+            context.startActivity(TryActivity.newIntent(context, user.id))
         }
     }
 

app/src/main/res/values-ru-rRU/strings.xml

@@ -35,5 +35,5 @@
     <string name="users">Пользователи</string>
     <string name="contests">Контесты</string>
 
-    <string name="google_calendar_not_found">Извините, но на этом устройстве не найден Календарь Google</string>
+    <string name="google_calendar_not_found">Извините, но на этом устройстве не найден Google Calendar</string>
 </resources>

app/src/main/res/values-uk-rUA/strings.xml

@@ -35,5 +35,5 @@
     <string name="users">Користувачі</string>
     <string name="contests">Контести</string>
 
-    <string name="google_calendar_not_found">На жаль, на цьому пристрої не знайдено Календаря Google</string>
+    <string name="google_calendar_not_found">На жаль, на цьому пристрої не знайдено Google Calendar</string>
 </resources>