kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add disclaimer for the thumbnails to About

Browse source
This commit is contained in:
Jakob Nixdorf 2018-05-16 10:19:06 +02:00
parent 4a61c3c312
commit 3bc427e6e0
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
2 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/res/layout/fragment_about.xml
View file

@ -564,5 +564,63 @@
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<!-- thumbnails -->
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin_small"
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/about_title_thumbnail_disclaimer"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/activity_margin_small"
android:paddingTop="@dimen/activity_margin_small"
android:paddingBottom="@dimen/activity_margin_small"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin_small"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_thumbnails_disclaimer_no1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin_small"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_thumbnails_disclaimer_no2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin_small"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_thumbnails_disclaimer_no3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_thumbnails_disclaimer_no4" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

12
app/src/main/res/values/strings_about.xml
View file

@ -33,6 +33,18 @@
<string name="about_label_contributors">Contributors</string> <string name="about_label_contributors">Contributors</string>
<string name="about_label_translators">Translators</string> <string name="about_label_translators">Translators</string>
<!-- Thumbnail disclaimer -->
<string name="about_title_thumbnail_disclaimer">Thumbnail disclaimer</string>
<string name="about_thumbnails_disclaimer_no1"><b>1.</b> All thumbnails are trademarks of their
respective owners.</string>
<string name="about_thumbnails_disclaimer_no2"><b>2.</b> The use of these trademarks does not
indicate endorsement of the trademark holder by andOTP, nor vice versa.</string>
<string name="about_thumbnails_disclaimer_no3"><b>3.</b> Thumbnails should only be used to
represent the company or product to which they refer.</string>
<string name="about_thumbnails_disclaimer_no4"><b>4. Please do not use thumbnails for any
purpose except to represent that particular brand or service.</b></string>
<!-- Support --> <!-- Support -->
<string name="about_title_support">Support development</string> <string name="about_title_support">Support development</string>