Merge pull request #2778 from ByteHamster/about-screen

Improved about screen

app/src/main/assets/LICENSE_SIL.txt

@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java

@@ -73,9 +73,12 @@ public class AboutActivity extends AppCompatActivity {
             InputStream input = null;
             try {
                 TypedArray res = AboutActivity.this.getTheme().obtainStyledAttributes(
-                        new int[] { android.R.attr.textColorPrimary });
+                        new int[] { R.attr.about_screen_font_color, R.attr.about_screen_background,
-                int colorResource = res.getColor(0, 0);
+                        R.attr.about_screen_card_background, R.attr.about_screen_card_border});
-                String colorString = String.format("#%06X", 0xFFFFFF & colorResource);
+                String fontColor = String.format("#%06X", 0xFFFFFF & res.getColor(0, 0));
+                String backgroundColor = String.format("#%06X", 0xFFFFFF & res.getColor(1, 0));
+                String cardBackground = String.format("#%06X", 0xFFFFFF & res.getColor(2, 0));
+                String cardBorder = String.format("#%06X", 0xFFFFFF & res.getColor(3, 0));
                 res.recycle();
                 input = getAssets().open(filename);
                 String webViewData = IOUtils.toString(input, Charset.defaultCharset());
@@ -92,7 +95,7 @@ public class AboutActivity extends AppCompatActivity {
                             "           src: url('file:///android_asset/Roboto-Light.ttf');" +
                             "        }" +
                             "        * {" +
-                            "           color: %s;" +
+                            "           color: @fontcolor@;" +
                             "           font-family: roboto-Light;" +
                             "           font-size: 8pt;" +
                             "        }" +
@@ -100,7 +103,10 @@ public class AboutActivity extends AppCompatActivity {
                             "</head><body><p>" + webViewData + "</p></body></html>";
                     webViewData = webViewData.replace("\n", "<br/>");
                 }
-                webViewData = String.format(webViewData, colorString);
+                webViewData = webViewData.replace("@fontcolor@", fontColor);
+                webViewData = webViewData.replace("@background@", backgroundColor);
+                webViewData = webViewData.replace("@card_background@", cardBackground);
+                webViewData = webViewData.replace("@card_border@", cardBorder);
                 subscriber.onSuccess(webViewData);
             } catch (IOException e) {
                 Log.e(TAG, Log.getStackTraceString(e));

app/src/main/templates/about.html

@@ -8,30 +8,52 @@
         font-family: 'Roboto-Light';
         src: url('file:///android_asset/Roboto-Light.ttf');
         }
+        
+        html, body {
+        background: @background@;
+        margin: 0;
+        padding: 0;
+        }
 
         * {
-        color: %s;
+        color: @fontcolor@;
         font-family: roboto-Light;
         font-size: 12pt;
         }
 
-        header {
+        img#logo {
         display: block;
         margin-left: auto;
         margin-right: auto;
-        padding-bottom: 500px;
+        max-height: 200px;
+        max-height: 50vh;
+        max-width: 100%;
+        height: auto;
+        width: auto;
         }
-
+        
-        versiontag {
+        div#logobackground{
-        color: gray;
+        width: 100%;
+        background: #42a5f5;
+        }
+        
+        .card {
+        background: @card_background@;
+        margin: 10px;
+        padding: 10px;
+        border: 1px solid @card_border@;
+        border-top-width: 0;
+        border-bottom-width: 2px;
         }
 
         h1 {
         font-size: 15pt;
+        margin-left: 20px;
         }
 
         h2 {
         font-size: 13pt;
+        margin-top: 0px;
         }
 
         a {
@@ -44,70 +66,117 @@
     <title>About AntennaPod</title>
 </head>
 <body>
-<div id="header" align="center">
+<div id="logobackground">
-    <img src="file:///android_asset/logo.png" alt="Logo" width="100px" height="100px"/>
+<img id="logo" src="file:///android_asset/logo.png" alt="Logo"/>
-
-    <p>AntennaPod, Version @versionname@</p>
-    <p>Commit: @commit@</p>
-
-    <p>Created by Daniel Oeh</p>
-
-    <p>Copyright &copy; 2012-@year@ AntennaPod Contributors <a href="CONTRIBUTORS.txt">(View)</a></p>
-
-    <p>Licensed under the MIT License <a href="LICENSE.txt">(View)</a></p>
 </div>
+
+<h1>AntennaPod</h1>
+
+<div class="card">
+<table>
+<tr><td>Version:</td><td><b>@versionname@</b></td></tr>
+<tr><td>Commit:</td><td><b>@commit@</b></td></tr>
+</table>
+</div>
+
+<div class="card">
+Created by Daniel Oeh<br />
+Copyright &copy; 2012-@year@<br />
+AntennaPod Contributors <a href="CONTRIBUTORS.txt">(View)</a><br />
+Licensed under the MIT License <a href="LICENSE.txt">(View)</a>
+</div>
+
 <h1>Used libraries</h1>
 
+<div class="card">
 <h2>Apache Commons <a href="http://commons.apache.org/">(Link)</a></h2>
 by The Apache Software Foundation, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>EventBus <a href="https://github.com/greenrobot/EventBus">(Link)</a></h2>
 by greenrobot, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>ExoPlayer <a href="https://github.com/google/ExoPlayer">(Link)</a></h2>
 by Google, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>flattr4j <a href="http://www.shredzone.org/projects/flattr4j/wiki">(Link)</a></h2>
 licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Glide <a href="https://github.com/bumptech/glide/">(Link)</a></h2>
 licensed under the Simplified BSD license <a href="LICENSE_GLIDE.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Iconify <a href="https://github.com/JoanZapata/android-iconify">(Link)</a></h2>
 by Joan Zapata, licensed under the Apache 2.0 license <a href="LICENSE_ANDROID_ICONIFY.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>jsoup <a href="http://jsoup.org/">(Link)</a></h2>
 licensed under the MIT license <a href="LICENSE_JSOUP.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Material Design Icons <a href="https://github.com/google/material-design-icons">(Link)</a></h2>
 by Google, licensed under an Attribution-ShareAlike 4.0 International license <a href="LICENSE_MATERIAL_DESIGN_ICONS.txt">(View)</a>
+</div>
 
+<div class="card">
+<h2>Material Design Icons <a href="https://github.com/Templarian/MaterialDesign">(Link)</a></h2>
+by Templarian, licensed under the SIL Open Font License, Version 1.1 <a href="LICENSE_SIL.txt">(View)</a>
+</div>
+
+<div class="card">
 <h2>Material Dialogs <a href="https://github.com/afollestad/material-dialogs">(Link)</a></h2>
 by Aidan Michael Follestad, licensed under the MIT License <a href="LICENSE_MATERIAL_DIALOGS.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>OkHttp <a href="https://github.com/square/okhttp">(Link)</a></h2>
 by Square, licensed under the Apache 2.0 license <a href="LICENSE_OKHTTP.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Okio <a href="https://github.com/square/okio">(Link)</a></h2>
 by Square, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Presto Client <a href="http://www.aocate.com/presto/">(Link)</a></h2>
 licensed under the Apache 2.0 license <a href="LICENSE_PRESTO.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>RecyclerView-FlexibleDivider <a href="https://github.com/yqritc/RecyclerView-FlexibleDivider">(Link)</a></h2>
 licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>RxAndroid <a href="https://github.com/ReactiveX/RxAndroid">(Link)</a></h2>
 licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>StackBlur <a href="https://github.com/kikoso/android-stackblur">(Link)</a></h2>
 by Enrique L&oacute;pez Ma&ntilde;as, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>Triangle Label View <a href="https://github.com/shts/TriangleLabelView">(Link)</a></h2>
 by Shota Saito, licensed under the Apache 2.0 license <a href="LICENSE_TRIANGLE_LABEL_VIEW.txt">(View)</a>
+</div>
 
+<div class="card">
 <h2>AntennaPod-AudioPlayer <a href="https://github.com/AntennaPod/AntennaPod-AudioPlayer/">(Link)</a></h2>
 by the AntennaPod team, licensed under the Apache 2.0 license <a href="LICENSE_APACHE-2.0.txt">(View)</a>
+</div>
 
 </body>
 </html>

core/src/main/res/values/attrs.xml

@@ -63,4 +63,9 @@
     <attr name="overlay_background" format="color"/>
 
     <attr name="nav_drawer_background" format="color"/>
+
+    <attr name="about_screen_background" format="color"/>
+    <attr name="about_screen_card_background" format="color"/>
+    <attr name="about_screen_card_border" format="color"/>
+    <attr name="about_screen_font_color" format="color"/>
 </resources>

core/src/main/res/values/styles.xml

@@ -69,6 +69,11 @@
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#e5e5e5</item>
+        <item type="attr" name="about_screen_card_background">#ffffff</item>
+        <item type="attr" name="about_screen_card_border">#d2d2d2</item>
+        <item type="attr" name="about_screen_font_color">#000000</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -139,6 +144,11 @@
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#303030</item>
+        <item type="attr" name="about_screen_card_background">#424242</item>
+        <item type="attr" name="about_screen_card_border">#262626</item>
+        <item type="attr" name="about_screen_font_color">#ffffff</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@@ -231,6 +241,11 @@
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#e5e5e5</item>
+        <item type="attr" name="about_screen_card_background">#ffffff</item>
+        <item type="attr" name="about_screen_card_border">#d2d2d2</item>
+        <item type="attr" name="about_screen_font_color">#000000</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
@@ -302,6 +317,11 @@
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#303030</item>
+        <item type="attr" name="about_screen_card_background">#424242</item>
+        <item type="attr" name="about_screen_card_border">#262626</item>
+        <item type="attr" name="about_screen_font_color">#ffffff</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack.NoTitle">