Skip to content

Commit 57f9128

Browse files
author
rajatmittal27
committed
second commit
1 parent b3e1e7d commit 57f9128

File tree

9 files changed

+236
-201
lines changed

9 files changed

+236
-201
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
28-
implementation 'androidx.appcompat:appcompat:1.0.2'
29-
implementation 'androidx.core:core-ktx:1.0.2'
28+
implementation 'androidx.appcompat:appcompat:1.1.0'
29+
implementation 'androidx.core:core-ktx:1.1.0'
3030
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3131
testImplementation 'junit:junit:4.12'
3232
androidTestImplementation 'androidx.test:runner:1.1.1'

‎app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
app:layout_constraintRight_toRightOf="parent"
1616
app:layout_constraintTop_toTopOf="parent" />
1717

18+
1819
</androidx.constraintlayout.widget.ConstraintLayout>

‎horizontalcalendar/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30-
implementation 'androidx.appcompat:appcompat:1.0.2'
31-
implementation 'androidx.core:core-ktx:1.0.2'
30+
implementation 'androidx.appcompat:appcompat:1.1.0'
31+
implementation 'androidx.core:core-ktx:1.1.0'
3232
testImplementation 'junit:junit:4.12'
3333

3434
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

‎horizontalcalendar/src/main/java/com/example/horizontalcalendar/HorizontalCalender.kt

Lines changed: 186 additions & 165 deletions
Large diffs are not rendered by default.

‎horizontalcalendar/src/main/res/layout/activity_main.xml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:tools="http://schemas.android.com/tools"
54
xmlns:app="http://schemas.android.com/apk/res-auto"
65
android:layout_marginTop="20dp"
76
android:layout_width="match_parent"
87
android:id="@+id/layout"
98
android:layout_height="match_parent">
109

11-
<com.example.calender.HorizontalCalender
12-
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:id="@+id/horizontalCalender"
15-
android:textColor="#863A5E"
16-
app:calenderIcon="@drawable/cal"
17-
app:selectedColor="#000"
18-
app:strokeColor="@color/colorAccent"
19-
app:strokeWidth="4"
20-
app:dayView="true"
21-
app:showTodayIcon="true"
22-
app:unSelectedColor="#7485C9"
23-
app:closeIcon="@drawable/close"
24-
app:todayIcon="@drawable/today"
25-
app:layout_constraintTop_toTopOf="parent"
26-
app:layout_constraintStart_toStartOf="parent"
27-
app:layout_constraintEnd_toEndOf="parent"/>
10+
<com.example.horizontalcalendar.HorizontalCalender
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:textColor="#863A5E"
14+
app:calenderIcon="@drawable/cal"
15+
app:selectedColor="#000"
16+
app:strokeColor="@color/colorAccent"
17+
app:strokeWidth="4"
18+
app:dayView="true"
19+
app:showTodayIcon="true"
20+
app:unSelectedColor="#7485C9"
21+
app:closeIcon="@drawable/close"
22+
app:todayIcon="@drawable/today"
23+
app:layout_constraintTop_toTopOf="parent"
24+
app:layout_constraintStart_toStartOf="parent"
25+
app:layout_constraintEnd_toEndOf="parent"/>
2826

2927

30-
</androidx.constraintlayout.ConstraintLayout>
28+
</androidx.constraintlayout.widget.ConstraintLayout>

‎horizontalcalendar/src/main/res/layout/calenderview.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
android:layout_marginTop="20dp"
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:tools="http://schemas.android.com/tools"
66
xmlns:app="http://schemas.android.com/apk/res-auto"
77
android:layout_width="match_parent"
8-
android:layout_height="match_parent"
9-
tools:context=".MainActivity">
8+
android:layout_height="match_parent">
109

1110

1211
<ImageView
@@ -33,7 +32,7 @@
3332
app:layout_constraintStart_toStartOf="parent"
3433
app:layout_constraintEnd_toEndOf="parent">
3534

36-
<androidx.constraintlayout.ConstraintLayout
35+
<androidx.constraintlayout.widget.ConstraintLayout
3736
android:layout_width="match_parent"
3837
android:layout_height="165dp"
3938
android:id="@+id/container"
@@ -52,15 +51,15 @@
5251
android:layout_marginTop="40dp"
5352
android:textSize="20sp"/>
5453

55-
<android.support.v7.widget.RecyclerView
54+
<androidx.recyclerview.widget.RecyclerView
5655
android:layout_width="match_parent"
5756
android:layout_height="65dp"
5857
app:layout_constraintStart_toStartOf="parent"
5958
app:layout_constraintEnd_toEndOf="parent"
6059
app:layout_constraintTop_toBottomOf="@id/month"
6160
android:id="@+id/dates_rv"
6261
>
63-
</android.support.v7.widget.RecyclerView>
62+
</androidx.recyclerview.widget.RecyclerView>
6463
<ImageView
6564
android:layout_width="25dp"
6665
android:layout_height="25dp"
@@ -75,7 +74,7 @@
7574
android:layout_marginRight="20dp"/>
7675

7776

78-
</androidx.constraintlayout.ConstraintLayout>
77+
</androidx.constraintlayout.widget.ConstraintLayout>
7978

8079
<ImageView
8180
android:layout_width="25dp"
@@ -90,4 +89,4 @@
9089
android:layout_marginStart="10dp" android:layout_alignParentStart="true"
9190
android:layout_alignParentLeft="true" android:layout_alignParentTop="true"/>
9291
</com.github.aakira.expandablelayout.ExpandableRelativeLayout>
93-
</androidx.constraintlayout.ConstraintLayout>
92+
</androidx.constraintlayout.widget.ConstraintLayout>

‎horizontalcalendar/src/main/res/layout/date_item.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
android:padding="7dp"
@@ -13,8 +13,7 @@
1313
android:textColor="#000"
1414
android:textSize="12sp"
1515
android:layout_width="wrap_content" android:layout_height="wrap_content"
16-
android:id="@+id/day"
17-
/>
16+
android:id="@+id/day" />
1817

1918
<de.hdodenhof.circleimageview.CircleImageView
2019
android:layout_width="35dp"
@@ -37,4 +36,4 @@
3736
app:layout_constraintTop_toBottomOf="@id/day"
3837
app:layout_constraintEnd_toEndOf="parent"/>
3938

40-
</androidx.constraintlayout.ConstraintLayout>
39+
</androidx.constraintlayout.widget.ConstraintLayout>

‎horizontalcalendar/src/main/res/values/colors.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="colorPrimary">#008577</color>
4+
<color name="colorPrimaryDark">#00574B</color>
5+
<color name="colorAccent">#D81B60</color>
6+
</resources>

‎horizontalcalendar/src/main/res/values/styles.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<resources>
2+
3+
<!-- Base application theme. -->
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5+
<!-- Customize your theme here. -->
6+
<item name="colorPrimary">@color/colorPrimary</item>
7+
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8+
<item name="colorAccent">@color/colorAccent</item>
9+
</style>
10+
11+
</resources>

0 commit comments

Comments
 (0)