Skip to content

Commit

Permalink
linting (#1850)
Browse files Browse the repository at this point in the history
* linting

* linting translations

* linting translations
  • Loading branch information
teolemon committed Aug 20, 2018
1 parent eb2d831 commit 91f73c3
Show file tree
Hide file tree
Showing 168 changed files with 936 additions and 1,063 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_product.xml
Expand Up @@ -82,7 +82,7 @@
android:layout_below="@+id/titleHeader"
android:layout_gravity="center_vertical"
android:gravity="center"
android:text="Title"
android:text="@string/title_activity_product"
android:textAlignment="center"
android:textSize="@dimen/font_large" />

Expand All @@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/descriptionHeader"
android:gravity="center"
android:text="description"
android:text="@string/description_activity_product"
android:textAlignment="center"
android:textSize="@dimen/font_normal" />
</LinearLayout>
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/res/layout/fragment_contributors.xml
Expand Up @@ -97,19 +97,22 @@
android:id="@+id/contribute_image_front"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp" />
android:layout_margin="16dp"
android:contentDescription="TODO" />

<ImageView
android:id="@+id/contribute_image_ingredients"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp" />
android:layout_margin="16dp"
android:contentDescription="TODO" />

<ImageView
android:id="@+id/contribute_image_nutrients"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp" />
android:layout_margin="16dp"
android:contentDescription="TODO" />

</LinearLayout>
</android.support.v4.widget.NestedScrollView>
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/layout/fragment_offline_edit.xml
Expand Up @@ -34,7 +34,8 @@
android:layout_alignParentTop="true"
android:layout_margin="@dimen/padding_short"
android:background="@color/white"
app:srcCompat="@drawable/ic_action_cross" />
app:srcCompat="@drawable/ic_action_cross"
android:contentDescription="TODO" />


<LinearLayout
Expand Down Expand Up @@ -77,7 +78,8 @@
android:paddingTop="@dimen/padding_large"
android:layout_centerHorizontal="true"
android:visibility="visible"
app:srcCompat="@drawable/ic_cloud_done" />
app:srcCompat="@drawable/ic_cloud_done"
android:contentDescription="TODO" />

<TextView
android:id="@+id/noDataText"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/welcome_slide1.xml
Expand Up @@ -11,7 +11,8 @@
android:layout_width="@dimen/img_width_height"
android:layout_height="@dimen/img_width_height"
android:layout_centerHorizontal="true"
app:srcCompat="@drawable/ic_barcode" />
app:srcCompat="@drawable/ic_barcode"
android:contentDescription="Barcode" />

<TextView
android:id="@+id/slide_1_title"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/menu_main.xml
Expand Up @@ -12,7 +12,7 @@
<item
android:id="@+id/action_set_type"
android:icon="@drawable/ic_filter_list_black_24dp"
android:title="Contribution By"
android:title="@string/contribution_by"
android:visible="false"
app:showAsAction="always" />
</menu>
16 changes: 8 additions & 8 deletions app/src/main/res/values-aa/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<plurals name="offline_notification_count">
<item quantity="one"> You have 1 offline product waiting to be contributed to Open Food Facts</item>
<item quantity="other"> You have %d offline products waiting to be contributed to Open Food Facts</item>
Expand Down Expand Up @@ -167,7 +167,7 @@
<string name="alert_dialog_warning_title">Warning</string>
<string name="alert_dialog_warning_msg_user">User/password has changed, please update information</string>
<string name="alert_dialog_product_error_msg">Product not found, please try again</string>
<string name="toast_retrieving">Loading...</string>
<string name="toast_retrieving">Loading</string>
<string name="txtGenericName">Common name :</string>
<string name="txtBarcode">Barcode :</string>
<string name="txtQuantity">Quantity :</string>
Expand Down Expand Up @@ -230,16 +230,16 @@
<string name="txtPictureNeededDialogContent">You should add at least one picture before submitting this product</string>
<string name="txtPictureNeededDialogYes">Stay</string>
<string name="txtPictureNeededDialogNo">Discard</string>
<string name="toastSending">Uploading...</string>
<string name="toastSending">Uploading</string>
<string name="dataSaved">Saved locally on your device</string>
<string name="txtInfoAddUser">Please enter your login and password</string>
<string name="txtDataUpdated">Data updated</string>
<string name="txtLoading">Loading...</string>
<string name="txtLoading">Loading</string>
<string name="txtDialogsContentDelete">Are you sure you want to remove this draft?</string>
<string name="txtDialogsContentInfoSave">The product is saved locally, you can edit it in the \"Offline Edit\" menu</string>
<string name="txtBarcodeRequire">Barcode required</string>
<string name="txtOk">OK</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process...</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process</string>
<string name="txtAbout">The pictures you send are published under the free licence Creative Commons Attribution and ShareAlike.</string>
<string name="txtAllsent">Products sent</string>
<string name="txtPalm">The product does not contain any palm oil</string>
Expand Down Expand Up @@ -279,7 +279,7 @@
<string name="cancel_button">Cancel</string>
<string name="login_button">Login</string>
<string name="create_account_button">Create Account</string>
<string name="warning_alert_data">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="warning_alert_data" tools:ignore="StringFormatInvalid">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="from_gallery">From gallery</string>
<string name="product_sent">Product sent successfully</string>
<string name="action_edit_product">Edit product</string>
Expand Down Expand Up @@ -310,14 +310,14 @@
<string name="title_clear_history_dialog">Clear</string>
<string name="text_clear_history_dialog">Do you want to clear all scan history?</string>
<string name="export_csv_history">Export CSV</string>
<string name="txt_exporting_history">Exporting history...</string>
<string name="txt_exporting_history">Exporting history</string>
<string name="txt_history_exported">History exported</string>
<string name="permision_write_external_storage">Write external storage permission is needed to export history.</string>
<string name="txt_nutrition_not_found">N/A</string>
<string name="no_brand">No Brand</string>
<string name="no_title">No Title</string>
<!-- Nutrition info tab -->
<string name="display_fact">Table for nutrition facts of %1$s of %2$s</string>
<string name="display_fact"></string>
<string name="check_facts">Check</string>
<string name="nutrition">Nutrition</string>
<string name="calculated_nutrition">Calculated Nutrition</string>
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/res/values-ach/strings.xml
Expand Up @@ -167,7 +167,7 @@
<string name="alert_dialog_warning_title">Warning</string>
<string name="alert_dialog_warning_msg_user">User/password has changed, please update information</string>
<string name="alert_dialog_product_error_msg">Product not found, please try again</string>
<string name="toast_retrieving">Loading...</string>
<string name="toast_retrieving">Loading</string>
<string name="txtGenericName">Common name :</string>
<string name="txtBarcode">Barcode :</string>
<string name="txtQuantity">Quantity :</string>
Expand Down Expand Up @@ -230,16 +230,16 @@
<string name="txtPictureNeededDialogContent">You should add at least one picture before submitting this product</string>
<string name="txtPictureNeededDialogYes">Stay</string>
<string name="txtPictureNeededDialogNo">Discard</string>
<string name="toastSending">Uploading...</string>
<string name="toastSending">Uploading</string>
<string name="dataSaved">Saved locally on your device</string>
<string name="txtInfoAddUser">Please enter your login and password</string>
<string name="txtDataUpdated">Data updated</string>
<string name="txtLoading">Loading...</string>
<string name="txtLoading">Loading</string>
<string name="txtDialogsContentDelete">Are you sure you want to remove this draft?</string>
<string name="txtDialogsContentInfoSave">The product is saved locally, you can edit it in the \"Offline Edit\" menu</string>
<string name="txtBarcodeRequire">Barcode required</string>
<string name="txtOk">OK</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process...</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process</string>
<string name="txtAbout">The pictures you send are published under the free licence Creative Commons Attribution and ShareAlike.</string>
<string name="txtAllsent">Products sent</string>
<string name="txtPalm">The product does not contain any palm oil</string>
Expand Down Expand Up @@ -310,15 +310,14 @@
<string name="title_clear_history_dialog">Clear</string>
<string name="text_clear_history_dialog">Do you want to clear all scan history?</string>
<string name="export_csv_history">Export CSV</string>
<string name="txt_exporting_history">Exporting history...</string>
<string name="txt_exporting_history">Exporting history</string>
<string name="txt_history_exported">History exported</string>
<string name="permision_write_external_storage">Write external storage permission is needed to export history.</string>
<string name="txt_nutrition_not_found">N/A</string>
<string name="no_brand">No Brand</string>
<string name="no_title">No Title</string>
<!-- Nutrition info tab -->
<string name="display_fact">Table for nutrition facts of %1$s of %2$s</string>
<string name="check_facts">Check</string>
<string name="check_facts">Check</string>
<string name="nutrition">Nutrition</string>
<string name="calculated_nutrition">Calculated Nutrition</string>
<string name="please_enter_weight">Please enter the weight</string>
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/values-af/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<plurals name="offline_notification_count">
<item quantity="one"> You have 1 offline product waiting to be contributed to Open Food Facts</item>
<item quantity="other"> You have %d offline products waiting to be contributed to Open Food Facts</item>
Expand Down Expand Up @@ -167,7 +167,7 @@
<string name="alert_dialog_warning_title">Warning</string>
<string name="alert_dialog_warning_msg_user">User/password has changed, please update information</string>
<string name="alert_dialog_product_error_msg">Product not found, please try again</string>
<string name="toast_retrieving">Loading...</string>
<string name="toast_retrieving">Loading</string>
<string name="txtGenericName">Common name :</string>
<string name="txtBarcode">Barcode :</string>
<string name="txtQuantity">Quantity :</string>
Expand Down Expand Up @@ -230,16 +230,16 @@
<string name="txtPictureNeededDialogContent">You should add at least one picture before submitting this product</string>
<string name="txtPictureNeededDialogYes">Stay</string>
<string name="txtPictureNeededDialogNo">Discard</string>
<string name="toastSending">Uploading...</string>
<string name="toastSending">Uploading</string>
<string name="dataSaved">Saved locally on your device</string>
<string name="txtInfoAddUser">Please enter your login and password</string>
<string name="txtDataUpdated">Data updated</string>
<string name="txtLoading">Loading...</string>
<string name="txtLoading">Loading</string>
<string name="txtDialogsContentDelete">Are you sure you want to remove this draft?</string>
<string name="txtDialogsContentInfoSave">The product is saved locally, you can edit it in the \"Offline Edit\" menu</string>
<string name="txtBarcodeRequire">Barcode required</string>
<string name="txtOk">OK</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process...</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process</string>
<string name="txtAbout">The pictures you send are published under the free licence Creative Commons Attribution and ShareAlike.</string>
<string name="txtAllsent">Products sent</string>
<string name="txtPalm">The product does not contain any palm oil</string>
Expand Down Expand Up @@ -279,7 +279,7 @@
<string name="cancel_button">Cancel</string>
<string name="login_button">Login</string>
<string name="create_account_button">Create Account</string>
<string name="warning_alert_data">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="warning_alert_data" tools:ignore="StringFormatInvalid">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="from_gallery">From gallery</string>
<string name="product_sent">Product sent successfully</string>
<string name="action_edit_product">Edit product</string>
Expand Down Expand Up @@ -310,14 +310,14 @@
<string name="title_clear_history_dialog">Clear</string>
<string name="text_clear_history_dialog">Do you want to clear all scan history?</string>
<string name="export_csv_history">Export CSV</string>
<string name="txt_exporting_history">Exporting history...</string>
<string name="txt_exporting_history">Exporting history</string>
<string name="txt_history_exported">History exported</string>
<string name="permision_write_external_storage">Write external storage permission is needed to export history.</string>
<string name="txt_nutrition_not_found">N/A</string>
<string name="no_brand">No Brand</string>
<string name="no_title">No Title</string>
<!-- Nutrition info tab -->
<string name="display_fact">Table for nutrition facts of %1$s of %2$s</string>
<string name="display_fact">Table for nutrition facts of %1$s</string>
<string name="check_facts">Check</string>
<string name="nutrition">Nutrition</string>
<string name="calculated_nutrition">Calculated Nutrition</string>
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/res/values-ak/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<plurals name="offline_notification_count">
<item quantity="one"> You have 1 offline product waiting to be contributed to Open Food Facts</item>
<item quantity="other"> You have %d offline products waiting to be contributed to Open Food Facts</item>
Expand Down Expand Up @@ -167,7 +167,7 @@
<string name="alert_dialog_warning_title">Warning</string>
<string name="alert_dialog_warning_msg_user">User/password has changed, please update information</string>
<string name="alert_dialog_product_error_msg">Product not found, please try again</string>
<string name="toast_retrieving">Loading...</string>
<string name="toast_retrieving">Loading</string>
<string name="txtGenericName">Common name :</string>
<string name="txtBarcode">Barcode :</string>
<string name="txtQuantity">Quantity :</string>
Expand Down Expand Up @@ -230,16 +230,16 @@
<string name="txtPictureNeededDialogContent">You should add at least one picture before submitting this product</string>
<string name="txtPictureNeededDialogYes">Stay</string>
<string name="txtPictureNeededDialogNo">Discard</string>
<string name="toastSending">Uploading...</string>
<string name="toastSending">Uploading</string>
<string name="dataSaved">Saved locally on your device</string>
<string name="txtInfoAddUser">Please enter your login and password</string>
<string name="txtDataUpdated">Data updated</string>
<string name="txtLoading">Loading...</string>
<string name="txtLoading">Loading</string>
<string name="txtDialogsContentDelete">Are you sure you want to remove this draft?</string>
<string name="txtDialogsContentInfoSave">The product is saved locally, you can edit it in the \"Offline Edit\" menu</string>
<string name="txtBarcodeRequire">Barcode required</string>
<string name="txtOk">OK</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process...</string>
<string name="txtContentDialogUploading">Please don\'t exit during the process</string>
<string name="txtAbout">The pictures you send are published under the free licence Creative Commons Attribution and ShareAlike.</string>
<string name="txtAllsent">Products sent</string>
<string name="txtPalm">The product does not contain any palm oil</string>
Expand Down Expand Up @@ -279,7 +279,7 @@
<string name="cancel_button">Cancel</string>
<string name="login_button">Login</string>
<string name="create_account_button">Create Account</string>
<string name="warning_alert_data">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="warning_alert_data" tools:ignore="StringFormatInvalid">Your allergies info will never be sent to the Open Food Facts server. Also, be careful that product data may not be accurate, and detection might not be 100% accurate, so please double-check by yourself! </string>
<string name="from_gallery">From gallery</string>
<string name="product_sent">Product sent successfully</string>
<string name="action_edit_product">Edit product</string>
Expand Down Expand Up @@ -310,7 +310,7 @@
<string name="title_clear_history_dialog">Clear</string>
<string name="text_clear_history_dialog">Do you want to clear all scan history?</string>
<string name="export_csv_history">Export CSV</string>
<string name="txt_exporting_history">Exporting history...</string>
<string name="txt_exporting_history">Exporting history</string>
<string name="txt_history_exported">History exported</string>
<string name="permision_write_external_storage">Write external storage permission is needed to export history.</string>
<string name="txt_nutrition_not_found">N/A</string>
Expand Down

0 comments on commit 91f73c3

Please sign in to comment.