Latest Version (v1.4)

This commit is contained in:
nicco
2016-11-26 14:12:54 +01:00
parent 7c42d1529d
commit b9e8d512c3
62 changed files with 1608 additions and 267 deletions

View File

@@ -5,15 +5,14 @@
android:orientation="vertical"
tools:context="io.nicco.r6s.maps_view">
<ImageView
<io.nicco.r6s.TouchImageView
android:id="@+id/maps_img"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/r6s_bg"
android:contentDescription="@string/maps_img_type"
android:scaleType="centerCrop"
android:layout_weight="1" />
android:layout_weight="1"
android:layout_height="0dp" />
<LinearLayout
android:id="@+id/maps_menu_low"

View File

@@ -1,205 +1,213 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="io.nicco.r6s.op_view">
<RelativeLayout
<ImageView
android:id="@+id/op_bg"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:id="@+id/img_cont">
android:layout_height="match_parent"
android:adjustViewBounds="false"
android:foregroundGravity="top"
android:scaleType="centerCrop" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/op_bg"
android:scaleType="centerCrop"
android:adjustViewBounds="false"
android:foregroundGravity="top" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/op_view_bg"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:orientation="vertical">
<View android:id="@+id/op_view_spacer"
android:layout_width="match_parent"
android:layout_height="300dp" />
<FrameLayout
android:id="@+id/op_view_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="32dp">
<TextView
android:id="@+id/op_faction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ffffff" />
<TextView
android:id="@+id/op_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ffffff" />
<ImageView
android:id="@+id/op_img"
android:layout_width="match_parent"
android:layout_gravity="center"
android:contentDescription="@string/op_image"
android:scaleType="fitCenter"
android:layout_height="80dp" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:padding="16dp"
android:background="@android:color/background_light">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/op_armor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_armor"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/op_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textSize="18sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_type"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/op_speed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_speed"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/op_faction"
android:id="@+id/op_ability"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@android:color/background_light" />
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:padding="32dp"
android:textAlignment="textEnd"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ffffff" />
android:layout_height="1dp"
android:background="@android:color/background_light"></View>
<TextView
android:id="@+id/op_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|bottom"
android:padding="32dp"
android:textAlignment="textStart"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ffffff" />
<ImageView
android:id="@+id/op_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:contentDescription="@string/op_image"
android:padding="32dp"
android:scaleType="fitCenter" />
</FrameLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:padding="32dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/op_armor"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large" />
android:orientation="vertical"
android:padding="16dp"
android:background="@android:color/background_light">
<TextView
<LinearLayout
android:id="@+id/op_p_w"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="@string/op_primary"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:id="@+id/op_s_w"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="@string/op_secondary"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_armor"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:baselineAligned="false"
android:orientation="vertical"
android:padding="16dp"
android:background="@android:color/background_light">
<LinearLayout
android:id="@+id/op_g"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_gadget"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
</ScrollView>
<TextView
android:id="@+id/op_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textSize="18sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_type"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/op_speed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Large" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_speed"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/op_ability"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="@drawable/line_gradient"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<LinearLayout
android:id="@+id/op_p_w"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="@string/op_primary"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:id="@+id/op_s_w"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="@string/op_secondary"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="vertical"
android:padding="16dp">
<LinearLayout
android:id="@+id/op_g"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/op_gadget"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

View File

@@ -11,9 +11,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ffffffff"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp">
android:layout_marginLeft="@dimen/default_spacing"
android:layout_marginTop="@dimen/default_spacing"
android:layout_marginRight="@dimen/default_spacing">
<TextView
android:layout_width="0dp"
@@ -45,9 +45,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginRight="1dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
android:layout_marginLeft="@dimen/default_spacing"
android:layout_marginTop="@dimen/default_spacing"
android:layout_marginBottom="@dimen/default_spacing" />
<android.support.v7.widget.RecyclerView
android:id="@+id/ops_list_d"
@@ -55,9 +55,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginLeft="1dp"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" />
android:layout_marginTop="@dimen/default_spacing"
android:layout_marginRight="@dimen/default_spacing"
android:layout_marginBottom="@dimen/default_spacing" />
</LinearLayout>
</LinearLayout>