Skip to content
Snippets Groups Projects
Commit 8e3cab5c authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed a few style issues

parent 2ff33731
No related branches found
No related tags found
No related merge requests found
...@@ -67,6 +67,7 @@ android { ...@@ -67,6 +67,7 @@ android {
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
if ('assemble' in runTasks || 'assembleRelease' in runTasks || 'aR' in runTasks) {
def fileName = output.outputFile.name def fileName = output.outputFile.name
.replace(".apk", String.format("-%s-build%d.apk", rawVersionName, versionCode)) .replace(".apk", String.format("-%s-build%d.apk", rawVersionName, versionCode))
.replace("app-", "QuasselDroidNG-") .replace("app-", "QuasselDroidNG-")
...@@ -75,6 +76,7 @@ android { ...@@ -75,6 +76,7 @@ android {
} }
} }
} }
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingTop="17dp" android:paddingTop="17dp"
android:text="@string/large_text"
android:textSize="16sp" /> android:textSize="16sp" />
</ScrollView> </ScrollView>
...@@ -87,7 +86,8 @@ ...@@ -87,7 +86,8 @@
android:layout_marginBottom="16.0dip" android:layout_marginBottom="16.0dip"
android:layout_marginLeft="16.0dip" android:layout_marginLeft="16.0dip"
android:layout_marginRight="16.0dip" android:layout_marginRight="16.0dip"
android:layout_marginTop="16.0dip"> android:layout_marginTop="16.0dip"
style="?attr/cardStyle">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
......
...@@ -65,4 +65,6 @@ ...@@ -65,4 +65,6 @@
<attr name="ic_format_underline" format="reference" /> <attr name="ic_format_underline" format="reference" />
<attr name="ic_format_paint" format="reference" /> <attr name="ic_format_paint" format="reference" />
<attr name="ic_format_fill" format="reference" /> <attr name="ic_format_fill" format="reference" />
<attr name="cardStyle" format="reference" />
</resources> </resources>
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<item name="ic_format_underline">@drawable/ic_format_underline_dark</item> <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_paint">@drawable/ic_format_paint_dark</item>
<item name="ic_format_fill">@drawable/ic_format_fill_dark</item> <item name="ic_format_fill">@drawable/ic_format_fill_dark</item>
<item name="cardStyle">@style/CardView.Dark</item>
</style> </style>
<style name="AppTheme.Light" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus"> <style name="AppTheme.Light" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
...@@ -33,6 +35,8 @@ ...@@ -33,6 +35,8 @@
<item name="ic_format_underline">@drawable/ic_format_underline_light</item> <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_paint">@drawable/ic_format_paint_light</item>
<item name="ic_format_fill">@drawable/ic_format_fill_light</item> <item name="ic_format_fill">@drawable/ic_format_fill_light</item>
<item name="cardStyle">@style/CardView.Light</item>
</style> </style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment