Skip to content

Commit

Permalink
Merge pull request #287 from enviroCar/feature/bulk_upload
Browse files Browse the repository at this point in the history 
Feature/bulk upload
  • Loading branch information
dewall committed Jan 26, 2016
2 parents fd1b83a + 93a8a46 commit e0751cd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 39 deletions.
Binary file added org.envirocar.app/res/drawable/img_envirocar_logo_white.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 15 additions & 39 deletions org.envirocar.app/res/layout/activity_help_layout_general.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,52 +41,28 @@
app:contentScrim="?attr/colorPrimary"
app:expandedTitleMarginEnd="64dp"
app:expandedTitleMarginStart="48dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:statusBarScrim="@android:color/transparent">

<RelativeLayout
<ImageView
android:layout_width="match_parent"
android:layout_height="100dp"
android:scaleType="fitCenter"
android:fitsSystemWindows="true"
app:layout_collapseMode="parallax"
android:layout_margin="@dimen/spacing_xxxlarge"
android:src="@drawable/img_envirocar_logo_white"/>

<!-- <RelativeLayout
android:layout_width="match_parent"
android:layout_height="200dp"
android:fitsSystemWindows="true"
android:orientation="horizontal"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">

<ImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:layout_margin="@dimen/spacing_large"
android:src="@drawable/ic_launcher"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/spacing_large"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="enviroCar"
android:textColor="@color/white_cario"
android:textSize="24sp"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="version x.x.x"
android:textColor="@color/white_cario"
android:textSize="18sp"/>

</LinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>-->

<android.support.v7.widget.Toolbar
android:id="@+id/activity_help_layout_general_toolbar"
Expand All @@ -100,4 +76,4 @@

<include layout="@layout/activity_help_layout"></include>

</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>

0 comments on commit e0751cd

Please sign in to comment.