Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into unhook-save-restore

Browse source
This commit is contained in:
Stypox 2020-02-09 13:10:35 +01:00 • committed by GitHub
commit 9eed20c2a7
67 changed files with 432 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values/attrs.xml
View file

@ -45,6 +45,7 @@
<attr name="ic_grid" format="reference"/>
<attr name="ic_delete" format="reference"/>
<attr name="ic_settings_update" format="reference"/>
<attr name="ic_done" format="reference"/>
<attr name="progress_horizontal_drawable" format="reference"/>
<!-- Can't refer to colors directly in drawable's xml-->

8
app/src/main/res/values/strings.xml
View file

@ -327,10 +327,12 @@
<!-- Checksum types -->
<string name="md5" translatable="false">MD5</string>
<string name="sha1" translatable="false">SHA-1</string>
<string name="reCaptchaActivity" translatable="false">reCAPTCHA</string>
<string name="reCaptcha_title">reCAPTCHA challenge</string>
<!-- reCAPTCHA -->
<string name="recaptcha" translatable="false">reCAPTCHA</string>
<string name="title_activity_recaptcha">reCAPTCHA challenge</string>
<string name="subtitle_activity_recaptcha">Press \"Done\" when solved</string>
<string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
<!-- End of GigaGet's Strings -->
<string name="recaptcha_done_button">Done</string>
<!-- Downloads -->
<string name="settings_category_downloads_title">Download</string>
<string name="settings_file_charset_title">Allowed characters in filenames</string>

2
app/src/main/res/values/styles.xml
View file

@ -60,6 +60,7 @@
<item name="ic_grid">@drawable/ic_grid_black_24dp</item>
<item name="ic_delete">@drawable/ic_delete_black_24dp</item>
<item name="ic_settings_update">@drawable/ic_settings_update_black</item>
<item name="ic_done">@drawable/ic_done_black_24dp</item>
<item name="separator_color">@color/light_separator_color</item>
<item name="contrast_background_color">@color/light_contrast_background_color</item>
@ -129,6 +130,7 @@
<item name="ic_delete">@drawable/ic_delete_white_24dp</item>
<item name="pause">@drawable/ic_pause_white_24dp</item>
<item name="ic_settings_update">@drawable/ic_settings_update_white</item>
<item name="ic_done">@drawable/ic_done_white_24dp</item>
<item name="separator_color">@color/dark_separator_color</item>
<item name="contrast_background_color">@color/dark_contrast_background_color</item>