diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-24 23:29:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 23:29:55 -0400 |
| commit | c2ca9066c6fd760bd6ef5d2f8f0530a89bfa7b66 (patch) | |
| tree | a54665bb873b650b8f6f03b76cd59456ef79e296 /app/src/main/res/values | |
| parent | 64dbf74b7a44a25f41ed7ff2ebfa11db0bc91769 (diff) | |
| download | frost-c2ca9066c6fd760bd6ef5d2f8f0530a89bfa7b66.tar.gz frost-c2ca9066c6fd760bd6ef5d2f8f0530a89bfa7b66.tar.bz2 frost-c2ca9066c6fd760bd6ef5d2f8f0530a89bfa7b66.zip | |
WIP: Feature/pip video 2 (#405)
* Add dependency
* Test new video view
* Add initial video bindings
* Implement drag to dismiss
* Begin initial integration
* Fix typo
* Fix up url formatter
* Update changelog
* Create first fully integrated video build
* Update translations
* Update translations 2
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_download.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 82aa82f1..4c9b7285 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,4 +59,7 @@ <string name="top_bar">Top Bar</string> <string name="bottom_bar">Bottom Bar</string> + + <string name="pip" translatable="false">PIP</string> + </resources> diff --git a/app/src/main/res/values/strings_download.xml b/app/src/main/res/values/strings_download.xml index ef166508..c0cb8cd4 100644 --- a/app/src/main/res/values/strings_download.xml +++ b/app/src/main/res/values/strings_download.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="pick_image">Pick Image</string> + <string name="download">Download</string> <string name="downloading">Downloading…</string> <string name="image_download_success">Image downloaded</string> <string name="image_download_fail">Image failed to download</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b91710d2..ab893b3a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,6 +41,13 @@ <item name="android:windowAnimationStyle">@style/KauFadeInFadeOut</item> </style> + <style name="FrostTheme.Video" parent="FrostTheme.Overlay.Fade"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:backgroundDimEnabled">false</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + </style> + <style name="FrostTheme.Settings" parent="FrostTheme"> <item name="android:windowAnimationStyle">@style/KauSlideInFadeOut</item> </style> |