Skip to content

Commit

Permalink
Renamed module to circlelayout to match Gradle dependency name
Browse files Browse the repository at this point in the history
  • Loading branch information
francoiscampbell committed Jan 13, 2016
1 parent 2a46dcc commit 5de1cc2
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 66 deletions.
4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':library', ':testapp'
include ':circlelayout', ':testapp'
9 changes: 8 additions & 1 deletion testapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@ android {
}
}

repositories {
maven {
url 'http://dl.bintray.com/francoiscampbell/maven'
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.1'
compile project(':library')
compile project(':circlelayout')
// compile 'io.github.francoiscampbell:circlelayout:0.1'
}
81 changes: 21 additions & 60 deletions testapp/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,92 +8,53 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
cl:cl_angleOffset="90"
cl:cl_direction="clockwise">
cl:cl_direction="clockwise"
cl:cl_centerView="@+id/centerView">

<Switch
android:id="@+id/centerView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12"
android:textColor="#FF0000"
android:textSize="24sp" />
android:textColor="@color/testTextColor"
android:textSize="@dimen/clockTestSize" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:textColor="#FF0000"
android:textSize="24sp" />
android:textColor="@color/testTextColor"
android:textSize="@dimen/clockTestSize" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2"
android:textColor="#FF0000"
android:textSize="24sp" />
android:textColor="@color/testTextColor"
android:textSize="@dimen/clockTestSize" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="3"
android:textColor="#FF0000"
android:textSize="24sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="4"
android:textColor="#FF0000"
android:textSize="24sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5"
android:textColor="#FF0000"
android:textSize="24sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="6"
android:textColor="#FF0000"
android:textSize="24sp" />
android:textColor="@color/testTextColor"
android:textSize="@dimen/clockTestSize" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="7"
android:textColor="#FF0000"
android:textSize="24sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="8"
android:textColor="#FF0000"
android:textSize="24sp" />

<TextView
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9"
android:textColor="#FF0000"
android:textSize="24sp" />
android:text="Button" />

<TextView
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textColor="#FF0000"
android:textSize="24sp"
android:visibility="visible" />
android:layout_height="wrap_content" />

<TextView
<SeekBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:textColor="#FF0000"
android:textSize="24sp" />

android:layout_height="wrap_content" />

</io.github.francoiscampbell.circlelayout.CircleLayout>
1 change: 1 addition & 0 deletions testapp/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="testTextColor">#FF0000</color>
</resources>
1 change: 1 addition & 0 deletions testapp/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="clockTestSize">48sp</dimen>
</resources>

0 comments on commit 5de1cc2

Please sign in to comment.