@17.02.16 Dennis Thießen: 2.0.4

This commit is contained in:
Dennis Thießen
2016-02-17 22:16:50 +01:00
parent 6cd2f6b6e7
commit a14fa0d549
18 changed files with 835 additions and 99 deletions

View File

@@ -20,7 +20,7 @@
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_margin="0dp"
android:padding="10dp"
android:padding="5dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -57,19 +57,22 @@
android:layout_marginBottom="10dp"
android:background="#464b4b4b" />
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/svlayoutContent"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subs_viewpager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:id="@+id/dots"
android:layout_weight="0"
<TableLayout
android:id="@+id/tbl_billing"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</TableLayout>
</ScrollView>
/>
</LinearLayout>

View File

@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="success"
android:text="@string/lbl_membershiptype_free"
bootstrap:showOutline="true"
android:enabled="false"
android:layout_gravity="center|top"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"

View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:padding="10dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_centerInParent="true"
android:contentDescription="@null"
android:id="@+id/img_subs" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_subs_membershiptype"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="info"
android:text="@string/lbl_membershiptype_addfree"
android:enabled="false"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/txt_subs_title"
android:gravity="center"
android:text="TEST"
android:layout_below="@id/btn_subs_membershiptype"
android:layout_margin="10dp"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/txt_subs_desc"
android:text="TEST"
android:layout_margin="10dp"
android:gravity="center"
android:layout_above="@+id/btn_sub_purchase"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_sub_purchase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
bootstrap:roundedCorners="true"
bootstrap:bootstrapBrand="success"
bootstrap:bootstrapSize="lg"
android:text="0,00 €"
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"/>
</RelativeLayout>
</RelativeLayout>
</ScrollView>