Skip to content

Theme clean-up and better API 8, 9 and 10 support #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rolf-Smit wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Theme clean-up and better API 8, 9 and 10 support #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80062c0
- Better support for dialog sizes across different screen configurati…
Apr 30, 2015
cd73775
Removed unneeded comment
Apr 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 50 additions & 1 deletion alertdialogpro-core/src/main/java/com/alertdialogpro/internal/AlertController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.support.v7.internal.widget.ContentFrameLayout;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
Expand Down Expand Up @@ -190,10 +192,57 @@ static boolean canTextInput(View v) {
public void installContent() {
/* We use a custom title so never request a window title */
mWindow.requestFeature(Window.FEATURE_NO_TITLE);
mWindow.setContentView(mAlertDialogLayout);

/* On API 11 and below:
* Inflate the base DecorView of all dialogs,
* this is used to backport the windowMinWidthMajor,windowMinWidthMinor etc. attributes,
* in the same way AppCompat does
* */
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {

//FitWindowsLinearLayout decorView = (FitWindowsLinearLayout) mWindow.getLayoutInflater().inflate(R.layout.adp_alert_dialog_base, null, false);
ContentFrameLayout frameLayout = (ContentFrameLayout) mWindow.getLayoutInflater().inflate(R.layout.adp_alert_dialog_base, null, false);

//ContentFrameLayout frameLayout = (ContentFrameLayout) mWindow.getDecorView();
LayoutInflater.from(frameLayout.getContext()).inflate(mAlertDialogLayout, frameLayout, true);
//mWindow.setContentView(mAlertDialogLayout);
mWindow.setContentView(frameLayout);

applyFixedSizeWindow(frameLayout);
} else {
mWindow.setContentView(mAlertDialogLayout);
}


setupView();
}

private void applyFixedSizeWindow(ContentFrameLayout contentFrameLayout) {
TypedArray a = contentFrameLayout.getContext().obtainStyledAttributes(R.styleable.Theme);
a.getValue(R.styleable.Theme_windowMinWidthMajor, contentFrameLayout.getMinWidthMajor());
a.getValue(R.styleable.Theme_windowMinWidthMinor, contentFrameLayout.getMinWidthMinor());

if (a.hasValue(R.styleable.Theme_windowFixedWidthMajor)) {
a.getValue(R.styleable.Theme_windowFixedWidthMajor,
contentFrameLayout.getFixedWidthMajor());
}
if (a.hasValue(R.styleable.Theme_windowFixedWidthMinor)) {
a.getValue(R.styleable.Theme_windowFixedWidthMinor,
contentFrameLayout.getFixedWidthMinor());
}
if (a.hasValue(R.styleable.Theme_windowFixedHeightMajor)) {
a.getValue(R.styleable.Theme_windowFixedHeightMajor,
contentFrameLayout.getFixedHeightMajor());
}
if (a.hasValue(R.styleable.Theme_windowFixedHeightMinor)) {
a.getValue(R.styleable.Theme_windowFixedHeightMinor,
contentFrameLayout.getFixedHeightMinor());
}
a.recycle();

contentFrameLayout.requestLayout();
}

public void setTitle(CharSequence title) {
mTitle = title;
if (mTitleView != null) {
Expand Down
7 changes: 7 additions & 0 deletions alertdialogpro-core/src/main/res/layout/adp_alert_dialog_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.internal.widget.ContentFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/windowContentOverlay"
android:foregroundGravity="fill_horizontal|top"/>
5 changes: 5 additions & 0 deletions alertdialogpro-core/src/main/res/values-large/adp_core_dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="dimen" name="adp_dialog_min_width_major">55%</item>
<item type="dimen" name="adp_dialog_min_width_minor">80%</item>
</resources>
13 changes: 8 additions & 5 deletions alertdialogpro-core/src/main/res/values-v11/adp_core_themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Base.Theme.AlertDialogPro" parent="Theme.AppCompat.Dialog">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<!-- Use native windowMinWidth attributes on API 11 and higher -->
<item name="android:windowMinWidthMajor">@dimen/adp_dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@dimen/adp_dialog_min_width_minor</item>
</style>

<style name="Base.Theme.AlertDialogPro.Light" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<!-- Use native windowMinWidth attributes on API 11 and higher -->
<item name="android:windowMinWidthMajor">@dimen/adp_dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@dimen/adp_dialog_min_width_minor</item>
</style>

</resources>
</resources>
5 changes: 5 additions & 0 deletions alertdialogpro-core/src/main/res/values-xlarge/adp_core_dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="dimen" name="adp_dialog_min_width_major">45%</item>
<item type="dimen" name="adp_dialog_min_width_minor">72%</item>
</resources>
5 changes: 5 additions & 0 deletions alertdialogpro-core/src/main/res/values/adp_core_dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="dimen" name="adp_dialog_min_width_major">65%</item>
<item type="dimen" name="adp_dialog_min_width_minor">95%</item>
</resources>
47 changes: 6 additions & 41 deletions alertdialogpro-core/src/main/res/values/adp_core_themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Base.Theme.AlertDialogPro" parent="Theme.AppCompat.Dialog"/>
<style name="Base.Theme.AlertDialogPro" parent="Theme.AppCompat.Dialog">
<item name="windowMinWidthMajor">@dimen/adp_dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/adp_dialog_min_width_minor</item>
</style>

<style name="Base.Theme.AlertDialogPro.Light" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="buttonBarStyle">@android:style/ButtonBar</item>
<item name="buttonBarButtonStyle">@android:style/Widget.Button</item>

<!-- Window colors -->
<item name="android:colorForeground">@color/bright_foreground_material_light</item>
<item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item>
<item name="android:colorBackground">@color/background_material_light</item>
<item name="android:colorBackgroundCacheHint">@color/abc_background_cache_hint_selector_material_light</item>
<item name="android:disabledAlpha">0.5</item>
<item name="android:backgroundDimAmount">0.6</item>
<item name="android:windowBackground">@color/background_material_light</item>

<!-- Text colors -->
<item name="android:textColorPrimary">@color/abc_primary_text_material_light</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorTertiary">@color/abc_secondary_text_material_light</item>
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_light</item>
<item name="android:textColorPrimaryInverseDisableOnly">@color/abc_primary_text_disable_only_material_dark</item>
<item name="android:textColorHint">@color/hint_foreground_material_light</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_dark</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_light</item>
<item name="android:textColorLink">@color/link_text_material_light</item>

<!-- Text styles -->
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
<item name="android:textAppearanceLargeInverse">@style/TextAppearance.AppCompat.Large.Inverse</item>
<item name="android:textAppearanceMedium">@style/TextAppearance.AppCompat.Medium</item>
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.AppCompat.Medium.Inverse</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.AppCompat.Small</item>
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.AppCompat.Small.Inverse</item>
<item name="android:spinnerStyle">@style/Widget.AppCompat.Spinner</item>
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
<item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
<item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
<item name="windowMinWidthMajor">@dimen/adp_dialog_min_width_major</item>
<item name="windowMinWidthMinor">@dimen/adp_dialog_min_width_minor</item>
</style>

<style name="Theme.AlertDialogPro" parent="Base.Theme.AlertDialogPro">
Expand Down