diff options
Diffstat (limited to 'app/src/main/res/layout')
5 files changed, 115 insertions, 144 deletions
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 5288d075..4ecc60a4 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,7 +4,8 @@ android:id="@android:id/tabhost" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + > <LinearLayout android:layout_width="match_parent" @@ -31,118 +32,4 @@ android:layout_weight="1"/> </LinearLayout> -</android.support.v4.app.FragmentTabHost> - - <!--<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> - - <TabHost - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/tabhost"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TabWidget - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/about_tabs"> - </TabWidget> - - <FrameLayout - android:id="@android:id/tabcontent" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:id="@+id/linearLayout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/about_version_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_version_title"/> - - <TextView - android:id="@+id/about_version" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_version"/> - - <TextView - android:id="@+id/about_author_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_author_title"/> - - <TextView - android:id="@+id/about_author" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_author"/> - - <TextView - android:id="@+id/about_app_icon_disclaimer_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_app_icon_disclaimer_title"/> - - <TextView - android:id="@+id/about_app_icon_disclaimer" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_app_icon_disclaimer"/> - - <TextView - android:id="@+id/about_icons_disclaimer_title" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/about_icons_disclaimer_title"/> - - <TextView - android:id="@+id/about_icons_disclaimer" - style="?android:attr/editTextPreferenceStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="10dp" - android:text="@string/about_icons_disclaimer"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/linearLayout2" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - </LinearLayout> - - <LinearLayout - android:id="@+id/linearLayout3" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - </LinearLayout> - </FrameLayout> - </LinearLayout> - </TabHost> - -</LinearLayout-->
\ No newline at end of file +</android.support.v4.app.FragmentTabHost>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_contribution_tab.xml b/app/src/main/res/layout/fragment_about_contribution_tab.xml index f474ee60..2856319d 100644 --- a/app/src/main/res/layout/fragment_about_contribution_tab.xml +++ b/app/src/main/res/layout/fragment_about_contribution_tab.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Contribute on Github.com"/> -</LinearLayout>
\ No newline at end of file + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Contribute on Github.com"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_credentials_tab.xml b/app/src/main/res/layout/fragment_about_credentials_tab.xml deleted file mode 100644 index cb4da7ec..00000000 --- a/app/src/main/res/layout/fragment_about_credentials_tab.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Maintainer: Niedermann IT-Dienstleistungen"/> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml new file mode 100644 index 00000000..82f378fe --- /dev/null +++ b/app/src/main/res/layout/fragment_about_credits_tab.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:id="@+id/textView" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginBottom="30dp" + android:layout_marginTop="30dp" + android:drawableTop="@drawable/ic_launcher" + android:text="@string/app_name" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/fg_default_low" + android:textSize="26sp"/> + + <TextView + android:id="@+id/about_version_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_version_title"/> + + <TextView + android:id="@+id/about_version" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_version"/> + + <TextView + android:id="@+id/about_author_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_author_title"/> + + <TextView + android:id="@+id/about_author" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_author"/> + + <TextView + android:id="@+id/about_app_icon_disclaimer_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_app_icon_disclaimer_title"/> + + <TextView + android:id="@+id/about_app_icon_disclaimer" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_app_icon_disclaimer"/> + + <TextView + android:id="@+id/about_icons_disclaimer_title" + style="?android:attr/listSeparatorTextViewStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/about_icons_disclaimer_title"/> + + <TextView + android:id="@+id/about_icons_disclaimer" + style="?android:attr/editTextPreferenceStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:text="@string/about_icons_disclaimer"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_license_tab.xml b/app/src/main/res/layout/fragment_about_license_tab.xml index bd9629f9..f235d11c 100644 --- a/app/src/main/res/layout/fragment_about_license_tab.xml +++ b/app/src/main/res/layout/fragment_about_license_tab.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="This app is licensed under the GPLv2"/> -</LinearLayout>
\ No newline at end of file + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This app is licensed under GPLv2"/> + </LinearLayout> +</ScrollView>
\ No newline at end of file |