Loading app/src/main/java/com/android/calendar/event/PickCalendarDialogFragment.java +6 −7 Original line number Diff line number Diff line Loading @@ -7,7 +7,6 @@ import android.app.Dialog; import androidx.fragment.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; Loading @@ -18,14 +17,14 @@ import ws.xsoh.etar.R; /** * Allows the user to quickly import a multi event cal file. */ public class ImportMultiEventDialogFragment extends DialogFragment { public class PickCalendarDialogFragment extends DialogFragment { private static final String TAG = "ImportMultipleEventDialogFragment"; private static final String TAG = "PickCalendarDialogFragment"; private AlertDialog mAlertDialog; Spinner mCalendarsSpinner; public ImportMultiEventDialogFragment() { public PickCalendarDialogFragment() { // Empty constructor required for DialogFragment. } Loading @@ -36,14 +35,14 @@ public class ImportMultiEventDialogFragment extends DialogFragment { final LayoutInflater layoutInflater = (LayoutInflater) activity .getSystemService(Context.LAYOUT_INFLATER_SERVICE); final View view = layoutInflater.inflate(R.layout.import_multi_event_dialog, null); final View view = layoutInflater.inflate(R.layout.pick_calendar_dialog, null); mCalendarsSpinner = (Spinner) view.findViewById(R.id.calendars_spinner); mAlertDialog = new AlertDialog.Builder(activity) .setTitle(R.string.import_multi_event_dialog_title) .setTitle(R.string.pick_calendar_dialog_title) .setView(view) .setPositiveButton(R.string.import_multi_event_dialog_validate, .setPositiveButton(R.string.pick_calendar_dialog_validate, (dialog, which) -> { //todo may be it could be better to have the listener define in importActivity dismiss(); Loading app/src/main/res/layout/pick_calendar_dialog.xml 0 → 100644 +105 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/pick_calendar_dialog" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> <TextView android:id="@+id/pick_calendar_dialog_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/pick_calendar_dialog_text" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> <View android:id="@+id/view" style="@style/EditEventSeparator" android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pick_calendar_dialog_text" /> <ImageView android:id="@+id/calendar_selector_group_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="20dp" android:src="@drawable/ic_baseline_calendar_today" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/view" /> <View android:id="@+id/calendar_selector_group_background" android:layout_width="12dp" android:layout_height="12dp" android:layout_marginStart="12dp" android:layout_marginTop="14dp" app:layout_constraintStart_toStartOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toTopOf="@+id/calendar_selector_group_icon" /> <Spinner android:id="@+id/calendars_spinner" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="4dp" android:gravity="center_vertical" android:prompt="@string/edit_event_calendar_label" android:paddingStart="0dp" android:paddingEnd="2dp" app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toTopOf="@+id/calendar_selector_group_icon" /> <TextView android:id="@+id/calendar_textview" style="@style/TextAppearance.EditEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="8dp" android:textColor="?attr/light_dark" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toBottomOf="@id/view" tools:layout_conversion_absoluteHeight="24dp" tools:layout_conversion_absoluteWidth="363dp" /> <TextView android:id="@+id/calendar_textview_secondary" style="@style/TextAppearance.EditEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="2dp" android:layout_marginBottom="4dp" android:textColor="?attr/light_dark" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/view1" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toBottomOf="@+id/calendar_textview" tools:layout_conversion_absoluteHeight="19dp" tools:layout_conversion_absoluteWidth="363dp" /> <ImageButton android:id="@+id/change_color_new_event" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginEnd="24dp" android:layout_marginTop="20dp" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/choose_event_color_label" android:enabled="false" android:scaleType="center" android:src="@drawable/ic_colorpicker" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/view" /> </androidx.constraintlayout.widget.ConstraintLayout> Loading
app/src/main/java/com/android/calendar/event/PickCalendarDialogFragment.java +6 −7 Original line number Diff line number Diff line Loading @@ -7,7 +7,6 @@ import android.app.Dialog; import androidx.fragment.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; Loading @@ -18,14 +17,14 @@ import ws.xsoh.etar.R; /** * Allows the user to quickly import a multi event cal file. */ public class ImportMultiEventDialogFragment extends DialogFragment { public class PickCalendarDialogFragment extends DialogFragment { private static final String TAG = "ImportMultipleEventDialogFragment"; private static final String TAG = "PickCalendarDialogFragment"; private AlertDialog mAlertDialog; Spinner mCalendarsSpinner; public ImportMultiEventDialogFragment() { public PickCalendarDialogFragment() { // Empty constructor required for DialogFragment. } Loading @@ -36,14 +35,14 @@ public class ImportMultiEventDialogFragment extends DialogFragment { final LayoutInflater layoutInflater = (LayoutInflater) activity .getSystemService(Context.LAYOUT_INFLATER_SERVICE); final View view = layoutInflater.inflate(R.layout.import_multi_event_dialog, null); final View view = layoutInflater.inflate(R.layout.pick_calendar_dialog, null); mCalendarsSpinner = (Spinner) view.findViewById(R.id.calendars_spinner); mAlertDialog = new AlertDialog.Builder(activity) .setTitle(R.string.import_multi_event_dialog_title) .setTitle(R.string.pick_calendar_dialog_title) .setView(view) .setPositiveButton(R.string.import_multi_event_dialog_validate, .setPositiveButton(R.string.pick_calendar_dialog_validate, (dialog, which) -> { //todo may be it could be better to have the listener define in importActivity dismiss(); Loading
app/src/main/res/layout/pick_calendar_dialog.xml 0 → 100644 +105 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/pick_calendar_dialog" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> <TextView android:id="@+id/pick_calendar_dialog_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/pick_calendar_dialog_text" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> <View android:id="@+id/view" style="@style/EditEventSeparator" android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pick_calendar_dialog_text" /> <ImageView android:id="@+id/calendar_selector_group_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="20dp" android:src="@drawable/ic_baseline_calendar_today" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/view" /> <View android:id="@+id/calendar_selector_group_background" android:layout_width="12dp" android:layout_height="12dp" android:layout_marginStart="12dp" android:layout_marginTop="14dp" app:layout_constraintStart_toStartOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toTopOf="@+id/calendar_selector_group_icon" /> <Spinner android:id="@+id/calendars_spinner" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="4dp" android:gravity="center_vertical" android:prompt="@string/edit_event_calendar_label" android:paddingStart="0dp" android:paddingEnd="2dp" app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toTopOf="@+id/calendar_selector_group_icon" /> <TextView android:id="@+id/calendar_textview" style="@style/TextAppearance.EditEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="8dp" android:textColor="?attr/light_dark" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toBottomOf="@id/view" tools:layout_conversion_absoluteHeight="24dp" tools:layout_conversion_absoluteWidth="363dp" /> <TextView android:id="@+id/calendar_textview_secondary" style="@style/TextAppearance.EditEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" android:layout_marginTop="2dp" android:layout_marginBottom="4dp" android:textColor="?attr/light_dark" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/view1" app:layout_constraintStart_toEndOf="@+id/calendar_selector_group_icon" app:layout_constraintTop_toBottomOf="@+id/calendar_textview" tools:layout_conversion_absoluteHeight="19dp" tools:layout_conversion_absoluteWidth="363dp" /> <ImageButton android:id="@+id/change_color_new_event" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginEnd="24dp" android:layout_marginTop="20dp" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/choose_event_color_label" android:enabled="false" android:scaleType="center" android:src="@drawable/ic_colorpicker" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/calendar_selector_group_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/view" /> </androidx.constraintlayout.widget.ConstraintLayout>