Skip to content

Commit

Permalink
Misc Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@anugotta
anugotta committed Apr 24, 2019
1 parent 75d51eb commit 0ee3398
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 64 deletions.
29 changes: 13 additions & 16 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ Add the CountDownClock in your layout
android:layout_gravity="center"
android:clipChildren="false"
android:clipToPadding="false"
countdownClock:almostFinishedCallbackTimeInSeconds="5"
countdownClock:animationDuration="850"
countdownClock:countdownTickInterval="1000"
countdownClock:digitBottomDrawable="@drawable/background_bottom"
countdownClock:digitDividerColor="@color/transparent"
countdownClock:digitPadding="2dp"
countdownClock:digitTextColor="@color/black"
countdownClock:digitTextSize="24sp"
countdownClock:digitTopDrawable="@drawable/background_top"
countdownClock:digitWidth="28dp"
countdownClock:halfDigitHeight="22dp"
countdownClock:resetSymbol="8"
countdownClock:splitterPadding="0dp"
flipTimer:almostFinishedCallbackTimeInSeconds="5"
flipTimer:animationDuration="850"
flipTimer:countdownTickInterval="1000"
flipTimer:digitBottomDrawable="@drawable/background_bottom"
flipTimer:digitDividerColor="@color/transparent"
flipTimer:digitPadding="2dp"
flipTimer:digitTextColor="@color/black"
flipTimer:digitTextSize="24sp"
flipTimer:digitTopDrawable="@drawable/background_top"
flipTimer:digitWidth="28dp"
flipTimer:halfDigitHeight="22dp"
flipTimer:resetSymbol="8"
flipTimer:splitterPadding="0dp"
/>
```

Expand Down Expand Up @@ -78,9 +78,6 @@ If you are interested to contribute, feel free to send pull requests or issues.
## Questions?
Hit me on twitter [![Twitter](https://img.shields.io/badge/Twitter-@as_pillai-blue.svg?style=flat)](https://twitter.com/as_pillai)

## Acknowledgements:
This library is based on [Fjessin2](https://github.com/Fjessin2)'s library [flipperclock](https://github.com/Fjessin2/flipperclock).

## License

MIT License
Expand Down
28 changes: 14 additions & 14 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:countdownClock="http://schemas.android.com/apk/res-auto"
xmlns:flipTimer="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
Expand All @@ -16,19 +16,19 @@
android:layout_gravity="center"
android:clipChildren="false"
android:clipToPadding="false"
countdownClock:almostFinishedCallbackTimeInSeconds="5"
countdownClock:animationDuration="850"
countdownClock:countdownTickInterval="1000"
countdownClock:digitBottomDrawable="@drawable/background_bottom"
countdownClock:digitDividerColor="@color/transparent"
countdownClock:digitPadding="2dp"
countdownClock:digitTextColor="@color/black"
countdownClock:digitTextSize="24sp"
countdownClock:digitTopDrawable="@drawable/background_top"
countdownClock:digitWidth="28dp"
countdownClock:halfDigitHeight="22dp"
countdownClock:resetSymbol="8"
countdownClock:splitterPadding="0dp"
flipTimer:almostFinishedCallbackTimeInSeconds="5"
flipTimer:animationDuration="850"
flipTimer:countdownTickInterval="1000"
flipTimer:digitBottomDrawable="@drawable/background_bottom"
flipTimer:digitDividerColor="@color/transparent"
flipTimer:digitPadding="2dp"
flipTimer:digitTextColor="@color/black"
flipTimer:digitTextSize="24sp"
flipTimer:digitTopDrawable="@drawable/background_top"
flipTimer:digitWidth="28dp"
flipTimer:halfDigitHeight="22dp"
flipTimer:resetSymbol="8"
flipTimer:splitterPadding="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
Expand Down
4 changes: 2 additions & 2 deletions fliptimerviewlibrary/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
versionCode 3
versionName "1.2"
versionCode 4
versionName "1.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

Expand Down
10 changes: 5 additions & 5 deletions fliptimerviewlibrary/src/main/res/layout/view_countdown_clock_digit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:textColor="@color/black"
android:text="8"
android:text="@string/_8"
android:textSize="25sp"
alignedtextview:alignment="2" />
</FrameLayout>
Expand All @@ -46,7 +46,7 @@
android:fontFamily="@font/roboto_bold"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:text="8"
android:text="@string/_8"
android:textColor="@color/black"
android:textSize="25sp"
alignedtextview:alignment="1" />
Expand All @@ -72,7 +72,7 @@
android:fontFamily="@font/roboto_bold"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:text="8"
android:text="@string/_8"
android:textColor="@color/black"
android:textSize="25sp"
alignedtextview:alignment="2" />
Expand All @@ -91,7 +91,7 @@
android:fontFamily="@font/roboto_bold"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:text="8"
android:text="@string/_8"
android:textColor="@color/black"
android:textSize="25sp"
alignedtextview:alignment="1"/>
Expand All @@ -101,7 +101,7 @@
<View
android:id="@+id/digitDivider"
android:layout_width="3dp"
android:layout_height="2px"
android:layout_height="1dp"
android:layout_gravity="center_vertical"
android:background="#000000"/>
</FrameLayout>
55 changes: 28 additions & 27 deletions fliptimerviewlibrary/src/main/res/layout/view_simple_clock.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/secondDigitDays"
android:layout_toEndOf="@+id/firstDigitDays"
android:layout_toRightOf="@+id/firstDigitDays"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipChildren="false"
Expand All @@ -42,9 +43,9 @@
</RelativeLayout>

<RelativeLayout
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="4dp">

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/firstDigitHours"
Expand All @@ -54,12 +55,12 @@
android:clipToPadding="false"/>

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/secondDigitHours"
android:layout_width="wrap_content"
android:layout_toEndOf="@+id/firstDigitHours"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"/>
android:id="@+id/secondDigitHours"
android:layout_width="wrap_content"
android:layout_toEndOf="@+id/firstDigitHours"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false" android:layout_toRightOf="@+id/firstDigitHours"/>

<TextView
android:layout_below="@+id/firstDigitHours"
Expand All @@ -76,9 +77,9 @@
</RelativeLayout>

<RelativeLayout
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="4dp">

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/firstDigitMinute"
Expand All @@ -88,12 +89,12 @@
android:clipToPadding="false"/>

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/secondDigitMinute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/firstDigitMinute"
android:clipChildren="false"
android:clipToPadding="false"/>
android:id="@+id/secondDigitMinute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/firstDigitMinute"
android:clipChildren="false"
android:clipToPadding="false" android:layout_toRightOf="@+id/firstDigitMinute"/>

<TextView
android:layout_below="@+id/firstDigitMinute"
Expand All @@ -110,9 +111,9 @@
</RelativeLayout>

<RelativeLayout
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_marginStart="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_marginLeft="4dp">

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/firstDigitSecond"
Expand All @@ -122,12 +123,12 @@
android:clipToPadding="false"/>

<com.asp.fliptimerviewlibrary.CountDownDigit
android:id="@+id/secondDigitSecond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/firstDigitSecond"
android:clipChildren="false"
android:clipToPadding="false"/>
android:id="@+id/secondDigitSecond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/firstDigitSecond"
android:clipChildren="false"
android:clipToPadding="false" android:layout_toRightOf="@+id/firstDigitSecond"/>


<TextView
Expand Down
1 change: 1 addition & 0 deletions fliptimerviewlibrary/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<string name="Hours">Hours</string>
<string name="Mins">Mins</string>
<string name="Secs">Secs</string>
<string name="_8">8</string>
</resources>

0 comments on commit 0ee3398

Please sign in to comment.