fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update current months label

Browse Source
This commit is contained in:
tibbi
2016-09-15 19:46:18 +02:00
parent 0da07ee79d
commit ba0b94b6cb
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/simplemobiletools/calendar/CalendarImpl.java
View File

@ -15,15 +15,15 @@ public class CalendarImpl implements DBHelper.DBOperationsListener {
private static final String YEAR_PATTERN = "YYYY"; private static final String YEAR_PATTERN = "YYYY";
private final Calendar mCallback; private final Calendar mCallback;
private final String mDay; private final String mToday;
private final Context mContext; private final Context mContext;
private DateTime mTargetDate; private DateTime mTargetDate;
private List<Event> mEvents; private List<Event> mEvents;
public CalendarImpl(Calendar callback, Context context, String day) { public CalendarImpl(Calendar callback, Context context) {
mCallback = callback; mCallback = callback;
mContext = context; mContext = context;
mDay = day; mToday = new DateTime().toString(Formatter.DAYCODE_PATTERN);
} }
public void updateCalendar(DateTime targetDate) { public void updateCalendar(DateTime targetDate) {
@ -90,7 +90,7 @@ public class CalendarImpl implements DBHelper.DBOperationsListener {
} }
private boolean isToday(DateTime targetDate, int curDayInMonth) { private boolean isToday(DateTime targetDate, int curDayInMonth) {
return targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN).equals(mDay); return targetDate.withDayOfMonth(curDayInMonth).toString(Formatter.DAYCODE_PATTERN).equals(mToday);
} }
private String getMonthName() { private String getMonthName() {

3
app/src/main/java/com/simplemobiletools/calendar/MyWidgetProvider.java
View File

@ -73,8 +73,7 @@ public class MyWidgetProvider extends AppWidgetProvider implements Calendar {
final int bgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, Color.BLACK); final int bgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, Color.BLACK);
mRemoteViews.setInt(R.id.calendar_holder, "setBackgroundColor", bgColor); mRemoteViews.setInt(R.id.calendar_holder, "setBackgroundColor", bgColor);
final String today = new DateTime().toString(Formatter.DAYCODE_PATTERN); mCalendar = new CalendarImpl(this, mContext);
mCalendar = new CalendarImpl(this, mContext, today);
mCalendar.updateCalendar(new DateTime()); mCalendar.updateCalendar(new DateTime());
} }

5
app/src/main/java/com/simplemobiletools/calendar/activities/MainActivity.java
View File

@ -35,7 +35,6 @@ import butterknife.OnClick;
public class MainActivity extends SimpleActivity { public class MainActivity extends SimpleActivity {
/*@BindView(R.id.top_left_arrow) ImageView mLeftArrow; /*@BindView(R.id.top_left_arrow) ImageView mLeftArrow;
@BindView(R.id.top_right_arrow) ImageView mRightArrow; @BindView(R.id.top_right_arrow) ImageView mRightArrow;
@BindView(R.id.top_text) TextView mMonthTV;
@BindView(R.id.calendar_holder) View mCalendarHolder;*/ @BindView(R.id.calendar_holder) View mCalendarHolder;*/
@BindView(R.id.view_pager) MyViewPager mPager; @BindView(R.id.view_pager) MyViewPager mPager;
@ -219,10 +218,6 @@ public class MainActivity extends SimpleActivity {
dayPicker.setVisibility(View.GONE); dayPicker.setVisibility(View.GONE);
} }
private void updateMonth(String month) {
//mMonthTV.setText(month);
}
private void setupLabels() { private void setupLabels() {
int letters[] = Utils.getLetterIDs(); int letters[] = Utils.getLetterIDs();

4
app/src/main/java/com/simplemobiletools/calendar/activities/WidgetConfigureActivity.java
View File

@ -16,7 +16,6 @@ import android.widget.TextView;
import com.simplemobiletools.calendar.Calendar; import com.simplemobiletools.calendar.Calendar;
import com.simplemobiletools.calendar.CalendarImpl; import com.simplemobiletools.calendar.CalendarImpl;
import com.simplemobiletools.calendar.Constants; import com.simplemobiletools.calendar.Constants;
import com.simplemobiletools.calendar.Formatter;
import com.simplemobiletools.calendar.MyWidgetProvider; import com.simplemobiletools.calendar.MyWidgetProvider;
import com.simplemobiletools.calendar.R; import com.simplemobiletools.calendar.R;
import com.simplemobiletools.calendar.Utils; import com.simplemobiletools.calendar.Utils;
@ -99,8 +98,7 @@ public class WidgetConfigureActivity extends AppCompatActivity implements Calend
mBgSeekBar.setProgress((int) (mBgAlpha * 100)); mBgSeekBar.setProgress((int) (mBgAlpha * 100));
updateBgColor(); updateBgColor();
final String today = new DateTime().toString(Formatter.DAYCODE_PATTERN); mCalendar = new CalendarImpl(this, getApplicationContext());
mCalendar = new CalendarImpl(this, getApplicationContext(), today);
mCalendar.updateCalendar(new DateTime()); mCalendar.updateCalendar(new DateTime());
mFab.setVisibility(View.GONE); mFab.setVisibility(View.GONE);

12
app/src/main/java/com/simplemobiletools/calendar/fragments/MonthFragment.java
View File

@ -5,30 +5,38 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import com.simplemobiletools.calendar.Calendar; import com.simplemobiletools.calendar.Calendar;
import com.simplemobiletools.calendar.CalendarImpl; import com.simplemobiletools.calendar.CalendarImpl;
import com.simplemobiletools.calendar.Constants; import com.simplemobiletools.calendar.Constants;
import com.simplemobiletools.calendar.Formatter;
import com.simplemobiletools.calendar.R; import com.simplemobiletools.calendar.R;
import com.simplemobiletools.calendar.models.Day; import com.simplemobiletools.calendar.models.Day;
import java.util.List; import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
public class MonthFragment extends Fragment implements Calendar { public class MonthFragment extends Fragment implements Calendar {
@BindView(R.id.top_text) TextView mMonthTV;
private CalendarImpl mCalendar; private CalendarImpl mCalendar;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.calendar_layout, container, false); final View view = inflater.inflate(R.layout.calendar_layout, container, false);
ButterKnife.bind(this, view);
final String code = getArguments().getString(Constants.DAY_CODE); final String code = getArguments().getString(Constants.DAY_CODE);
mCalendar = new CalendarImpl(this, getActivity().getApplicationContext(), code); mCalendar = new CalendarImpl(this, getActivity().getApplicationContext());
mCalendar.updateCalendar(Formatter.getDateTimeFromCode(code));
return view; return view;
} }
@Override @Override
public void updateCalendar(String month, List<Day> days) { public void updateCalendar(String month, List<Day> days) {
mMonthTV.setText(month);
} }
} }