map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #3350 from trashkalmar/editor-accent-button-fix

Browse source 
[android][editor] fix: "Add schedule" button color.
This commit is contained in:
Dmitry Yunitsky 2016-05-26 20:26:29 +03:00
commit 4392cbd66c
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/res/layout/item_timetable_add.xml
View file

@ -8,19 +8,15 @@
<Button
android:id="@+id/btn__add_time"
android:layout_width="wrap_content"
android:layout_height="36dp"
style="@style/MwmWidget.Button.Accent"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?colorAccent"
android:layout_gravity="center"
android:background="@drawable/timetable_add_complement"
android:enabled="false"
android:minWidth="124dp"
android:paddingLeft="@dimen/margin_half"
android:paddingStart="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:text="@string/editor_time_add"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Light"
android:textColor="@color/timetable_add_complement_text"/>
android:text="@string/editor_time_add"/>
</FrameLayout>

46
android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java
View file

@ -9,6 +9,7 @@ import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
@ -26,9 +27,9 @@ import com.mapswithme.maps.editor.data.Timespan;
import com.mapswithme.maps.editor.data.Timetable;
import com.mapswithme.util.UiUtils;
public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter.BaseTimetableViewHolder>
implements HoursMinutesPickerFragment.OnPickListener,
TimetableFragment.TimetableProvider
class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter.BaseTimetableViewHolder>
implements HoursMinutesPickerFragment.OnPickListener,
TimetableFragment.TimetableProvider
{
private static final int TYPE_TIMETABLE = 0;
private static final int TYPE_ADD_TIMETABLE = 1;
@ -51,7 +52,7 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
refreshComplement();
}
public void setTimetables(Timetable[] tts)
void setTimetables(Timetable[] tts)
{
mItems = new ArrayList<>(Arrays.asList(tts));
refreshComplement();
@ -91,28 +92,28 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
: TYPE_TIMETABLE;
}
protected void addTimetable()
private void addTimetable()
{
mItems.add(OpeningHours.nativeGetComplementTimetable(mItems.toArray(new Timetable[mItems.size()])));
notifyItemInserted(mItems.size() - 1);
refreshComplement();
}
protected void removeTimetable(int position)
private void removeTimetable(int position)
{
mItems.remove(position);
notifyItemRemoved(position);
refreshComplement();
}
protected void refreshComplement()
private void refreshComplement()
{
mComplementItem = OpeningHours.nativeGetComplementTimetable(mItems.toArray(new Timetable[mItems.size()]));
notifyItemChanged(getItemCount() - 1);
}
protected void pickTime(int position, @IntRange(from = HoursMinutesPickerFragment.TAB_FROM, to = HoursMinutesPickerFragment.TAB_TO) int tab,
@IntRange(from = ID_OPENING, to = ID_CLOSING) int id)
private void pickTime(int position, @IntRange(from = HoursMinutesPickerFragment.TAB_FROM, to = HoursMinutesPickerFragment.TAB_TO) int tab,
@IntRange(from = ID_OPENING, to = ID_CLOSING) int id)
{
final Timetable data = mItems.get(position);
mPickingPosition = position;
@ -138,7 +139,7 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
notifyItemChanged(position);
}
protected void addWorkingDay(int day, int position)
private void addWorkingDay(int day, int position)
{
final Timetable tts[] = mItems.toArray(new Timetable[mItems.size()]);
mItems = new ArrayList<>(Arrays.asList(OpeningHours.nativeAddWorkingDay(tts, position, day)));
@ -146,7 +147,7 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
notifyDataSetChanged();
}
protected void removeWorkingDay(int day, int position)
private void removeWorkingDay(int day, int position)
{
final Timetable tts[] = mItems.toArray(new Timetable[mItems.size()]);
mItems = new ArrayList<>(Arrays.asList(OpeningHours.nativeRemoveWorkingDay(tts, position, day)));
@ -160,9 +161,9 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
notifyItemChanged(position);
}
public abstract class BaseTimetableViewHolder extends RecyclerView.ViewHolder
abstract static class BaseTimetableViewHolder extends RecyclerView.ViewHolder
{
public BaseTimetableViewHolder(View itemView)
BaseTimetableViewHolder(View itemView)
{
super(itemView);
}
@ -170,7 +171,7 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
abstract void onBind();
}
public class TimetableViewHolder extends BaseTimetableViewHolder implements View.OnClickListener, CompoundButton.OnCheckedChangeListener
private class TimetableViewHolder extends BaseTimetableViewHolder implements View.OnClickListener, CompoundButton.OnCheckedChangeListener
{
// Limit closed spans to avoid dynamic inflation of views in recycler's children. Yeah, its a hack.
static final int MAX_CLOSED_SPANS = 10;
@ -188,7 +189,7 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
View addClosed;
View deleteTimetable;
public TimetableViewHolder(View itemView)
TimetableViewHolder(View itemView)
{
super(itemView);
initDays();
@ -369,13 +370,13 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
private class AddTimetableViewHolder extends BaseTimetableViewHolder
{
private TextView add;
private final Button mAdd;
public AddTimetableViewHolder(View itemView)
AddTimetableViewHolder(View itemView)
{
super(itemView);
add = (TextView) itemView.findViewById(R.id.btn__add_time);
add.setOnClickListener(new View.OnClickListener()
mAdd = (Button) itemView.findViewById(R.id.btn__add_time);
mAdd.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
@ -390,9 +391,10 @@ public class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetable
{
final boolean enable = mComplementItem != null && mComplementItem.weekdays.length != 0;
final String text = mFragment.getString(R.string.editor_time_add);
add.setEnabled(enable);
add.setText(enable ? text + " (" + TimeFormatUtils.formatWeekdays(mComplementItem) + ")"
: text);
mAdd.setEnabled(enable);
mAdd.setText(enable ? text + " (" + TimeFormatUtils.formatWeekdays(mComplementItem) + ")"
: text);
UiUtils.updateAccentButton(mAdd);
}
}
}