Skip to content

Commit df7e80f

Browse files
author
Sergey
committed
Prepare for 1.3 release
1 parent 6299fab commit df7e80f

22 files changed

+174
-70
lines changed

‎contrib/ActionBarSherlock

Submodule ActionBarSherlock updated from 0584a38 to 90939dc

‎demo/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.WazaBe.HoloDemo"
4-
android:versionCode="13"
5-
android:versionName="1.2.4" >
4+
android:versionCode="20"
5+
android:versionName="1.3" >
66
<uses-sdk
77
android:minSdkVersion="4"
88
android:targetSdkVersion="16" />

‎library/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.WazaBe.HoloEverywhere"
4-
android:versionCode="13"
5-
android:versionName="1.2.4" >
4+
android:versionCode="20"
5+
android:versionName="1.3" >
66
<uses-sdk
77
android:minSdkVersion="4"
88
android:targetSdkVersion="16" />

‎library/res/values/attrs.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<attr name="dropdownListPreferredItemHeight" format="reference" />
1515
<attr name="textAppearanceLargePopupMenu" format="reference" />
1616
<attr name="textAppearanceSmallPopupMenu" format="reference" />
17+
<attr name="selectableItemBackground" format="reference" />
1718
-->
1819
<attr name="preferenceFrameLayoutStyle" format="reference" />
1920
<attr name="preferenceScreenStyle" format="reference" />
@@ -38,7 +39,6 @@
3839
<attr name="buttonBarButtonStyle" format="reference" />
3940
<attr name="borderlessButtonStyle" format="reference" />
4041
<attr name="segmentedButtonStyle" format="reference" />
41-
<attr name="selectableItemBackground" format="reference" />
4242
<attr name="listPreferredItemHeightLarge" format="dimension" />
4343
<attr name="dividerHorizontal" format="reference" />
4444
<attr name="listDividerAlertDialog" format="reference" />

‎library/src/android/support/v4/app/_HoloFragment.java

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package android.support.v4.app;
2+
3+
public class _HoloFragment extends Fragment {
4+
protected int internaGetContainerId() {
5+
return mContainerId;
6+
}
7+
}

‎library/src/com/WazaBe/HoloEverywhere/app/Activity.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.annotation.SuppressLint;
44
import android.os.Bundle;
5-
import android.support.v4.app._ActionBarSherlockTrojanHorse;
5+
import android.support.v4.app.Watson;
66
import android.view.View;
77
import android.view.ViewGroup.LayoutParams;
88

@@ -13,8 +13,7 @@
1313
import com.WazaBe.HoloEverywhere.internal.BaseSharedPreferences;
1414
import com.WazaBe.HoloEverywhere.preference.SharedPreferences;
1515

16-
public abstract class Activity extends _ActionBarSherlockTrojanHorse implements
17-
Base {
16+
public abstract class Activity extends Watson implements Base {
1817
private boolean forceThemeApply = false;
1918

2019
@Override
@@ -48,6 +47,7 @@ public boolean isForceThemeApply() {
4847
}
4948

5049
@Override
50+
@SuppressLint("NewApi")
5151
public void onBackPressed() {
5252
if (!getSupportFragmentManager().popBackStackImmediate()) {
5353
finish();
@@ -56,18 +56,13 @@ public void onBackPressed() {
5656

5757
@Override
5858
protected void onCreate(Bundle savedInstanceState) {
59+
getLayoutInflater().setFactory(this);
5960
if (Settings.isUseThemeManager()) {
6061
ThemeManager.applyTheme(this);
6162
}
6263
super.onCreate(savedInstanceState);
6364
}
6465

65-
@Override
66-
@SuppressLint("NewApi")
67-
public void onSupportBackPressed() {
68-
onBackPressed();
69-
}
70-
7166
@Override
7267
public void setContentView(int layoutResID) {
7368
super.setContentView(FontLoader.inflate(this, layoutResID));

‎library/src/com/WazaBe/HoloEverywhere/app/Base.java

-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ public interface Base {
1111
public boolean isABSSupport();
1212

1313
public boolean isForceThemeApply();
14-
15-
public void onSupportBackPressed();
1614
}

‎library/src/com/WazaBe/HoloEverywhere/app/DialogFragment.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.WazaBe.HoloEverywhere.app;
22

3-
import java.lang.reflect.Field;
4-
53
import android.content.Context;
64
import android.content.DialogInterface;
75
import android.os.Bundle;
@@ -177,13 +175,7 @@ public void onCancel(DialogInterface dialog) {
177175
@Override
178176
public void onCreate(Bundle savedInstanceState) {
179177
super.onCreate(savedInstanceState);
180-
try {
181-
Field field = getClass().getField("mContainerId");
182-
field.setAccessible(true);
183-
mShowsDialog = (Integer) field.get(field) == 0;
184-
} catch (Exception e) {
185-
mShowsDialog = false;
186-
}
178+
mShowsDialog = internaGetContainerId() == 0;
187179
if (savedInstanceState != null) {
188180
mStyle = savedInstanceState.getInt(SAVED_STYLE, STYLE_NORMAL);
189181
mTheme = savedInstanceState.getInt(SAVED_THEME, 0);
@@ -192,7 +184,6 @@ public void onCreate(Bundle savedInstanceState) {
192184
mShowsDialog);
193185
mBackStackId = savedInstanceState.getInt(SAVED_BACK_STACK_ID, -1);
194186
}
195-
196187
}
197188

198189
public Dialog onCreateDialog(Bundle savedInstanceState) {

‎library/src/com/WazaBe/HoloEverywhere/app/Fragment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.support.v4.app.FragmentManager;
5+
import android.support.v4.app._HoloFragment;
56
import android.util.AttributeSet;
67
import android.view.View;
78
import android.view.ViewGroup;
@@ -11,7 +12,7 @@
1112
import com.WazaBe.HoloEverywhere.internal.BaseSharedPreferences;
1213
import com.WazaBe.HoloEverywhere.preference.SharedPreferences;
1314

14-
public class Fragment extends android.support.v4.app.Fragment {
15+
public class Fragment extends _HoloFragment {
1516
public LayoutInflater getLayoutInflater() {
1617
return LayoutInflater.from(getActivity());
1718
}

‎library/src/com/WazaBe/HoloEverywhere/preference/PreferenceActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ public void finishPreferencePanel(Fragment caller, int resultCode,
355355
setResult(resultCode, resultData);
356356
finish();
357357
} else {
358-
onSupportBackPressed();
358+
onBackPressed();
359359
if (caller != null) {
360360
if (caller.getTargetFragment() != null) {
361361
caller.getTargetFragment().onActivityResult(

‎library/src/com/WazaBe/HoloEverywhere/preference/PreferenceFrameLayout.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.view.View;
77

88
import com.WazaBe.HoloEverywhere.R;
9-
import com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout;
9+
import com.WazaBe.HoloEverywhere.widget.NineFrameLayout;
1010

1111
public class PreferenceFrameLayout extends NineFrameLayout {
1212
public static class LayoutParams extends NineFrameLayout.LayoutParams {

‎library/src/com/WazaBe/HoloEverywhere/sherlock/SActivity.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.view.ViewGroup.LayoutParams;
99
import android.view.Window;
1010

11+
import com.WazaBe.HoloEverywhere.FontLoader;
1112
import com.WazaBe.HoloEverywhere.app.Activity;
1213
import com.actionbarsherlock.ActionBarSherlock;
1314
import com.actionbarsherlock.app.ActionBar;
@@ -25,7 +26,7 @@ public abstract class SActivity extends Activity implements SBase {
2526
@Override
2627
public void addContentView(View view, LayoutParams params) {
2728
if (isABSSupport()) {
28-
getSherlock().addContentView(view, params);
29+
getSherlock().addContentView(FontLoader.apply(view), params);
2930
} else {
3031
super.addContentView(view, params);
3132
}
@@ -244,7 +245,7 @@ public void requestWindowFeature(long featureId) {
244245
@Override
245246
public void setContentView(int layoutResId) {
246247
if (isABSSupport()) {
247-
getSherlock().setContentView(layoutResId);
248+
getSherlock().setContentView(FontLoader.inflate(this, layoutResId));
248249
} else {
249250
super.setContentView(layoutResId);
250251
}
@@ -253,7 +254,7 @@ public void setContentView(int layoutResId) {
253254
@Override
254255
public void setContentView(View view) {
255256
if (isABSSupport()) {
256-
getSherlock().setContentView(view);
257+
getSherlock().setContentView(FontLoader.apply(view));
257258
} else {
258259
super.setContentView(view);
259260
}
@@ -262,7 +263,7 @@ public void setContentView(View view) {
262263
@Override
263264
public void setContentView(View view, LayoutParams params) {
264265
if (isABSSupport()) {
265-
getSherlock().setContentView(view, params);
266+
getSherlock().setContentView(FontLoader.apply(view), params);
266267
} else {
267268
super.setContentView(view, params);
268269
}

‎library/src/com/WazaBe/HoloEverywhere/sherlock/SDialogFragment.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.WazaBe.HoloEverywhere.sherlock;
22

33
import android.os.Build.VERSION;
4-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnCreateOptionsMenuListener;
5-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnOptionsItemSelectedListener;
6-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnPrepareOptionsMenuListener;
4+
import android.support.v4.app.Watson.OnCreateOptionsMenuListener;
5+
import android.support.v4.app.Watson.OnOptionsItemSelectedListener;
6+
import android.support.v4.app.Watson.OnPrepareOptionsMenuListener;
77

88
import com.WazaBe.HoloEverywhere.app.Activity;
99
import com.WazaBe.HoloEverywhere.app.DialogFragment;
@@ -18,10 +18,16 @@ public class SDialogFragment extends DialogFragment implements
1818
OnOptionsItemSelectedListener {
1919
private SBase mBase;
2020

21+
@Deprecated
2122
public SActivity getSherlockActivity() {
2223
return (SActivity) mBase;
2324
}
2425

26+
@SuppressWarnings("unchecked")
27+
public <T extends Activity & SBase> T getSActivity() {
28+
return (T) mBase;
29+
}
30+
2531
@Override
2632
public boolean isABSSupport() {
2733
return VERSION.SDK_INT >= 7;
@@ -32,7 +38,7 @@ public void onAttach(Activity activity) {
3238
if (isABSSupport()) {
3339
if (!(activity instanceof SBase)) {
3440
throw new IllegalStateException(getClass().getSimpleName()
35-
+ " must be attached to a SActivity.");
41+
+ " must be attached to a S***Activity.");
3642
}
3743
mBase = (SBase) activity;
3844
}

‎library/src/com/WazaBe/HoloEverywhere/sherlock/SExpandableListActivity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.view.ViewGroup.LayoutParams;
99
import android.view.Window;
1010

11+
import com.WazaBe.HoloEverywhere.FontLoader;
1112
import com.WazaBe.HoloEverywhere.app.ExpandableListActivity;
1213
import com.actionbarsherlock.ActionBarSherlock;
1314
import com.actionbarsherlock.app.ActionBar;
@@ -26,7 +27,7 @@ public abstract class SExpandableListActivity extends ExpandableListActivity
2627
@Override
2728
public void addContentView(View view, LayoutParams params) {
2829
if (isABSSupport()) {
29-
getSherlock().addContentView(view, params);
30+
getSherlock().addContentView(FontLoader.apply(view), params);
3031
} else {
3132
super.addContentView(view, params);
3233
}
@@ -245,7 +246,7 @@ public void requestWindowFeature(long featureId) {
245246
@Override
246247
public void setContentView(int layoutResId) {
247248
if (isABSSupport()) {
248-
getSherlock().setContentView(layoutResId);
249+
getSherlock().setContentView(FontLoader.inflate(this, layoutResId));
249250
} else {
250251
super.setContentView(layoutResId);
251252
}
@@ -254,7 +255,7 @@ public void setContentView(int layoutResId) {
254255
@Override
255256
public void setContentView(View view) {
256257
if (isABSSupport()) {
257-
getSherlock().setContentView(view);
258+
getSherlock().setContentView(FontLoader.apply(view));
258259
} else {
259260
super.setContentView(view);
260261
}
@@ -263,7 +264,7 @@ public void setContentView(View view) {
263264
@Override
264265
public void setContentView(View view, LayoutParams params) {
265266
if (isABSSupport()) {
266-
getSherlock().setContentView(view, params);
267+
getSherlock().setContentView(FontLoader.apply(view), params);
267268
} else {
268269
super.setContentView(view, params);
269270
}
@@ -322,5 +323,4 @@ public ActionMode startActionMode(ActionMode.Callback callback) {
322323
@Override
323324
public void supportInvalidateOptionsMenu() {
324325
invalidateOptionsMenu();
325-
}
326-
}
326+
}}

‎library/src/com/WazaBe/HoloEverywhere/sherlock/SFragment.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.WazaBe.HoloEverywhere.sherlock;
22

33
import android.os.Build.VERSION;
4-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnCreateOptionsMenuListener;
5-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnOptionsItemSelectedListener;
6-
import android.support.v4.app._ActionBarSherlockTrojanHorse.OnPrepareOptionsMenuListener;
4+
import android.support.v4.app.Watson.OnCreateOptionsMenuListener;
5+
import android.support.v4.app.Watson.OnOptionsItemSelectedListener;
6+
import android.support.v4.app.Watson.OnPrepareOptionsMenuListener;
77

88
import com.WazaBe.HoloEverywhere.app.Activity;
99
import com.WazaBe.HoloEverywhere.app.Fragment;
@@ -17,10 +17,16 @@ public class SFragment extends Fragment implements OnCreateOptionsMenuListener,
1717
OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
1818
private SBase mBase;
1919

20+
@Deprecated
2021
public SActivity getSherlockActivity() {
2122
return (SActivity) mBase;
2223
}
2324

25+
@SuppressWarnings("unchecked")
26+
public <T extends Activity & SBase> T getSActivity() {
27+
return (T) mBase;
28+
}
29+
2430
@Override
2531
public boolean isABSSupport() {
2632
return VERSION.SDK_INT >= 7;
@@ -31,7 +37,7 @@ public void onAttach(Activity activity) {
3137
if (isABSSupport()) {
3238
if (!(activity instanceof SBase)) {
3339
throw new IllegalStateException(getClass().getSimpleName()
34-
+ " must be attached to a SActivity.");
40+
+ " must be attached to a S***Activity.");
3541
}
3642
mBase = (SBase) activity;
3743
}

‎library/src/com/WazaBe/HoloEverywhere/sherlock/SListActivity.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.view.ViewGroup.LayoutParams;
99
import android.view.Window;
1010

11+
import com.WazaBe.HoloEverywhere.FontLoader;
1112
import com.WazaBe.HoloEverywhere.app.ListActivity;
1213
import com.actionbarsherlock.ActionBarSherlock;
1314
import com.actionbarsherlock.app.ActionBar;
@@ -25,7 +26,7 @@ public abstract class SListActivity extends ListActivity implements SBase {
2526
@Override
2627
public void addContentView(View view, LayoutParams params) {
2728
if (isABSSupport()) {
28-
getSherlock().addContentView(view, params);
29+
getSherlock().addContentView(FontLoader.apply(view), params);
2930
} else {
3031
super.addContentView(view, params);
3132
}
@@ -244,7 +245,7 @@ public void requestWindowFeature(long featureId) {
244245
@Override
245246
public void setContentView(int layoutResId) {
246247
if (isABSSupport()) {
247-
getSherlock().setContentView(layoutResId);
248+
getSherlock().setContentView(FontLoader.inflate(this, layoutResId));
248249
} else {
249250
super.setContentView(layoutResId);
250251
}
@@ -253,7 +254,7 @@ public void setContentView(int layoutResId) {
253254
@Override
254255
public void setContentView(View view) {
255256
if (isABSSupport()) {
256-
getSherlock().setContentView(view);
257+
getSherlock().setContentView(FontLoader.apply(view));
257258
} else {
258259
super.setContentView(view);
259260
}
@@ -262,7 +263,7 @@ public void setContentView(View view) {
262263
@Override
263264
public void setContentView(View view, LayoutParams params) {
264265
if (isABSSupport()) {
265-
getSherlock().setContentView(view, params);
266+
getSherlock().setContentView(FontLoader.apply(view), params);
266267
} else {
267268
super.setContentView(view, params);
268269
}

0 commit comments

Comments
 (0)