Merge branch 'develop' into beta

Author: baka-kaba

Awful.apk/build.gradle

@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.41'
 
     repositories {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.fabric.tools:gradle:1.+'
     }

Awful.apk/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.ferg.awfulapp"
-      android:versionCode="10009"
-      android:versionName="3.6.5"
+      android:versionCode="10011"
+      android:versionName="3.6.7"
       android:installLocation="auto">
     <supports-screens
         android:smallScreens="true"

Awful.apk/src/main/assets/changelog.html

@@ -5,6 +5,17 @@
 <!-- See the Changelog code for the expected structure of this document  -->
 
 <main>
+    <section>
+        <h2>3.6.7</h2>
+        <ul>
+            <li>Looks like you can add an icon when you send a private message now??</li>
+            <li>Revealed post previews on OLED themes and stopped them jumping around</li>
+            <li>Back by popular demand - rating threads!</li>
+            <li>Also maybe the ... post menu works for everyone now, even YOU</li>
+            <li>General fixes that are a secret</li>
+        </ul>
+    </section>
+
     <section>
         <h2>3.6.5</h2>
         <ul>

Awful.apk/src/main/assets/css/amberpos.css

@@ -35,8 +35,8 @@ body {
     background-color: #1A4000;
 }
 
-.postcontent {
-    border-color: #eacf4c;
+.postseparator {
+    background-color: #eacf4c;
 }
 
 .postcontent .bbc-block {

Awful.apk/src/main/assets/css/classic.css

@@ -36,6 +36,10 @@ body {
     background-color: #5BA611;
 }
 
+.postseparator {
+    display: none;
+}
+
 .postcontent {
     padding: 5px;
     margin: 5px 5px 0;

Awful.apk/src/main/assets/css/fyad.css

@@ -40,6 +40,14 @@ body {
     background-color: #ECFFD9;
 }
 
+.postheader {
+    padding-bottom: 0px;
+}
+
+.postseparator {
+    display: none;
+}
+
 .postcontent {
     background-color: #FFFFFF;
     border: 3px solid #000000;

Awful.apk/src/main/assets/css/general.css

@@ -26,33 +26,46 @@
     display: flex;
     border: 0;
     margin-left: 15px;
-    padding-top: 15px;
+    padding: 15px 0px 5px;
 }
 
 .postmenu {
     font-weight: bolder;
     font-size: 1.7em;
-    display: contents;
+    width: 24px;
+    height: 24px;
+    margin-right: 5px;
+    margin-top: -4px;
 }
 
 .postmenu:after {
     font-family: 'icons' !important;
     content: "\e902";
     font-weight: normal;
     -webkit-font-smoothing: antialiased;
-    display: inline-block;
     -webkit-user-select: none;
     user-select: none;
-    margin-top: -10px;
-    padding: 10px;
-    height: 100%;
+    padding: 4px;
+    display:block;
+}
+
+/*
+    this is the dividing line between the header and the post content
+    I've given it no vertical spacing, so the header and content can define their own padding etc
+    (means that e.g. post content in previews looks right because it controls its spacing)
+*/
+.postseparator {
+    display: block;
+    height: 2px;
+    padding: 0px;
+    margin: 0px 15px;
+    background-color: #eae9ea;
 }
 
 .postcontent {
     word-wrap: break-word;
-    padding: 10px 0;
-    border-top: 2px solid #eae9ea;
-    margin: 5px 15px;
+    padding: 10px 0px;
+    margin: 0px 15px;
 }
 
 .playGif {

Awful.apk/src/main/assets/css/oled.css

@@ -36,7 +36,6 @@ body {
 }
 
 .postcontent {
-    border-top: none;
     margin: 5px 10px;
 }
 
@@ -84,9 +83,14 @@ body {
     vertical-align: top;
     clear: left;
     border: 0;
-    border-bottom: 1px solid #e7e7e7;
     border-top: 1px solid #e7e7e7;
     margin: 0;
     padding: 10px;
     padding-right: 0;
+}
+
+.postseparator {
+    height: 1px;
+    background-color: #e7e7e7;
+    margin: 0px;
 }

Awful.apk/src/main/assets/css/yospos.css

@@ -40,8 +40,8 @@ body {
     padding: 5px;
 }
 
-.postcontent {
-    border-color: #0F0;
+.postseparator {
+    background-color: #0F0;
 }
 
 .postcontent .bbc-block {

Awful.apk/src/main/assets/mustache/post.mustache

@@ -13,6 +13,7 @@
         </div>
 		<nav class="postmenu" username="{{username}}" userid="{{userID}}" lastreadurl="{{lastReadUrl}}" {{#editable}}editable{{/editable}} {{#mod}}isMod{{/mod}} {{#admin}}isAdmin{{/admin}} {{#plat}}isPlat{{/plat}} ></nav>
 		</header>
+    <div class="postseparator"></div>
 	<section  class="postcontent">
 		{{{postcontent}}}
 	</section >