Skip to content

Commit b147d09

Browse files
rohit9625rohit9625
authored
Merge branch 'commons-app:main' into main
2 parents 3083a55 + 908d3c4 commit b147d09

File tree

8 files changed

+268
-24
lines changed

8 files changed

+268
-24
lines changed

‎app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java

+16-14
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818

1919
import com.dinuscxj.progressbar.CircleProgressBar;
2020

21+
import fr.free.nrw.commons.databinding.ActivityQuizResultBinding;
2122
import java.io.File;
2223
import java.io.FileOutputStream;
2324

24-
import butterknife.BindView;
25-
import butterknife.ButterKnife;
26-
import butterknife.OnClick;
2725
import fr.free.nrw.commons.R;
2826
import fr.free.nrw.commons.contributions.MainActivity;
2927

@@ -33,20 +31,19 @@
3331
*/
3432
public class QuizResultActivity extends AppCompatActivity {
3533

36-
@BindView(R.id.result_progress_bar) CircleProgressBar resultProgressBar;
37-
@BindView(R.id.toolbar) Toolbar toolbar;
38-
@BindView(R.id.congratulatory_message) TextView congratulatoryMessageText;
39-
34+
private ActivityQuizResultBinding binding;
4035
private final int NUMBER_OF_QUESTIONS = 5;
4136
private final int MULTIPLIER_TO_GET_PERCENTAGE = 20;
4237

4338
@Override
4439
protected void onCreate(Bundle savedInstanceState) {
4540
super.onCreate(savedInstanceState);
46-
setContentView(R.layout.activity_quiz_result);
41+
binding = ActivityQuizResultBinding.inflate(getLayoutInflater());
42+
setContentView(binding.getRoot());
43+
44+
setSupportActionBar(binding.toolbar.toolbar);
4745

48-
ButterKnife.bind(this);
49-
setSupportActionBar(toolbar);
46+
binding.quizResultNext.setOnClickListener(view -> launchContributionActivity());
5047

5148
if ( getIntent() != null) {
5249
Bundle extras = getIntent().getExtras();
@@ -60,22 +57,27 @@ protected void onCreate(Bundle savedInstanceState) {
6057
}
6158
}
6259

60+
@Override
61+
protected void onDestroy() {
62+
binding = null;
63+
super.onDestroy();
64+
}
65+
6366
/**
6467
* to calculate and display percentage and score
6568
* @param score
6669
*/
6770
public void setScore(int score) {
6871
int per = score * MULTIPLIER_TO_GET_PERCENTAGE;
69-
resultProgressBar.setProgress(per);
70-
resultProgressBar.setProgressTextFormatPattern(score +" / " + NUMBER_OF_QUESTIONS);
72+
binding.resultProgressBar.setProgress(per);
73+
binding.resultProgressBar.setProgressTextFormatPattern(score +" / " + NUMBER_OF_QUESTIONS);
7174
String message = getResources().getString(R.string.congratulatory_message_quiz,per + "%");
72-
congratulatoryMessageText.setText(message);
75+
binding.congratulatoryMessage.setText(message);
7376
}
7477

7578
/**
7679
* to go to Contibutions Activity
7780
*/
78-
@OnClick(R.id.quiz_result_next)
7981
public void launchContributionActivity(){
8082
startActivityWithFlags(
8183
this, MainActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,

‎app/src/main/res/layout/activity_quiz_result.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
android:orientation="vertical"
66
android:layout_width="match_parent">
77

8-
<include layout="@layout/toolbar"/>
8+
<include
9+
android:id="@+id/toolbar"
10+
layout="@layout/toolbar"/>
911

1012
<androidx.cardview.widget.CardView
1113
android:layout_height="match_parent"
@@ -24,16 +26,12 @@
2426
android:layout_width="match_parent"
2527
android:layout_height="match_parent">
2628

27-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
28-
xmlns:tools="http://schemas.android.com/tools"
29+
<LinearLayout
2930
android:layout_width="match_parent"
3031
android:layout_height="wrap_content"
31-
xmlns:app="http://schemas.android.com/apk/res-auto"
3232
android:orientation="vertical"
33-
tools:context="fr.free.nrw.commons.quiz.QuizResultActivity"
3433
android:id="@+id/quiz_result">
3534

36-
3735
<TextView
3836
android:layout_width="wrap_content"
3937
android:layout_height="wrap_content"

‎app/src/main/res/values-da/strings.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<string name="detail_license_empty">Ukendt licens</string>
168168
<string name="menu_refresh">Opdater</string>
169169
<string name="read_storage_permission_rationale">Krævet tilladelse: Læs eksternt lager. Programmet kan ikke tilgå dit galleri uden denne tilladelse.</string>
170-
<string name="write_storage_permission_rationale" fuzzy="true">Krævet tilladelse: Skriv til eksternt lager. Program kan ikke tilgå dit kamera uden denne funktion.</string>
170+
<string name="write_storage_permission_rationale">Krævet tilladelse: Skriv til eksternt lager. Appen kan ikke tilgå dit kamera/galleri uden denne tilladelse.</string>
171171
<string name="ok">O.k.</string>
172172
<string name="warning">Advarsel</string>
173173
<string name="yes">Ja</string>
@@ -217,8 +217,8 @@
217217
<string name="upload_problem_image_duplicate">Billedet er allerede på Commons.</string>
218218
<string name="upload_problem_different_geolocation">Billedet blev taget et andet sted.</string>
219219
<string name="upload_problem_do_you_continue">Ønsker du stadig at overføre dette billede?</string>
220-
<string name="use_external_storage" fuzzy="true">Brug eksternt lager</string>
221-
<string name="use_external_storage_summary" fuzzy="true">Gem billeder taget med din enheds program på kameraet</string>
220+
<string name="use_external_storage">Gem billeder i appen</string>
221+
<string name="use_external_storage_summary">Gem billeder, taget med kameraet i appen, på din enhed</string>
222222
<string name="login_to_your_account">Log ind på din konto</string>
223223
<string name="send_log_file">Send logfil</string>
224224
<string name="send_log_file_description" fuzzy="true">Send logfil til udviklerne via e-post</string>

‎app/src/main/res/values-de/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* Tacsipacsi
2828
* ThisCarthing
2929
* Tobi 406
30+
* Twistqj
3031
* Ubahnverleih
3132
* Umherirrender
3233
* Umlaut
@@ -697,6 +698,8 @@
697698
<string name="custom_selector_info_text2">Im Gegensatz zum Bild auf der linken Seite ist das Bild auf der rechten Seite mit dem Commons-Logo versehen, das anzeigt, dass es bereits hochgeladen wurde. Für die Bildvorschau berühren und halten.</string>
698699
<string name="welcome_custom_selector_ok">Großartig</string>
699700
<string name="custom_selector_already_uploaded_image_text">Dieses Bild ist bereits auf Commons hochgeladen worden.</string>
701+
<string name="custom_selector_over_limit_warning">Aus technischen Gründen kann die Anwendung nicht mehr als %1$d Bilder auf einmal verlässlich hochladen. Die Grenze für das Hochladen von %1$d wurde um %2$d überschritten.</string>
702+
<string name="custom_selector_limit_error_desc">Fehler: Grenze für das Hochladen wurde überschritten</string>
700703
<string name="wlm_upload_info">Dieses Bild wird am Wettbewerb Wiki Loves Monuments teilnehmen</string>
701704
<string name="display_monuments">Denkmäler anzeigen</string>
702705
<string name="wlm_month_message">Es ist der Wiki Loves Monuments Monat!</string>

‎app/src/main/res/values-gcr/strings.xml

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Authors:
3+
* LeGuyanaisPure
4+
-->
5+
<resources>
6+
<string name="commons_facebook">Paj Facebook di Commons</string>
7+
<string name="commons_github">Kod sours Github pou Commons</string>
8+
<string name="commons_logo">Logo di Commons</string>
9+
<string name="commons_website">Sit web di Commons</string>
10+
<string name="submit">Soumèt</string>
11+
<string name="add_another_description">Ajouté rounòt dèskripsyon</string>
12+
<string name="add_new_contribution">Ajouté roun kontribisyon nòv</string>
13+
<string name="add_contribution_from_camera">Ajouté roun kontribisyon dipi kanméra-a</string>
14+
<string name="add_contribution_from_photos">Ajouté roun kontribisyon dipi foto-yo</string>
15+
<string name="show_captions">Léjann</string>
16+
<string name="row_item_language_description">Dèskripsyon lanng-an</string>
17+
<string name="row_item_caption">Léjann</string>
18+
<string name="show_captions_description">Dèskripsyon</string>
19+
<string name="nearby_row_image">Zimaj</string>
20+
<string name="nearby_all">Tout</string>
21+
<string name="nearby_filter_search">Wè di sasé</string>
22+
<string name="nearby_filter_state">Léta di bagaj</string>
23+
<string name="appwidget_img">Zimaj pou jodla</string>
24+
<string name="uploads_pending_notification_indicator">%1$d fiché ka télévèrsé</string>
25+
<string name="starting_uploads">Koumansman di télévèrsé-ya</string>
26+
<string name="navigation_item_explore">Èsploré</string>
27+
<string name="preference_category_general">Jénéral</string>
28+
<string name="preference_category_feedback">Koumantèr</string>
29+
<string name="preference_category_privacy">Konfidansyalité</string>
30+
<string name="app_name">Commons</string>
31+
<string name="menu_settings">Paranmèt</string>
32+
<string name="intent_share_upload_label">Télévèrsé asou Commons</string>
33+
<string name="upload_in_progress">Bagaj-a ka charjé</string>
34+
<string name="username">Non itilizatò</string>
35+
<string name="password">Kodsigré</string>
36+
<string name="login_credential">Konnègsyon ké ou kont Commons Béta</string>
37+
<string name="login">Konnègté sokò</string>
38+
<string name="forgot_password">Ou bliyé ou Kodsigré ?</string>
39+
<string name="signup">Enskri oukò</string>
40+
<string name="logging_in_title">Konnègsyon</string>
41+
<string name="logging_in_message">Souplé antann...</string>
42+
<string name="updating_caption_title">Mizajou di léjann-yan ké dèskripsyon-yan</string>
43+
<string name="updating_caption_message">Souplé antann...</string>
44+
<string name="login_success">Konnègsyon bon !</string>
45+
<string name="login_failed">Konnègsyon pabon !</string>
46+
<string name="upload_failed">Fiché pa trouvé. Souplé éséyé ké rounòt.</string>
47+
<string name="authentication_failed">Lotantifikasyon pabon, souplé konnègté oukò òkò.</string>
48+
<string name="uploading_started">Télévèrsé koumansé !</string>
49+
<string name="upload_completed_notification_title">%1$s télévèrsé !</string>
50+
<string name="upload_completed_notification_text">Pézé pou wè kisa ou télévèrsé</string>
51+
<string name="upload_progress_notification_title_start">Téléversé di fiché : %s</string>
52+
<string name="upload_progress_notification_title_in_progress">%1$s ka télévèrsé</string>
53+
<string name="upload_progress_notification_title_finishing">Télévèrsé fini pou %1$s</string>
54+
<string name="upload_failed_notification_subtitle">Pézé pou afiché</string>
55+
<string name="upload_paused_notification_subtitle">Tapé pou afiché</string>
56+
<string name="title_activity_contributions">Sa mo fin télévèrsé</string>
57+
<string name="contribution_state_queued">Sa ka fè latcho</string>
58+
<string name="contribution_state_failed">Pabon</string>
59+
<string name="contribution_state_in_progress">%1$d %% byenfèt</string>
60+
<string name="contribution_state_starting">Ka télévèrsé</string>
61+
<string name="menu_from_gallery">Dipi galri-a</string>
62+
<string name="menu_from_camera">Dap roun foto</string>
63+
<string name="menu_nearby">Òbò</string>
64+
<string name="provider_contributions">Sa mo télévèrsé</string>
65+
<string name="menu_share">Patajé</string>
66+
<string name="menu_view_file_page">Wè paj fiché-a</string>
67+
<string name="share_title_hint">Léjann (anba lobligasyon)</string>
68+
<string name="add_caption_toast">Souplé ba nou roun léjann pou sa fiché</string>
69+
<string name="share_description_hint">Dèskripsyon</string>
70+
<string name="share_caption_hint">Léjann</string>
71+
<string name="login_failed_network">Konnègsyon pa posib - rézo pabon</string>
72+
<string name="login_failed_generic">Konnègsyon pabon</string>
73+
<string name="share_upload_button">Télévèrsé</string>
74+
<string name="multiple_share_base_title">Nonmem sa ansanm</string>
75+
<string name="provider_modifications">Modifikasyon-yan</string>
76+
<string name="menu_upload_single">Télévèrsé</string>
77+
<string name="categories_search_text_hint">Sasé tchèk katégori</string>
78+
<string name="menu_save_categories">Anréjistré</string>
79+
<string name="refresh_button">Atchwèlizé</string>
80+
<string name="display_list_button">Mété annan lis</string>
81+
<string name="categories_activity_title">Katégori</string>
82+
<string name="title_activity_settings">Paranmèt</string>
83+
<string name="title_activity_signup">Enskri oukò</string>
84+
<string name="title_activity_featured_images">Zimaj ki byenfèt</string>
85+
<string name="title_activity_category_details">Katégori</string>
86+
<string name="menu_about">Apropo</string>
87+
<string name="about_privacy_policy">Politik di konfidansyalité</string>
88+
<string name="about_credits">Krédi</string>
89+
<string name="title_activity_about">Apropo</string>
90+
<string name="menu_retry_upload">Réyéséyé</string>
91+
<string name="menu_cancel_upload">Annilé</string>
92+
<string name="menu_download">Téléchajé</string>
93+
<string name="preference_theme">Tenm</string>
94+
<string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
95+
<string name="license_name_cc_by_four"> Attribution 4.0</string>
96+
<string name="welcome_final_button_text">Enren !</string>
97+
<string name="welcome_help_button_text">Plis lenfòrmasyon</string>
98+
<string name="detail_panel_cats_label">Katégori-ya</string>
99+
<string name="detail_panel_cats_loading">Chajman ka fèt...</string>
100+
<string name="detail_panel_cats_none">Pyès katégori sélègsyonnen</string>
101+
<string name="detail_caption_empty">Pyès léjann</string>
102+
<string name="detail_description_empty">Pyès dèskripsyon</string>
103+
<string name="detail_discussion_empty">Pyès kozman</string>
104+
<string name="detail_license_empty">Lisans pa konnèt</string>
105+
<string name="menu_refresh">Atchwèlizé</string>
106+
<string name="ok">Dakò</string>
107+
<string name="warning">Panga</string>
108+
<string name="upload">Télévèrsé</string>
109+
<string name="yes">Enren</string>
110+
<string name="no">Awa</string>
111+
<string name="media_detail_caption">Léjann</string>
112+
<string name="media_detail_title">Tit</string>
113+
<string name="media_detail_description">Dèskripsyon</string>
114+
<string name="media_detail_discussion">Kozman</string>
115+
<string name="media_detail_author">Zotò</string>
116+
<string name="media_detail_uploaded_date">Dat di télévèrsman</string>
117+
<string name="media_detail_license">Lisans</string>
118+
<string name="media_detail_coordinates">Koyòrdonnen</string>
119+
<string name="media_detail_coordinates_empty">Pa fourni</string>
120+
<string name="logout_verification">Ès ou vréman lé dékonnègté oukò</string>
121+
<string name="no_subcategory_found">Pyès soukatégori ki trouvé</string>
122+
<string name="welcome_image_welcome_wikipedia">Bèlvini di Wikipédja</string>
123+
<string name="cancel">Annilé</string>
124+
<string name="navigation_drawer_open">Louvri</string>
125+
<string name="navigation_drawer_close">Fronmen</string>
126+
<string name="navigation_item_home">Paj prensipal</string>
127+
<string name="navigation_item_upload">Télévèrsé</string>
128+
<string name="navigation_item_nearby">Òbò</string>
129+
<string name="navigation_item_about">Apropo</string>
130+
<string name="navigation_item_settings">Paranmèt</string>
131+
<string name="navigation_item_feedback">Koumantèr</string>
132+
<string name="navigation_item_logout">Dékonnègsyon</string>
133+
<string name="navigation_item_info">Titoryèl</string>
134+
<string name="navigation_item_notification">Notifikasyon</string>
135+
<string name="navigation_item_review">Roulègtir</string>
136+
<string name="no_description_found">pyès dèskripsyon trouvé</string>
137+
<string name="nearby_info_menu_commons_article">Paj di fiché di Commons</string>
138+
<string name="nearby_info_menu_wikidata_article">Zéléman di Wkikdata</string>
139+
<string name="nearby_info_menu_wikipedia_article">Artik di Wikipédja</string>
140+
<string name="login_to_your_account">Konnègté oukò asou ou kont</string>
141+
<string name="send_log_file">Voyé jòrnal-a</string>
142+
<string name="skip_login">Pasé</string>
143+
<string name="navigation_item_login">Konnègté sokò</string>
144+
<string name="skip_login_title">Ès ou vréman pa lé konnègté oukò</string>
145+
<string name="login_alert_message">Souplé konnègté oukò pou itilizé sa fongsyonnalité</string>
146+
<string name="nearby_wikidata">Wikidata</string>
147+
<string name="nearby_wikipedia">Wikipédja</string>
148+
<string name="nearby_commons">Commons</string>
149+
<string name="about_rate_us">Noté nou</string>
150+
<string name="user_guide">Gidaj pou itilizatò</string>
151+
<string name="welcome_skip_button">Pasé titoryèl</string>
152+
<string name="no_internet">Lentèrnèt pa disponnib</string>
153+
<string name="about_translate">Anmòrfrézé</string>
154+
<string name="about_translate_title">Lanng</string>
155+
<string name="about_translate_proceed">Kontinwé</string>
156+
<string name="about_translate_cancel">Annilé</string>
157+
<string name="retry">Réyéséyé</string>
158+
<string name="no_images_found">Pyès zimaj ki trouvé !</string>
159+
<string name="image_uploaded_by">Télévèrsé pa : %1$s</string>
160+
<string name="block_notification_title">Bloké</string>
161+
<string name="app_widget_heading">Zimaj pou jodla</string>
162+
<string name="menu_search_button">Sasé</string>
163+
<string name="search_commons">Sasé asou Commons</string>
164+
<string name="title_activity_search">Sasé</string>
165+
<string name="search_recent_header">Sasé ki nòv :</string>
166+
<string name="search_tab_title_media">Médja</string>
167+
<string name="search_tab_title_categories">Katégori</string>
168+
<string name="search_tab_title_depictions">Léléman</string>
169+
<string name="explore_tab_title_featured">Roumarkab</string>
170+
<string name="explore_tab_title_mobile">Télévèrsé pa mobil</string>
171+
<string name="explore_tab_title_map">Kart</string>
172+
<string name="quiz">Késyonèr</string>
173+
<string name="question">Késyon</string>
174+
<string name="result">Rézilta</string>
175+
<string name="continue_message">Kontinwé</string>
176+
<string name="correct">Répons korèk</string>
177+
<string name="wrong">Mové répons</string>
178+
<string name="share_app_title">Patajé annan laplikasyon</string>
179+
<string name="rotate">Pivoté</string>
180+
<string name="delete">Siprimen</string>
181+
<string name="Achievements">Akonplisman</string>
182+
<string name="Profile">Profil</string>
183+
<string name="statistics">Èstatistik</string>
184+
<string name="statistics_thanks">Grémésiman rousouvrè</string>
185+
<string name="statistics_featured">Zimaj ki byenfèt</string>
186+
<string name="level">Nivèl</string>
187+
<string name="images_used_by_wiki">Zimaj ki itilizé</string>
188+
<string name="contributions_fragment">Kontribisyon</string>
189+
<string name="nearby_fragment">Òbò</string>
190+
<string name="notifications">Notifikasyon</string>
191+
<string name="list_sheet">Listé</string>
192+
<string name="storage_permission">Drwè pou èstokaj</string>
193+
<string name="next">Swivan</string>
194+
<string name="previous">Présédan</string>
195+
<string name="title_page_bookmarks_pictures">Zimaj</string>
196+
<string name="title_page_bookmarks_locations">Koté</string>
197+
<string name="provider_bookmarks">Markòpaj</string>
198+
<string name="provider_bookmarks_location">Markòpaj</string>
199+
<string name="search_this_area">Sasé annan sa zonn</string>
200+
<string name="nominate_for_deletion_done">Fèt</string>
201+
</resources>

0 commit comments

Comments
 (0)