Skip to content

Commit 2f6a7a4

Browse files
committed
Merge pull request #1 from dvsknt/master
Small fixes to text, layout
2 parents 567d560 + 69c9e41 commit 2f6a7a4

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Apache License
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright {yyyy} {name of copyright owner}
189+
Copyright 2014 Arnaud Camus
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
droidconNL-2014
22
===============
33

4-
Simple conference app made for the Droidcon NL 2014. It simply displays the list of talks and different details / informations about it: speaker, description, room, etc.
4+
Simple conference app made for the Droidcon NL 2014. Displays the list of talks and details about them: speaker, description, room, etc.
55

66

77
## Material Design

app/src/main/res/layout/adapter_about.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
android:layout_width="40dp"
1010
android:layout_height="40dp"
1111
android:id="@+id/image"
12-
android:layout_margin="16dp"
12+
android:layout_marginLeft="16dp"
13+
android:layout_centerVertical="true"
1314
/>
1415

1516
<TextView
@@ -32,4 +33,4 @@
3233
android:layout_marginTop="4dp"
3334
android:layout_marginLeft="72dp" />
3435

35-
</RelativeLayout>
36+
</RelativeLayout>

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<string name="opensource">Open Source</string>
1515
<string name="opensource_text">List of tools and libraries used to make this app.</string>
1616
<string name="author">Author</string>
17-
<string name="author_text">The apps as been developed by Arnaud Camus.</string>
17+
<string name="author_text">This app has been developed by Arnaud Camus.</string>
1818
<string name="evaluation">Evaluation</string>
1919
<string name="evaluation_text">Please give us feedback on the event via this form.</string>
2020
<!-- transition name -->
@@ -40,7 +40,7 @@
4040
<string name="define_PrettySharedPreferences"></string>
4141
<string name="library_PrettySharedPreferences_author">Nguyen Truong Giang</string>
4242
<string name="library_PrettySharedPreferences_libraryName">PrettySharedPreferences</string>
43-
<string name="library_PrettySharedPreferences_libraryDescription">PrettySharedPreferences is a lightweight library for help you deal with SharedPreferences more easy and reduce most of boilplace code.</string>
43+
<string name="library_PrettySharedPreferences_libraryDescription">PrettySharedPreferences is a lightweight library to help you deal with SharedPreferences more easily and reduce boilerplate code.</string>
4444
<string name="library_PrettySharedPreferences_libraryVersion">1.0.1</string>
4545
<string name="library_PrettySharedPreferences_libraryWebsite">https://github.com/talenguyen/PrettySharedPreferences</string>
4646
<string name="library_PrettySharedPreferences_licenseId">apache_2_0</string>

0 commit comments

Comments
 (0)