From 8e3cab5c87f49c45b62be4b7af14e685a92b99a0 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 29 Jan 2016 21:50:22 +0100
Subject: [PATCH] Fixed a few style issues
---
app/build.gradle | 10 ++++++----
app/src/main/res/layout/slider_main.xml | 4 ++--
app/src/main/res/values/attrs.xml | 2 ++
app/src/main/res/values/styles.xml | 4 ++++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index efc22453e..c05a7e9d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,10 +67,12 @@ android {
applicationVariants.all { variant ->
variant.outputs.each { output ->
- def fileName = output.outputFile.name
- .replace(".apk", String.format("-%s-build%d.apk", rawVersionName, versionCode))
- .replace("app-", "QuasselDroidNG-")
- output.outputFile = new File(output.outputFile.parent, fileName)
+ if ('assemble' in runTasks || 'assembleRelease' in runTasks || 'aR' in runTasks) {
+ def fileName = output.outputFile.name
+ .replace(".apk", String.format("-%s-build%d.apk", rawVersionName, versionCode))
+ .replace("app-", "QuasselDroidNG-")
+ output.outputFile = new File(output.outputFile.parent, fileName)
+ }
}
}
}
diff --git a/app/src/main/res/layout/slider_main.xml b/app/src/main/res/layout/slider_main.xml
index 3a658779c..c9acedcfe 100644
--- a/app/src/main/res/layout/slider_main.xml
+++ b/app/src/main/res/layout/slider_main.xml
@@ -43,7 +43,6 @@
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="17dp"
- android:text="@string/large_text"
android:textSize="16sp" />
</ScrollView>
@@ -87,7 +86,8 @@
android:layout_marginBottom="16.0dip"
android:layout_marginLeft="16.0dip"
android:layout_marginRight="16.0dip"
- android:layout_marginTop="16.0dip">
+ android:layout_marginTop="16.0dip"
+ style="?attr/cardStyle">
<LinearLayout
android:layout_width="fill_parent"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 013b7f2c3..55dbf1cf9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -65,4 +65,6 @@
<attr name="ic_format_underline" format="reference" />
<attr name="ic_format_paint" format="reference" />
<attr name="ic_format_fill" format="reference" />
+
+ <attr name="cardStyle" format="reference" />
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 26b119926..537c5f943 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,8 @@
<item name="ic_format_underline">@drawable/ic_format_underline_dark</item>
<item name="ic_format_paint">@drawable/ic_format_paint_dark</item>
<item name="ic_format_fill">@drawable/ic_format_fill_dark</item>
+
+ <item name="cardStyle">@style/CardView.Dark</item>
</style>
<style name="AppTheme.Light" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
@@ -33,6 +35,8 @@
<item name="ic_format_underline">@drawable/ic_format_underline_light</item>
<item name="ic_format_paint">@drawable/ic_format_paint_light</item>
<item name="ic_format_fill">@drawable/ic_format_fill_light</item>
+
+ <item name="cardStyle">@style/CardView.Light</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
--
GitLab