Skip to content

Commit

Permalink
Fix #323 #322: Texts on about page
Browse files Browse the repository at this point in the history
  • Loading branch information
Binnette committed Nov 21, 2024
1 parent 800610f commit b37cd98
Showing 1 changed file with 76 additions and 90 deletions.
166 changes: 76 additions & 90 deletions app/src/main/res/layout/about.xml
Original file line number Diff line number Diff line change
@@ -1,125 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp" >
android:id="@+id/about_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="10dp">

<ImageView
android:id="@+id/about_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/acc.osmtracker_logo"
android:src="@drawable/icon_100x100" >
</ImageView>

<TextView
android:id="@+id/about_appname"
style="@android:style/TextAppearance.Large"
android:layout_width="fill_parent"
<LinearLayout
android:id="@+id/about_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/about_logo"
android:text="@string/app_name" >
</TextView>
android:layout_alignParentTop="true">

<TextView
android:id="@+id/about_version_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/about_appname"
android:layout_toRightOf="@id/about_logo"
android:text="v" >
</TextView>

<TextView
android:id="@+id/about_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/about_appname"
android:layout_toRightOf="@id/about_version_label"
android:text="{versionName}" >
</TextView>
<ImageView
android:id="@+id/about_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/acc.osmtracker_logo"
android:src="@drawable/icon_100x100" />

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@id/about_logo"
android:orientation="vertical"
android:layout_alignParentBottom="false"
android:layout_alignParentLeft="false">

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="center" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/about_text"
android:id="@+id/about_appname"
style="@android:style/TextAppearance.Large"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/app_name" />

<TextView
android:id="@+id/about_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="v{versionName}" />
</LinearLayout>

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/about_footer"
android:layout_below="@+id/about_header"
android:fillViewport="true">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/about_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/about_text" >
</TextView>
android:text="@string/about_text" />

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/about_text"
android:layout_centerInParent="true"
android:autoLink="all"
android:gravity="center"
android:text="@string/about_link" >
</TextView>
</RelativeLayout>

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="center" >
android:text="@string/about_link" />

<TextView
android:id="@+id/about_translate_text"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/about_translate_text" >
</TextView>
android:text="@string/about_translate_text" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/about_translate_text"
android:layout_centerInParent="true"
android:autoLink="all"
android:gravity="center"
android:text="@string/about_translate_link" >
</TextView>
</RelativeLayout>
android:text="@string/about_translate_link" />

</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</ScrollView>

<Button
android:id="@+id/about_debug_info_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/about_debug_info" />
<LinearLayout
android:id="@+id/about_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">

<Button
android:id="@+id/about_export_db_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/about_export_db" />
</LinearLayout>
<Button
android:id="@+id/about_debug_info_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/about_debug_info" />

<Button
android:id="@+id/about_export_db_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/about_export_db" />
</LinearLayout>

</RelativeLayout>

0 comments on commit b37cd98

Please sign in to comment.