moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-04 16:25:06 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of https://github.com/siacs/Conversations into development

Browse Source
This commit is contained in:
iNPUTmice 2014-11-03 20:28:58 +01:00
commit c48407f3b4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
art/render.rb
View File

@ -14,7 +14,7 @@ images = {
images.each do |source, result| images.each do |source, result|
resolutions.each do |name, factor| resolutions.each do |name, factor|
size = factor * result[1] size = factor * result[1]
path = "../res/drawable-#{name}/#{result[0]}.png" path = "../src/main/res/drawable-#{name}/#{result[0]}.png"
cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}" cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}"
puts cmd puts cmd
system cmd system cmd

1
src/main/res/layout/activity_contact_details.xml
View File

@ -63,7 +63,6 @@
android:id="@+id/details_lastseen" android:id="@+id/details_lastseen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="@color/secondarytext" android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</LinearLayout> </LinearLayout>