Skip to content

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@niknetniko
niknetniko committed Jun 16, 2018
1 parent f72ef9f commit 5a35a4e
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 32 deletions.
26 changes: 25 additions & 1 deletion app/src/main/res/values-en/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,15 @@
<string name="minerva_pref_duplicates_explanation_title">What?</string>
<string name="minerva_pref_duplicates_explanation_desc">The duplicate detection attempts to only show one calendar event for each lecture.</string>
<string name="minerva_pref_duplicates_rationale_title">Why?</string>
<string name="minerva_pref_duplicates_rationale_desc">Hydra shows both the calendar from Oasis and the one from Minerva. If a lecturer adds events on Minerva, Oasis will not be updated. This results in duplicate events.</string>
<string name="minerva_pref_duplicates_rationale_desc">
Hydra shows both the calendar from Oasis and the one from Minerva. If a lecturer adds events on Minerva,
Oasis will not be updated. This results in duplicate events.
</string>

<string name="minerva_pref_sync_freq_6_hours">6 hours</string>
<string name="minerva_pref_sync_freq_12_hours">12 hours</string>
<string name="minerva_pref_sync_freq_24_hours">24 hours</string>
<string name="minerva_pref_sync_freq_1_week">1 week</string>

<!-- SKO -->
<string name="sko_overview_activity_title">Student Kick-Off</string>
Expand Down Expand Up @@ -355,6 +363,22 @@
<string name="feed_pref_clear_cards_summary">Erase the list of hidden cards. Causes all cards to be displayed again.</string>
<string name="feed_pref_hidden_cleared">Erased</string>

<string name="feed_card_type_title_resto">Resto menu</string>
<string name="feed_card_type_title_events">Activities</string>
<string name="feed_card_type_title_schamper">Schamper</string>
<string name="feed_card_type_title_news">News</string>
<string name="feed_card_type_title_minerva_announcements">Minerva: Announcements</string>
<string name="feed_card_type_title_minerva_calendar">Minerva: Calendar</string>
<string name="feed_card_type_title_urgent">Urgent.fm</string>

<string name="feed_card_type_desc_resto">The daily menu for all student restaurants.</string>
<string name="feed_card_type_desc_events">The activities of your favourite student association.</string>
<string name="feed_card_type_desc_schamper">Articles from Schamper.</string>
<string name="feed_card_type_desc_news">The news, directly from Ghent University.</string>
<string name="feed_card_type_desc_minerva_announcements">Your announcements from Minerva.</string>
<string name="feed_card_type_desc_minerva_calendar">Your calendar from Minerva and Oasis.</string>
<string name="feed_card_type_desc_urgent">The youth radio for the Ghent area.</string>

<string name="feed_general_error">Could not get some cards.</string>
<string name="feed_resto_menu_title">Menu for %1$s • %2$s</string>

Expand Down
54 changes: 27 additions & 27 deletions app/src/main/res/values/array.xml
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<string-array name="card_types_nr">
<string-array name="card_types_nr" translatable="false">
<item>1</item>
<item>2</item>
<item>4</item>
<item>5</item>
<item>7</item>
<item>8</item>
<item>9</item>
</string-array>
</string-array>-array>

<string-array name="card_types_names">
<item>Restomenu</item>
<item>Activiteiten</item>
<item>Schamper</item>
<item>Nieuws</item>
<item>Minerva: Aankondigingen</item>
<item>Minerva: Agenda</item>
<item>Urgent.fm</item>
<string-array name="card_types_names" translatable="false">
<item>@string/feed_card_type_title_resto</item>
<item>@string/feed_card_type_title_events</item>
<item>@string/feed_card_type_title_schamper</item>
<item>@string/feed_card_type_title_news</item>
<item>@string/feed_card_type_title_minerva_announcements</item>
<item>@string/feed_card_type_title_minerva_calendar</item>
<item>@string/feed_card_type_title_urgent</item>
</string-array>

<string-array name="card_types_descriptions">
<item>De dagelijkse menu voor alle UGent-resto\'s.</item>
<item>De activiteiten van je favoriete verenigingen.</item>
<item>Schamper dailies.</item>
<item>Het nieuws rechtstreeks van de UGent.</item>
<item>Je aankondigingen net zoals op Minerva.</item>
<item>Je agenda net zoals op Minerva.</item>
<item>De jongerenradio van (U)Gent en omstreken.</item>
<string-array name="card_types_descriptions" translatable="false">
<item>@string/feed_card_type_desc_resto</item>
<item>@string/feed_card_type_desc_events</item>
<item>@string/feed_card_type_desc_schamper</item>
<item>@string/feed_card_type_desc_news</item>
<item>@string/feed_card_type_desc_minerva_announcements</item>
<item>@string/feed_card_type_desc_minerva_calendar</item>
<item>@string/feed_card_type_desc_urgent</item>
</string-array>

<string-array name="minerva_frequencies_text">
<item>6 uur</item>
<item>12 uur</item>
<item>24 uur</item>
<item>1 week</item>
<string-array name="minerva_frequencies_text" translatable="false">
<item>@string/minerva_pref_sync_freq_6_hours</item>
<item>@string/minerva_pref_sync_freq_12_hours</item>
<item>@string/minerva_pref_sync_freq_24_hours</item>
<item>@string/minerva_pref_sync_freq_1_week</item>
</string-array>

<string-array name="minerva_frequencies_seconds">
<string-array name="minerva_frequencies_seconds" translatable="false">
<item>21600</item>
<item>43200</item>
<item>86400</item>
<item>604800</item>
</string-array>

<string-array name="sko_tab_names">
<string-array name="sko_tab_names" translatable="false">
<item>@string/sko_tab_timeline</item>
<item>@string/sko_tab_lineup</item>
<item>@string/sko_tab_village</item>
<item>@string/sko_tab_map</item>
</string-array>

<string-array name="pref_night_mode_values">
<string-array name="pref_night_mode_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>

<string-array name="pref_night_mode">
<string-array name="pref_night_mode" translatable="false">
<item>@string/pref_theme_night_mode_auto</item>
<item>@string/pref_theme_night_mode_never</item>
<item>@string/pref_theme_night_mode_always</item>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values/recyclerview.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">

<integer name="span_count_normal">1</integer>
<integer name="span_count_large">1</integer>

<string name="app_layout_manager_linear" translatable="false">android.support.v7.widget.LinearLayoutManager</string>
<string name="app_layout_manager_linear" tools:ignore="MissingTranslation">android.support.v7.widget.LinearLayoutManager</string>

<string name="app_layout_manager_normal" translatable="false">android.support.v7.widget.LinearLayoutManager</string>
<string name="app_layout_manager_large" translatable="false">android.support.v7.widget.LinearLayoutManager</string>
<string name="app_layout_manager_normal" tools:ignore="MissingTranslation">android.support.v7.widget.LinearLayoutManager</string>
<string name="app_layout_manager_large" tools:ignore="MissingTranslation">android.support.v7.widget.LinearLayoutManager</string>

</resources>
21 changes: 21 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,11 @@
wordt Oasis niet aangepast. Hierdoor staan sommige lessen twee keer in de agenda.
</string>

<string name="minerva_pref_sync_freq_6_hours">6 uur</string>
<string name="minerva_pref_sync_freq_12_hours">12 uur</string>
<string name="minerva_pref_sync_freq_24_hours">24 uur</string>
<string name="minerva_pref_sync_freq_1_week">1 week</string>

<!-- SKO -->
<string name="sko_overview_activity_title">Student Kick-Off</string>

Expand Down Expand Up @@ -365,6 +370,22 @@
<string name="feed_pref_clear_cards_summary">Wis de lijst van verborgen kaarten. Hierdoor zullen alle kaarten opnieuw getoond worden.</string>
<string name="feed_pref_hidden_cleared">Gewist</string>

<string name="feed_card_type_title_resto">Restomenu</string>
<string name="feed_card_type_title_events">Activiteiten</string>
<string name="feed_card_type_title_schamper">Schamper</string>
<string name="feed_card_type_title_news">Nieuws</string>
<string name="feed_card_type_title_minerva_announcements">Minerva: Aankondigingen</string>
<string name="feed_card_type_title_minerva_calendar">Minerva: Agenda</string>
<string name="feed_card_type_title_urgent">Urgent.fm</string>

<string name="feed_card_type_desc_resto">De dagelijkse menu voor alle UGent-resto\'s.</string>
<string name="feed_card_type_desc_events">De activiteiten van je favoriete verenigingen.</string>
<string name="feed_card_type_desc_schamper">Artikels uit Schamper.</string>
<string name="feed_card_type_desc_news">Het nieuws, rechtstreeks van de UGent.</string>
<string name="feed_card_type_desc_minerva_announcements">Je aankondigingen van op Minerva.</string>
<string name="feed_card_type_desc_minerva_calendar">Je agenda van Minerva en Oasis.</string>
<string name="feed_card_type_desc_urgent">De jongerenradio van (U)Gent en omstreken.</string>

<string name="feed_general_error">Ophalen sommige kaarten mislukt.</string>

<string name="feed_resto_menu_title">Menu van %1$s • %2$s</string>
Expand Down

0 comments on commit 5a35a4e

Please sign in to comment.