mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
Synced branch with master and fixed bugs specific to accessing of files in Nougat and above
This commit is contained in:
commit
fe57db580e
52 changed files with 865 additions and 261 deletions
|
|
@ -2,17 +2,11 @@
|
|||
<resources>
|
||||
<attr name="mainBackground" format="reference"/>
|
||||
<attr name="semitransparentText" format="reference"/>
|
||||
<attr name="commonsAppBlue" format="reference"/>
|
||||
<attr name="subBackground" format="reference"/>
|
||||
<attr name="fragmentCategorisationBackground" format="reference"/>
|
||||
<attr name="buttonBackground" format="reference"/>
|
||||
<attr name="uploadOverlayBackground" format="reference"/>
|
||||
<attr name="spinnerTheme" format="reference"/>
|
||||
<attr name="iconSend" format="reference"/>
|
||||
<attr name="iconSave" format="reference"/>
|
||||
<attr name="iconCamera" format="reference"/>
|
||||
<attr name="iconPhoto" format="reference"/>
|
||||
<attr name="iconUndo" format="reference"/>
|
||||
|
||||
<declare-styleable name="CompatTextView">
|
||||
<attr name="drawablePadding" format="dimension"/>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,26 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- Main application background color -->
|
||||
<color name="main_background_dark">#303030</color>
|
||||
<color name="main_background_light">#fafafa</color>
|
||||
|
||||
<!-- Colors used by newer Android + Support library for material design theme -->
|
||||
<color name="primaryColor">#0c609c</color>
|
||||
<color name="primaryDarkColor">#00376d</color>
|
||||
<color name="primaryLightColor">#528dcd</color>
|
||||
<color name="primarySuperLightColor">#d7e8fb</color>
|
||||
<color name="secondaryColor">#f38b04</color>
|
||||
<color name="secondaryDarkColor">#ba5d00</color>
|
||||
<color name="secondaryLightColor">#ffbc46</color>
|
||||
<color name="primaryTextColor">#ffffff</color>
|
||||
<color name="secondaryTextColor">#000000</color>
|
||||
|
||||
<!-- Some colours are same for dark/light themes. They are written two times in case
|
||||
we want to change light ones later.
|
||||
-->
|
||||
<color name="item_white_background">#ffffffff</color>
|
||||
<color name="main_background_dark">#000000</color>
|
||||
<color name="main_background_light">#ffffff</color>
|
||||
<color name="commons_app_blue_dark">#33FFFFFF</color>
|
||||
<color name="commons_app_blue_light">#33FFFFFF</color>
|
||||
<color name="activity_welcome_background_dark">#0c609c</color>
|
||||
<color name="activity_welcome_background_light">#0c609c</color>
|
||||
<color name="action_bar_blue">#0c609c</color>
|
||||
<color name="status_bar_blue">#08436d</color>
|
||||
<color name="sub_background_dark">#20ffffff</color>
|
||||
<color name="sub_background_light">#20ffffff</color>
|
||||
|
|
@ -20,4 +30,5 @@
|
|||
<color name="button_background_light">#B0000000</color>
|
||||
<color name="upload_overlay_background_dark">#77000000</color>
|
||||
<color name="upload_overlay_background_light">#44000000</color>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ Tap this message (or hit back) to skip this step.</string>
|
|||
<string name="give_permission">Give permission</string>
|
||||
<string name="use_external_storage">Use external storage</string>
|
||||
<string name="use_external_storage_summary">Save pictures taken with the in-app camera on your device</string>
|
||||
<string name="send_logs">Send Logs</string>
|
||||
<string name="send_logs">Send Logs</string>
|
||||
<string name="send_logs_description">Send logs to developers via email</string>
|
||||
<string name="login_to_your_account">Login to your account</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2,36 +2,30 @@
|
|||
|
||||
<style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="mainBackground">@color/main_background_dark</item>
|
||||
<item name="colorPrimary">@color/primaryColor</item>
|
||||
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
|
||||
<item name="colorAccent">@color/primaryColor</item>
|
||||
<item name="colorButtonNormal">@color/primaryColor</item>
|
||||
|
||||
<item name="semitransparentText">@color/commons_app_blue_dark</item>
|
||||
<item name="commonsAppBlue">@color/activity_welcome_background_dark</item>
|
||||
<item name="subBackground">@color/sub_background_dark</item>
|
||||
<item name="fragmentCategorisationBackground">@color/fragment_categorisation_background_dark</item>
|
||||
<item name="buttonBackground">@color/button_background_dark</item>
|
||||
<item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item>
|
||||
<item name="iconSend">@drawable/ic_send_white_24dp</item>
|
||||
<item name="iconSave">@drawable/ic_save_white_24dp</item>
|
||||
<item name="iconCamera">@drawable/ic_photo_camera_white_24dp</item>
|
||||
<item name="iconPhoto">@drawable/ic_photo_white_24dp</item>
|
||||
<item name="iconUndo">@drawable/ic_undo_white_24dp</item>
|
||||
<item name="spinnerTheme">@style/DarkSpinnerTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="mainBackground">@color/main_background_light</item>
|
||||
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
|
||||
<item name="colorAccent">@color/primaryColor</item>
|
||||
<item name="colorButtonNormal">@color/primaryColor</item>
|
||||
|
||||
<item name="semitransparentText">@color/commons_app_blue_light</item>
|
||||
<item name="commonsAppBlue">@color/activity_welcome_background_light</item>
|
||||
<item name="subBackground">@color/sub_background_light</item>
|
||||
<item name="fragmentCategorisationBackground">@color/fragment_categorisation_background_light</item>
|
||||
<item name="buttonBackground">@color/button_background_light</item>
|
||||
<item name="uploadOverlayBackground">@color/upload_overlay_background_light</item>
|
||||
<item name="iconSend">@drawable/ic_send_white_24dp</item>
|
||||
<item name="iconSave">@drawable/ic_save_white_24dp</item>
|
||||
<item name="iconCamera">@drawable/ic_photo_camera_white_24dp</item>
|
||||
<item name="iconPhoto">@drawable/ic_photo_white_24dp</item>
|
||||
<item name="iconUndo">@drawable/ic_undo_white_24dp</item>
|
||||
|
||||
<item name="colorPrimary">@color/action_bar_blue</item>
|
||||
<item name="colorPrimaryDark">@color/status_bar_blue</item>
|
||||
<item name="spinnerTheme">@style/LightSpinnerTheme</item>
|
||||
</style>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue