From b7587151bf4815f302deff93f653f6307a1e3035 Mon Sep 17 00:00:00 2001 From: David Vavra Date: Tue, 23 Dec 2014 19:58:49 +0100 Subject: [PATCH 01/13] started working on material design rewrite (#77) --- demo/src/main/AndroidManifest.xml | 13 +- .../eu/inmite/demo/dialogs/MyActivity.java | 209 ++--- demo/src/main/res/layout/main.xml | 29 - demo/src/main/res/values-v11/theme.xml | 22 - demo/src/main/res/values/colors.xml | 29 +- demo/src/main/res/values/styles.xml | 7 +- demo/src/main/res/values/theme.xml | 52 +- library/build.gradle | 2 +- .../lib/dialogs/BaseDialogFragment.java | 847 +++++++++--------- .../res/color/sdl_primary_text_holo_dark.xml | 25 - .../res/color/sdl_primary_text_holo_light.xml | 25 - .../drawable-hdpi/sdl_background_dark.9.png | Bin 307 -> 0 bytes .../drawable-mdpi/sdl_background_dark.9.png | Bin 219 -> 0 bytes .../src/main/res/drawable-v21/sdl_button.xml | 5 + .../res/drawable-v21/sdl_button_selector.xml | 5 + .../drawable-xhdpi/sdl_background_dark.9.png | Bin 366 -> 0 bytes .../main/res/drawable/sdl_button_normal.xml | 5 + .../main/res/drawable/sdl_button_pressed.xml | 6 + .../res/layout/dialog_part_button_panel.xml | 4 +- .../main/res/layout/dialog_part_custom.xml | 4 +- .../main/res/layout/dialog_part_message.xml | 12 +- .../main/res/layout/dialog_part_progress.xml | 2 +- .../src/main/res/layout/dialog_part_title.xml | 15 - library/src/main/res/layout/sdl_dialog.xml | 49 + .../{sdl__theme.xml => sdl_styles.xml} | 0 library/src/main/res/values/sdl__ids.xml | 6 - .../values/{sdl__attrs.xml => sdl_attrs.xml} | 7 +- .../{sdl__colors.xml => sdl_colors.xml} | 12 +- .../{sdl__dimens.xml => sdl_dimens.xml} | 0 library/src/main/res/values/sdl_ids.xml | 6 + .../{sdl__strings.xml => sdl_strings.xml} | 0 .../values/{sdl__theme.xml => sdl_styles.xml} | 133 +-- 32 files changed, 703 insertions(+), 828 deletions(-) delete mode 100644 demo/src/main/res/values-v11/theme.xml delete mode 100644 library/src/main/res/color/sdl_primary_text_holo_dark.xml delete mode 100644 library/src/main/res/color/sdl_primary_text_holo_light.xml delete mode 100644 library/src/main/res/drawable-hdpi/sdl_background_dark.9.png delete mode 100644 library/src/main/res/drawable-mdpi/sdl_background_dark.9.png create mode 100644 library/src/main/res/drawable-v21/sdl_button.xml create mode 100644 library/src/main/res/drawable-v21/sdl_button_selector.xml delete mode 100644 library/src/main/res/drawable-xhdpi/sdl_background_dark.9.png create mode 100644 library/src/main/res/drawable/sdl_button_normal.xml create mode 100644 library/src/main/res/drawable/sdl_button_pressed.xml delete mode 100644 library/src/main/res/layout/dialog_part_title.xml create mode 100644 library/src/main/res/layout/sdl_dialog.xml rename library/src/main/res/values-v11/{sdl__theme.xml => sdl_styles.xml} (100%) delete mode 100644 library/src/main/res/values/sdl__ids.xml rename library/src/main/res/values/{sdl__attrs.xml => sdl_attrs.xml} (85%) rename library/src/main/res/values/{sdl__colors.xml => sdl_colors.xml} (75%) rename library/src/main/res/values/{sdl__dimens.xml => sdl_dimens.xml} (100%) create mode 100644 library/src/main/res/values/sdl_ids.xml rename library/src/main/res/values/{sdl__strings.xml => sdl_strings.xml} (100%) rename library/src/main/res/values/{sdl__theme.xml => sdl_styles.xml} (62%) diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index f8b6c4d..f29ed38 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,19 +1,14 @@ + package="eu.inmite.demo.dialogs"> - + android:theme="@style/AppTheme" + android:allowBackup="true"> + android:name=".MyActivity"> diff --git a/demo/src/main/java/eu/inmite/demo/dialogs/MyActivity.java b/demo/src/main/java/eu/inmite/demo/dialogs/MyActivity.java index a9531e6..7af90fd 100644 --- a/demo/src/main/java/eu/inmite/demo/dialogs/MyActivity.java +++ b/demo/src/main/java/eu/inmite/demo/dialogs/MyActivity.java @@ -16,38 +16,22 @@ package eu.inmite.demo.dialogs; +import java.text.DateFormat; +import java.util.Date; + import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import android.support.v7.app.ActionBarActivity; import android.view.View; import android.widget.Toast; -import java.text.DateFormat; -import java.util.Date; - -import eu.inmite.android.lib.dialogs.DatePickerDialogFragment; -import eu.inmite.android.lib.dialogs.IDateDialogListener; -import eu.inmite.android.lib.dialogs.IListDialogListener; -import eu.inmite.android.lib.dialogs.ISimpleDialogCancelListener; -import eu.inmite.android.lib.dialogs.ISimpleDialogListener; -import eu.inmite.android.lib.dialogs.ListDialogFragment; -import eu.inmite.android.lib.dialogs.ProgressDialogFragment; -import eu.inmite.android.lib.dialogs.SimpleDialogFragment; -import eu.inmite.android.lib.dialogs.TimePickerDialogFragment; - -public class MyActivity extends FragmentActivity implements - ISimpleDialogListener, - IDateDialogListener, - ISimpleDialogCancelListener, - IListDialogListener { - - public static final int THEME_DEFAULT_DARK = 0; +import eu.inmite.android.lib.dialogs.*; - public static final int THEME_DEFAULT_LIGHT = 1; - - public static final int THEME_CUSTOM_DARK = 2; - - public static final int THEME_CUSTOM_LIGHT = 3; +public class MyActivity extends ActionBarActivity implements + ISimpleDialogListener, + IDateDialogListener, + ISimpleDialogCancelListener, + IListDialogListener { public static final String EXTRA_THEME = "theme"; @@ -57,55 +41,54 @@ public class MyActivity extends FragmentActivity implements @Override public void onCreate(Bundle savedInstanceState) { - setThemeOnCreate(); super.onCreate(savedInstanceState); setContentView(R.layout.main); findViewById(R.id.message_dialog).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { SimpleDialogFragment.createBuilder(c, getSupportFragmentManager()) - .setMessage(R.string.message_1).show(); + .setMessage(R.string.message_1).show(); } }); findViewById(R.id.message_title_dialog).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { SimpleDialogFragment.createBuilder(c, getSupportFragmentManager()) - .setTitle(R.string.title).setMessage(R.string.message_2).show(); + .setTitle(R.string.title).setMessage(R.string.message_2).show(); } }); findViewById(R.id.message_title_buttons_dialog) - .setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - SimpleDialogFragment.createBuilder(c, getSupportFragmentManager()) - .setTitle(R.string.title) - .setMessage(R.string.message_3) - .setPositiveButtonText(R.string.positive_button) - .setNegativeButtonText(R.string.negative_button).setRequestCode(42) - .setTag("custom-tag") - .show(); - } - }); + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SimpleDialogFragment.createBuilder(c, getSupportFragmentManager()) + .setTitle(R.string.title) + .setMessage(R.string.message_3) + .setPositiveButtonText(R.string.positive_button) + .setNegativeButtonText(R.string.negative_button).setNeutralButtonText("WTF?").setRequestCode(42) + .setTag("custom-tag") + .show(); + } + }); findViewById(R.id.progress_dialog).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { ProgressDialogFragment.createBuilder(c, getSupportFragmentManager()) - .setMessage(R.string.message_4) - .setRequestCode(REQUEST_PROGRESS) - .setTitle(R.string.app_name) - .show(); + .setMessage(R.string.message_4) + .setRequestCode(REQUEST_PROGRESS) + .setTitle(R.string.app_name) + .show(); } }); findViewById(R.id.list_dialog).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { ListDialogFragment - .createBuilder(c, getSupportFragmentManager()) - .setTitle("Your favorite character:") - .setItems(new String[]{"Jayne", "Malcolm", "Kaylee", - "Wash", "Zoe", "River"}) - .show(); + .createBuilder(c, getSupportFragmentManager()) + .setTitle("Your favorite character:") + .setItems(new String[]{"Jayne", "Malcolm", "Kaylee", + "Wash", "Zoe", "River"}) + .show(); } }); @@ -115,56 +98,32 @@ public void onClick(View v) { JayneHatDialogFragment.show(c); } }); - findViewById(R.id.default_dark_theme).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - setCurrentTheme(THEME_DEFAULT_DARK); - } - }); - findViewById(R.id.default_light_theme).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - setCurrentTheme(THEME_DEFAULT_LIGHT); - } - }); - findViewById(R.id.custom_dark_theme).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.time_picker).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - setCurrentTheme(THEME_CUSTOM_DARK); + TimePickerDialogFragment + .createBuilder(MyActivity.this, getSupportFragmentManager()) + .setDate(new Date()) + .set24hour(true) + .setPositiveButtonText(android.R.string.ok) + .setNegativeButtonText(android.R.string.cancel) + .setRequestCode(13) + .show(); } }); - findViewById(R.id.custom_light_theme).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.date_picker).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - setCurrentTheme(THEME_CUSTOM_LIGHT); + DatePickerDialogFragment + .createBuilder(MyActivity.this, getSupportFragmentManager()) + .setDate(new Date()) + .set24hour(true) + .setPositiveButtonText(android.R.string.ok) + .setNegativeButtonText(android.R.string.cancel) + .setRequestCode(12) + .show(); } }); - findViewById(R.id.time_picker).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - TimePickerDialogFragment - .createBuilder(MyActivity.this, getSupportFragmentManager()) - .setDate(new Date()) - .set24hour(true) - .setPositiveButtonText(android.R.string.ok) - .setNegativeButtonText(android.R.string.cancel) - .setRequestCode(13) - .show(); - } - }); - findViewById(R.id.date_picker).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - DatePickerDialogFragment - .createBuilder(MyActivity.this, getSupportFragmentManager()) - .setDate(new Date()) - .set24hour(true) - .setPositiveButtonText(android.R.string.ok) - .setNegativeButtonText(android.R.string.cancel) - .setRequestCode(12) - .show(); - } - }); } // IListDialogListener @@ -216,30 +175,30 @@ public void onNeutralButtonClicked(int requestCode) { // IDateDialogListener @Override - public void onNegativeButtonClicked(int resultCode, Date date) { - String text=""; - if (resultCode==12) { - text="Date "; - } else if (resultCode==13) { - text="Time "; - } - - DateFormat dateFormat= DateFormat.getDateInstance(DateFormat.DEFAULT); - Toast.makeText(this,text+"Cancelled "+ dateFormat.format(date),Toast.LENGTH_SHORT).show(); - } - - @Override - public void onPositiveButtonClicked(int resultCode, Date date) { - String text=""; - if (resultCode==12) { - text="Date "; - } else if (resultCode==13) { - text="Time "; - } - - DateFormat dateFormat= DateFormat.getDateTimeInstance(); - Toast.makeText(this,text+ "Success! "+ dateFormat.format(date),Toast.LENGTH_SHORT).show(); - } + public void onNegativeButtonClicked(int resultCode, Date date) { + String text = ""; + if (resultCode == 12) { + text = "Date "; + } else if (resultCode == 13) { + text = "Time "; + } + + DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.DEFAULT); + Toast.makeText(this, text + "Cancelled " + dateFormat.format(date), Toast.LENGTH_SHORT).show(); + } + + @Override + public void onPositiveButtonClicked(int resultCode, Date date) { + String text = ""; + if (resultCode == 12) { + text = "Date "; + } else if (resultCode == 13) { + text = "Time "; + } + + DateFormat dateFormat = DateFormat.getDateTimeInstance(); + Toast.makeText(this, text + "Success! " + dateFormat.format(date), Toast.LENGTH_SHORT).show(); + } private void setCurrentTheme(int theme) { Intent i = new Intent(c, MyActivity.class); @@ -248,22 +207,4 @@ private void setCurrentTheme(int theme) { finish(); overridePendingTransition(0, 0); } - - private void setThemeOnCreate() { - int theme = getIntent().getIntExtra(EXTRA_THEME, THEME_CUSTOM_DARK); - switch (theme) { - case THEME_DEFAULT_DARK: - setTheme(R.style.DefaultDarkTheme); - break; - case THEME_DEFAULT_LIGHT: - setTheme(R.style.DefaultLightTheme); - break; - case THEME_CUSTOM_DARK: - setTheme(R.style.CustomDarkTheme); - break; - case THEME_CUSTOM_LIGHT: - setTheme(R.style.CustomLightTheme); - break; - } - } } diff --git a/demo/src/main/res/layout/main.xml b/demo/src/main/res/layout/main.xml index e81d0d5..2119fc9 100644 --- a/demo/src/main/res/layout/main.xml +++ b/demo/src/main/res/layout/main.xml @@ -9,35 +9,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - -