Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43e32d2 authored by Gitsaibot's avatar Gitsaibot Committed by Jochen Sprickerhof
Browse files

Improve Edit_View (#107)

parent 47388a46

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
    <color name="event_info_label_background_color">#FFDDDDDD</color>



    <!-- Create event colors -->

    <color name="edit_event_color">#ffffff</color>

    <color name="edit_event_color">#fafafa</color>

    <color name="create_event_date_color">#FF000000</color>

    <color name="create_event_more_details_color">#FF888888</color>

    <color name="create_event_divider_color">#FFDDDDDD</color>

res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
        <item name="android:layout_marginRight">16dip</item>

        <item name="android:paddingLeft">8dip</item>

        <item name="android:paddingRight">8dip</item>

        <item name="android:layout_marginBottom">-12dip</item>

        <item name="android:layout_marginBottom">-8dip</item>

    </style>



    <style name="TextAppearance.EditEvent_Small">
@@ -198,6 +198,7 @@ 
        <item name="android:layout_gravity">center_vertical</item>

        <item name="android:layout_marginRight">12dip</item>

        <item name="android:layout_marginLeft">12dip</item>

        <item name="android:paddingLeft">12dp</item>

    </style>



    <style name="TextAppearance.EditEventCalSpinner">

src/com/android/calendar/event/EditEventView.java

+13 −0
Original line number Diff line number Diff line
@@ -206,8 +206,10 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 
     */

    private ArrayList<Integer> mAvailabilityValues;

    private ArrayList<String> mAvailabilityLabels;

    private ArrayList<String> mAccessLabels;

    private ArrayList<String> mOriginalAvailabilityLabels;

    private ArrayAdapter<String> mAvailabilityAdapter;

    private ArrayAdapter<String> mAccessAdapter;

    private boolean mAvailabilityExplicitlySet;

    private boolean mAllDayChangingAvailability;

    private int mAvailabilityCurrentlySelected;
@@ -731,6 +733,15 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 
        return true;

    }



    private void prepareAccess() {

        Resources r = mActivity.getResources();

        mAccessLabels = loadStringArray(r, R.array.visibility);

        mAccessAdapter = new ArrayAdapter<String>(mActivity,

                android.R.layout.simple_spinner_item, mAccessLabels);

        mAccessAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

        mAccessLevelSpinner.setAdapter(mAccessAdapter);

    }



    private void prepareAvailability() {

        Resources r = mActivity.getResources();
@@ -903,6 +914,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 


        prepareReminders();

        prepareAvailability();

        prepareAccess();



        View reminderAddButton = mView.findViewById(R.id.reminder_add);

        View.OnClickListener addReminderOnClickListener = new View.OnClickListener() {
@@ -1539,6 +1551,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa 
        reminderLayout.removeAllViews();

        prepareReminders();

        prepareAvailability();

        prepareAccess();

    }



    /**