Skip to content

Commit 975cc5a

Browse files
SplactSplact
committed
Add terms and service menu item
1 parent a65f809 commit 975cc5a

File tree

75 files changed

+82
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+82
-0
lines changed

‎OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,11 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
429429
intent.putExtra(WebActivity.EXTRA_KEY_TITLE, getString(R.string.arduino_auth_privacy));
430430
intent.putExtra(WebActivity.EXTRA_KEY_URL, getString(R.string.config_auth_privacy));
431431
startActivity(intent);
432+
} else if (itemId == R.id.navigation_item_terms_and_conditions) {
433+
final Intent intent = new Intent(this, WebActivity.class);
434+
intent.putExtra(WebActivity.EXTRA_KEY_TITLE, getString(R.string.terms));
435+
intent.putExtra(WebActivity.EXTRA_KEY_URL, getString(R.string.config_terms));
436+
startActivity(intent);
432437
} else {
433438
drawerLayout.closeDrawers();
434439
// Launch intents

‎OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,9 @@
5252
android:id="@+id/navigation_item_privacy_policy"
5353
android:icon="@drawable/ic_navigation_privacy_policy"
5454
android:title="@string/navigation_item_privacy_policy" />
55+
<item
56+
android:id="@+id/navigation_item_terms_and_conditions"
57+
android:icon="@drawable/ic_info_black_24dp"
58+
android:title="@string/terms" />
5559
</group>
5660
</menu>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-ar/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,4 +932,5 @@ You will use this username to log in to Arduino, and other users will see it whe
932932
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
933933
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
934934
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
935+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
935936
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-bg/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,4 +920,5 @@ You will use this username to log in to Arduino, and other users will see it whe
920920
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
921921
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
922922
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
923+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
923924
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-bs-rBA/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,4 +937,5 @@ You will use this username to log in to Arduino, and other users will see it whe
937937
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
938938
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
939939
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
940+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
940941
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-ca/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,4 +919,5 @@ You will use this username to log in to Arduino, and other users will see it whe
919919
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
920920
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
921921
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
922+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
922923
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-cs/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,4 +924,5 @@ You will use this username to log in to Arduino, and other users will see it whe
924924
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
925925
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
926926
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
927+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
927928
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-da/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,4 +918,5 @@ You will use this username to log in to Arduino, and other users will see it whe
918918
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
919919
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
920920
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
921+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
921922
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-de-rAT/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,4 +937,5 @@ You will use this username to log in to Arduino, and other users will see it whe
937937
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
938938
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
939939
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
940+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
940941
</resources>

‎OpenScienceJournal/whistlepunk_library/src/main/res/values-de-rCH/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,4 +937,5 @@ You will use this username to log in to Arduino, and other users will see it whe
937937
<string name="arduino_auth_settings_drive_start_notice">The Cloud Sync will start shortly. It may take some minutes to complete.</string>
938938
<string name="arduino_auth_settings_drive_confirm_button">Confirm</string>
939939
<string name="arduino_auth_settings_drive_loading_indicator_text">Syncing</string>
940+
<string name="config_terms">https://www.arduino.cc/en/sj-terms-conditions/?embed</string>
940941
</resources>

0 commit comments

Comments
 (0)