Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
Added circle ci
Browse files Browse the repository at this point in the history
  • Loading branch information
florent champigny committed Feb 15, 2017
1 parent c2820de commit 7ef9b6b
Show file tree
Hide file tree
Showing 14 changed files with 361 additions and 116 deletions.
9 changes: 5 additions & 4 deletions README.md
View file
Expand Up @@ -13,7 +13,8 @@ With Diagonal Layout explore new styles and approaches on material design
android:layout_width="match_parent"
android:layout_height="250dp"
diagonal:diagonal_angle="10"
diagonal:diagonal_gravity="left|right|top|bottom"
diagonal:diagonal_position="left|right|top|bottom"
diagonal:diagonal_direction="left|right"
android:elevation="10dp"
>

Expand All @@ -34,7 +35,7 @@ With Diagonal Layout explore new styles and approaches on material design
android:layout_height="250dp"
android:elevation="10dp"
app:diagonal_angle="20"
app:diagonal_gravity="right|bottom">
app:diagonal_position="right|bottom">

<ImageView
android:layout_width="match_parent"
Expand All @@ -55,7 +56,7 @@ With Diagonal Layout explore new styles and approaches on material design
android:layout_height="250dp"
android:elevation="10dp"
app:diagonal_angle="20"
app:diagonal_gravity="right|top">
app:diagonal_position="right|top">

<ImageView
android:layout_width="match_parent"
Expand Down Expand Up @@ -84,7 +85,7 @@ Using [https://github.com/flavioarfaria/KenBurnsView](https://github.com/flavioa
android:layout_width="match_parent"
android:layout_height="250dp"
diagonal:diagonal_angle="10"
diagonal:diagonal_gravity="left"
diagonal:diagonal_position="left"
android:elevation="30dp"
>

Expand Down
20 changes: 0 additions & 20 deletions app/src/main/java/com/github/florent37/sample/diagonallayout/AnimActivity.java
View file

This file was deleted.

53 changes: 0 additions & 53 deletions app/src/main/res/layout/activity_anim.xml
View file

This file was deleted.

3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Expand Up @@ -15,7 +15,8 @@
diagonal:diagonal_angle="10"
android:elevation="10dp"
android:paddingBottom="16dp"
diagonal:diagonal_gravity="left"
diagonal:diagonal_direction="left"
diagonal:diagonal_position="bottom"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
Expand Down
250 changes: 250 additions & 0 deletions app/src/main/res/layout/activity_main_directions.xml
View file
@@ -0,0 +1,250 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#EEEEEE"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:weightSum="2"
android:layout_height="wrap_content"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">

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

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="top" />

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="right"
app:diagonal_position="top">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="right"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="left"
app:diagonal_position="top">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="left"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="bottom" />

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="right"
app:diagonal_position="bottom">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="right"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="left"
app:diagonal_position="bottom">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="left"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>
</LinearLayout>
</LinearLayout>


<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="left" />

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="right"
app:diagonal_position="left">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="right"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="left"
app:diagonal_position="left">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="left"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:text="right" />

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="right"
app:diagonal_position="right">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="right"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>

<com.github.florent37.diagonallayout.DiagonalLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="20dp"
app:diagonal_angle="15"
app:diagonal_direction="left"
app:diagonal_position="right">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@color/colorAccent" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="left"
android:textColor="@android:color/white" />

</com.github.florent37.diagonallayout.DiagonalLayout>
</LinearLayout>
</LinearLayout>

</ScrollView>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_main_linear.xml
View file
Expand Up @@ -13,7 +13,8 @@
android:layout_width="match_parent"
android:layout_height="250dp"
diagonal:diagonal_angle="10"
diagonal:diagonal_gravity="left|bottom"
diagonal:diagonal_position="bottom"
diagonal:diagonal_direction="left"
diagonal:diagonal_handleMargins="true"
>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_main_simple.xml
View file
Expand Up @@ -16,7 +16,8 @@
android:layout_alignParentBottom="true"
android:elevation="10dp"
app:diagonal_angle="15"
app:diagonal_gravity="right|top"
app:diagonal_position="top"
app:diagonal_direction="right"
>

<ImageView
Expand Down
5 changes: 5 additions & 0 deletions circle.yml
View file
@@ -0,0 +1,5 @@
deployment:
release:
tag: /v.*/
commands:
- ./gradlew :diagonallayout:bintrayUpload

0 comments on commit 7ef9b6b

Please sign in to comment.