Skip to content

Commit a38005e

Browse files
asimugrabiasimugrabi
committed
Added functionality to set starting selected date
1 parent 644364e commit a38005e

File tree

8 files changed

+114
-34
lines changed

8 files changed

+114
-34
lines changed

‎WeekCalSample/.idea/gradle.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WeekCalSample/app/app.iml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,34 +47,57 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5359
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5864
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5965
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/21.0.0/jars" />
7390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.citux/datetimepicker/0.1.2/jars" />
7592
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
7695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
81101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
82102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
83103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎WeekCalSample/app/src/main/java/com/weekcalendar/sample/Sample.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package com.weekcalendar.sample;
22

3-
import com.android.datetimepicker.date.DatePickerDialog;
4-
import com.weekcalendar.WeekCalendarFragment;
5-
import com.weekcalendar.listener.CalenderListener;
6-
import com.weekcalendar.utils.WeekCalendarOptions;
7-
8-
import org.joda.time.LocalDateTime;
9-
103
import android.os.Bundle;
114
import android.support.annotation.Nullable;
125
import android.support.v4.app.FragmentTransaction;
136
import android.support.v4.content.ContextCompat;
147
import android.support.v7.app.AppCompatActivity;
158
import android.widget.TextView;
169

10+
import com.android.datetimepicker.date.DatePickerDialog;
11+
import com.weekcalendar.WeekCalendarFragment;
12+
import com.weekcalendar.listener.CalenderListener;
13+
import com.weekcalendar.utils.WeekCalendarOptions;
14+
15+
import org.joda.time.LocalDateTime;
16+
1717
import java.util.ArrayList;
1818
import java.util.Calendar;
1919

@@ -167,6 +167,8 @@ public void onSelectDate(LocalDateTime mSelectedDate) {
167167
};
168168
//setting the listener
169169
mWeekCalendarFragment.setCalenderListener(listener);
170+
171+
mWeekCalendarFragment.setPreSelectedDate(Calendar.getInstance());
170172
}
171173

172174
@Override

‎WeekCalSample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.5.0'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎WeekCalSample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Mon Sep 12 19:25:28 IDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎WeekCalSample/weekcalender/src/main/java/com/weekcalendar/WeekCalendarFragment.java

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package com.weekcalendar;
22

3-
import com.weekcalendar.listener.CalenderListener;
4-
import com.weekcalendar.utils.AppController;
5-
import com.weekcalendar.utils.CalUtil;
6-
import com.weekcalendar.utils.ViewUtils;
7-
import com.weekcalendar.utils.WeekCalendarOptions;
8-
9-
import org.joda.time.LocalDateTime;
10-
import org.joda.time.Weeks;
11-
123
import android.content.res.Resources;
134
import android.graphics.Color;
145
import android.os.Bundle;
@@ -23,6 +14,15 @@
2314
import android.widget.LinearLayout;
2415
import android.widget.TextView;
2516

17+
import com.weekcalendar.listener.CalenderListener;
18+
import com.weekcalendar.utils.AppController;
19+
import com.weekcalendar.utils.CalUtil;
20+
import com.weekcalendar.utils.ViewUtils;
21+
import com.weekcalendar.utils.WeekCalendarOptions;
22+
23+
import org.joda.time.LocalDateTime;
24+
import org.joda.time.Weeks;
25+
2626
import java.util.ArrayList;
2727
import java.util.Calendar;
2828

@@ -216,6 +216,25 @@ public void setDateWeek(Calendar calendar) {
216216
}
217217
}
218218

219+
Calendar mPreSelectedDate;
220+
/**
221+
* Set date for the week calendar to start on resume
222+
*
223+
* @param calendar
224+
*/
225+
public void setPreSelectedDate(Calendar calendar) {
226+
mPreSelectedDate = calendar;
227+
}
228+
229+
@Override
230+
public void onResume() {
231+
super.onResume();
232+
if (mPreSelectedDate != null) {
233+
setDateWeek(mPreSelectedDate);
234+
mPreSelectedDate = null;
235+
}
236+
}
237+
219238
/**
220239
* Notify the selected date main page
221240
*/

‎WeekCalSample/weekcalender/src/main/java/com/weekcalendar/WeekFragment.java

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.weekcalendar;
22

3-
import com.weekcalendar.utils.AppController;
4-
import com.weekcalendar.utils.CalUtil;
5-
import com.weekcalendar.utils.WeekCalendarOptions;
6-
7-
import org.joda.time.LocalDateTime;
8-
93
import android.content.res.Resources;
104
import android.graphics.Color;
115
import android.os.Bundle;
@@ -18,6 +12,12 @@
1812
import android.widget.ImageView;
1913
import android.widget.TextView;
2014

15+
import com.weekcalendar.utils.AppController;
16+
import com.weekcalendar.utils.CalUtil;
17+
import com.weekcalendar.utils.WeekCalendarOptions;
18+
19+
import org.joda.time.LocalDateTime;
20+
2121
import java.util.ArrayList;
2222
import java.util.Calendar;
2323

@@ -49,6 +49,7 @@ public class WeekFragment extends Fragment {
4949
public static final String POSITION_KEY = "pos";
5050

5151
private LocalDateTime mSelectedDate, mStartDate, mCurrentDate;
52+
private LocalDateTime mDirtySelector;
5253

5354
private TextView mSundayTv, mMondayTv, mTuesdayTv, mWednesdayTv, mThursdayTv, mFridayTv;
5455
private TextView mSaturdayTv;
@@ -278,6 +279,15 @@ public void setUserVisibleHint(boolean isVisibleToUser) {
278279
}
279280
}
280281

282+
@Override
283+
public void onResume() {
284+
super.onResume();
285+
if (mDirtySelector != null) {
286+
ChangeSelector(mDirtySelector);
287+
mDirtySelector = null;
288+
}
289+
}
290+
281291
/**
282292
* Passing the selected date info
283293
*/
@@ -291,6 +301,10 @@ public void mSelectedDateInfo(int position) {
291301
* Setting date when selected from picker
292302
*/
293303
public void ChangeSelector(LocalDateTime mSelectedDate) {
304+
if (mTextViewArray == null) {
305+
mDirtySelector = mSelectedDate;
306+
return;
307+
}
294308
LocalDateTime startDate = AppController.getInstance().getDate();
295309
int addDays = mDatePosition * 7;
296310
startDate = startDate.plusDays(addDays);

‎WeekCalSample/weekcalender/weekcalender.iml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,7 +26,7 @@
2926
</component>
3027
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3128
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3330
<exclude-output />
3431
<content url="file://$MODULE_DIR$">
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -51,31 +48,52 @@
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5864
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5965
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6066
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6168
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6269
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6370
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6471
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6572
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6673
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6774
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7187
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7288
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7389
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
7592
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7693
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7794
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
7997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8199
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

0 commit comments

Comments
 (0)