File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ class CoordinateEditHelper @Inject constructor(
6161
/**
6262
* Replaces new coordinates
6363
* @param media to be added
64-
* @param Latitude to be added
65-
* @param Longitude to be added
66-
* @param Accuracy to be added
64+
* @param latitude to be added
65+
* @param longitude to be added
66+
* @param accuracy to be added
6767
* @return Observable<Boolean>
6868
*/
6969
private fun addCoordinates(
7070
media: Media,
71-
Latitude: String,
72-
Longitude: String,
73-
Accuracy: String
71+
latitude: String,
72+
longitude: String,
73+
accuracy: String
7474
): Observable<Boolean>? {
7575
Timber.d("thread is coordinates adding %s", Thread.currentThread().getName())
7676
val summary = "Adding Coordinates"
@@ -83,9 +83,9 @@ class CoordinateEditHelper @Inject constructor(
8383
.blockingGet()
8484
}
8585

86-
if (Latitude != null) {
87-
buffer.append("\n{{Location|").append(Latitude).append("|").append(Longitude)
88-
.append("|").append(Accuracy).append("}}")
86+
if (latitude != null) {
87+
buffer.append("\n{{Location|").append(latitude).append("|").append(longitude)
88+
.append("|").append(accuracy).append("}}")
8989
}
9090

9191
val editedLocation = buffer.toString()
@@ -141,7 +141,7 @@ class CoordinateEditHelper @Inject constructor(
141141
* @param media to be added
142142
* @param latitude to be added
143143
* @param longitude to be added
144-
* @param Accuracy to be added
144+
* @param accuracy to be added
145145
* @param result to be added
146146
* @return boolean
147147
*/
@@ -150,7 +150,7 @@ class CoordinateEditHelper @Inject constructor(
150150
media: Media,
151151
latitude: String,
152152
longitude: String,
153-
Accuracy: String,
153+
accuracy: String,
154154
result: Boolean
155155
): Boolean {
156156
val message: String
@@ -160,7 +160,7 @@ class CoordinateEditHelper @Inject constructor(
160160
media.coordinates = fr.free.nrw.commons.location.LatLng(
161161
latitude.toDouble(),
162162
longitude.toDouble(),
163-
Accuracy.toFloat()
163+
accuracy.toFloat()
164164
)
165165
title += ": " + context.getString(R.string.coordinates_edit_helper_show_edit_title_success)
166166
val coordinatesInMessage = StringBuilder()
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ class QuizChecker @Inject constructor(
4040

4141
private val compositeDisposable = CompositeDisposable()
4242

43-
private val UPLOAD_COUNT_THRESHOLD = 5
44-
private val REVERT_PERCENTAGE_FOR_MESSAGE = "50%"
45-
private val REVERT_SHARED_PREFERENCE = "revertCount"
46-
private val UPLOAD_SHARED_PREFERENCE = "uploadCount"
43+
private val uploadCountThreshold = 5
44+
private val revertPercentageForMessage = "50%"
45+
private val revertSharedPreference = "revertCount"
46+
private val uploadSharedPreference = "uploadCount"
4747

4848
/**
4949
* Initializes quiz check by calculating revert parameters and showing quiz if necessary
@@ -80,12 +80,12 @@ class QuizChecker @Inject constructor(
8080
*/
8181
private fun setTotalUploadCount(uploadCount: Int) {
8282
totalUploadCount = uploadCount - revertKvStore.getInt(
83-
UPLOAD_SHARED_PREFERENCE,
83+
uploadSharedPreference,
8484
0
8585
)
8686
if (totalUploadCount < 0) {
8787
totalUploadCount = 0
88-
revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0)
88+
revertKvStore.putInt(uploadSharedPreference, 0)
8989
}
9090
isUploadCountFetched = true
9191
}
@@ -112,10 +112,10 @@ class QuizChecker @Inject constructor(
112112
* @param revertCountFetched Count of deleted uploads
113113
*/
114114
private fun setRevertParameter(revertCountFetched: Int) {
115-
revertCount = revertCountFetched - revertKvStore.getInt(REVERT_SHARED_PREFERENCE, 0)
115+
revertCount = revertCountFetched - revertKvStore.getInt(revertSharedPreference, 0)
116116
if (revertCount < 0) {
117117
revertCount = 0
118-
revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0)
118+
revertKvStore.putInt(revertSharedPreference, 0)
119119
}
120120
isRevertCountFetched = true
121121
}
@@ -128,13 +128,13 @@ class QuizChecker @Inject constructor(
128128
setRevertCount()
129129

130130
if (revertCount < 0 || totalUploadCount < 0) {
131-
revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0)
132-
revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0)
131+
revertKvStore.putInt(revertSharedPreference, 0)
132+
revertKvStore.putInt(uploadSharedPreference, 0)
133133
return
134134
}
135135

136136
if (isRevertCountFetched && isUploadCountFetched &&
137-
totalUploadCount >= UPLOAD_COUNT_THRESHOLD &&
137+
totalUploadCount >= uploadCountThreshold &&
138138
(revertCount * 100) / totalUploadCount >= 50
139139
) {
140140
callQuiz(activity)
@@ -149,7 +149,7 @@ class QuizChecker @Inject constructor(
149149
DialogUtil.showAlertDialog(
150150
activity,
151151
activity.getString(R.string.quiz),
152-
activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE),
152+
activity.getString(R.string.quiz_alert_message, revertPercentageForMessage),
153153
activity.getString(R.string.about_translate_proceed),
154154
activity.getString(android.R.string.cancel),
155155
{ startQuizActivity(activity) },
@@ -161,11 +161,11 @@ class QuizChecker @Inject constructor(
161161
* Starts the quiz activity and updates preferences for revert and upload counts
162162
*/
163163
private fun startQuizActivity(activity: Activity) {
164-
val newRevertSharedPrefs = revertCount + revertKvStore.getInt(REVERT_SHARED_PREFERENCE, 0)
165-
revertKvStore.putInt(REVERT_SHARED_PREFERENCE, newRevertSharedPrefs)
164+
val newRevertSharedPrefs = revertCount + revertKvStore.getInt(revertSharedPreference, 0)
165+
revertKvStore.putInt(revertSharedPreference, newRevertSharedPrefs)
166166

167-
val newUploadCount = totalUploadCount + revertKvStore.getInt(UPLOAD_SHARED_PREFERENCE, 0)
168-
revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, newUploadCount)
167+
val newUploadCount = totalUploadCount + revertKvStore.getInt(uploadSharedPreference, 0)
168+
revertKvStore.putInt(uploadSharedPreference, newUploadCount)
169169

170170
val intent = Intent(activity, WelcomeActivity::class.java).apply {
171171
putExtra("isQuiz", true)
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import fr.free.nrw.commons.contributions.MainActivity
3030
class QuizResultActivity : AppCompatActivity() {
3131

3232
private var binding: ActivityQuizResultBinding? = null
33-
private val NUMBER_OF_QUESTIONS = 5
34-
private val MULTIPLIER_TO_GET_PERCENTAGE = 20
33+
private val numberOfQuestions = 5
34+
private val multiplierToGetPercentage = 20
3535

3636
public override fun onCreate(savedInstanceState: Bundle?) {
3737
super.onCreate(savedInstanceState)
@@ -67,9 +67,9 @@ class QuizResultActivity : AppCompatActivity() {
6767
*/
6868
@SuppressLint("StringFormatInvalid", "SetTextI18n")
6969
fun setScore(score: Int) {
70-
val scorePercent = score * MULTIPLIER_TO_GET_PERCENTAGE
70+
val scorePercent = score * multiplierToGetPercentage
7171
binding?.resultProgressBar?.progress = scorePercent
72-
binding?.tvResultProgress?.text = "$score / $NUMBER_OF_QUESTIONS"
72+
binding?.tvResultProgress?.text = "$score / $numberOfQuestions"
7373
val message = resources.getString(R.string.congratulatory_message_quiz, "$scorePercent%")
7474
binding?.congratulatoryMessage?.text = message
7575
}

0 commit comments

Comments
 (0)