Merge branch 'ubilabs--rcapp--refactoring_bitmap_helper' into ubilabs--rcapp--refactoring

This commit is contained in:
Peter Siegmund committed 2015-05-28 15:06:15 +02:00
commit 259f69409a
13 files changed
+42 -122

No files matched your search

@@ -1,6 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.activities;
import android.annotation.TargetApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -8,7 +7,6 @@ import android.content.ServiceConnection;
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.IBinder;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
@@ -23,6 +21,7 @@ import com.sap.sailing.android.shared.services.sending.MessageSendingService.Mes
import com.sap.sailing.android.shared.ui.activities.ResilientActivity;
import com.sap.sailing.android.shared.util.PrefUtils;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import java.util.Date;
@@ -147,14 +146,8 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
R.string.preference_server_url_default), sendingServiceStatus);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private Drawable getTintedDrawable(Resources res, @DrawableRes int drawableResId, @ColorRes int color) {
Drawable drawable;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
drawable = getDrawable(drawableResId);
} else {
drawable = res.getDrawable(drawableResId);
}
Drawable drawable = BitmapHelper.getDrawable(this, drawableResId);
drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
return drawable;
}
@@ -1,11 +1,7 @@
package com.sap.sailing.racecommittee.app.ui.adapters;
import java.util.ArrayList;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -14,12 +10,13 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.sap.sailing.android.shared.util.ViewHolder;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import java.util.ArrayList;
public class AbortFlagsAdapter extends BaseFlagsAdapter {
public class AbortFlag extends FlagItem {
@@ -82,7 +79,6 @@ public class AbortFlagsAdapter extends BaseFlagsAdapter {
return position;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
@@ -98,11 +94,7 @@ public class AbortFlagsAdapter extends BaseFlagsAdapter {
flagImage.setVisibility(View.INVISIBLE);
int flagResId = mContext.getResources().getIdentifier(item.file_name, "drawable", mContext.getPackageName());
if (flagResId != 0) {
if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
flagDrawable = mContext.getDrawable(flagResId);
} else {
flagDrawable = mContext.getResources().getDrawable(flagResId);
}
flagDrawable = BitmapHelper.getDrawable(mContext, flagResId);
} else {
flagDrawable = BitmapHelper.getAttrDrawable(mContext, item.file_name);
}
@@ -1,25 +1,22 @@
package com.sap.sailing.racecommittee.app.ui.adapters;
import java.util.Collections;
import java.util.List;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import com.sap.sailing.android.shared.util.ViewHolder;
import com.sap.sailing.domain.common.impl.NaturalComparator;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import java.util.Collections;
import java.util.List;
public class CourseNameAdapter extends BaseAdapter implements View.OnClickListener {
private Context mContext;
@@ -49,7 +46,6 @@ public class CourseNameAdapter extends BaseAdapter implements View.OnClickListen
return position;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
@@ -1,19 +1,12 @@
package com.sap.sailing.racecommittee.app.ui.adapters;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.v4.view.ViewCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
@@ -25,6 +18,10 @@ import com.sap.sailing.racecommittee.app.domain.impl.CompetitorsWithIdImpl;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapter.ViewHolder> {
private final static String TAG = FinishListAdapter.class.getName();
@@ -148,7 +145,6 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
}
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onSetSwipeBackground(ViewHolder viewHolder, int type) {
int bgRes = 0;
@@ -166,11 +162,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
viewHolder.container.setBackgroundColor(ThemeHelper.getColor(mContext, R.attr.sap_gray_black_30));
Drawable background = BitmapHelper.getAttrDrawable(mContext, bgRes);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
viewHolder.itemView.setBackground(background);
} else {
viewHolder.itemView.setBackgroundDrawable(background);
}
BitmapHelper.setBackground(viewHolder.itemView, background);
}
@Override
@@ -1,19 +1,13 @@
package com.sap.sailing.racecommittee.app.ui.adapters.coursedesign;
import java.util.ArrayList;
import java.util.List;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.v4.view.ViewCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
@@ -27,6 +21,9 @@ import com.sap.sailing.racecommittee.app.ui.utils.MarkImageHelper;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import java.util.ArrayList;
import java.util.List;
public class CourseElementAdapter extends BaseDraggableSwipeAdapter<CourseElementAdapter.ViewHolder> {
private final static String TAG = CourseElementAdapter.class.getName();
@@ -186,7 +183,6 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<CourseElemen
}
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onSetSwipeBackground(ViewHolder viewHolder, int type) {
int bgRes = 0;
@@ -204,11 +200,7 @@ public class CourseElementAdapter extends BaseDraggableSwipeAdapter<CourseElemen
viewHolder.container.setBackgroundColor(ThemeHelper.getColor(mContext, R.attr.sap_gray_black_30));
Drawable background = BitmapHelper.getAttrDrawable(mContext, bgRes);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
viewHolder.itemView.setBackground(background);
} else {
viewHolder.itemView.setBackgroundDrawable(background);
}
BitmapHelper.setBackground(viewHolder.itemView, background);
}
@Override
@@ -1,8 +1,6 @@
package com.sap.sailing.racecommittee.app.ui.fragments;
import android.annotation.TargetApi;
import android.app.Fragment;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
@@ -11,7 +9,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.RelativeLayout;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.racecommittee.app.R;
@@ -46,7 +43,6 @@ public class MainPreferenceFragment extends LoggableFragment implements OnClickL
super.onPause();
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onClick(View view) {
if (view != null && view instanceof Button) {
@@ -1,11 +1,9 @@
package com.sap.sailing.racecommittee.app.ui.fragments.panels;
import android.annotation.TargetApi;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater;
@@ -13,7 +11,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.ViewHolder;
import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
@@ -132,7 +129,6 @@ public class SetupPanelFragment extends BasePanelFragment {
LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(mReceiver);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private void refreshPanel() {
if (mCourseValue != null) {
mCourseValue.setText(null);
@@ -1,6 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import android.annotation.TargetApi;
import android.content.DialogInterface;
import android.content.Loader;
import android.graphics.drawable.NinePatchDrawable;
@@ -40,6 +39,7 @@ import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseMarkAdap
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseMarkAdapter.MarkLongClick;
import com.sap.sailing.racecommittee.app.ui.comparators.NaturalNamedComparator;
import com.sap.sailing.racecommittee.app.ui.utils.ESSMarkImageHelper;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
@@ -82,7 +82,6 @@ public class CourseFragmentMarks extends CourseFragment implements MarkLongClick
return fragment;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.race_schedule_course_marks, container, false);
@@ -103,11 +102,8 @@ public class CourseFragmentMarks extends CourseFragment implements MarkLongClick
mGuardManager.setEnabled(true);
mDragDropManager = new RecyclerViewDragDropManager();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mDragDropManager.setDraggingItemShadowDrawable((NinePatchDrawable) getActivity().getDrawable(R.drawable.material_shadow_z3));
} else {
mDragDropManager.setDraggingItemShadowDrawable((NinePatchDrawable) getResources().getDrawable(R.drawable.material_shadow_z3));
}
NinePatchDrawable drawable = (NinePatchDrawable) BitmapHelper.getDrawable(getActivity(),R.drawable.material_shadow_z3);
mDragDropManager.setDraggingItemShadowDrawable(drawable);
mSwipeManager = new RecyclerViewSwipeManager();
@@ -1,8 +1,6 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import android.annotation.TargetApi;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
@@ -105,7 +103,6 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi
return layout;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onResume() {
super.onResume();
@@ -1,8 +1,6 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import android.annotation.TargetApi;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,6 +15,7 @@ import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.ui.adapters.MoreFlagsAdapter;
import com.sap.sailing.racecommittee.app.ui.adapters.MoreFlagsAdapter.MoreFlag;
import com.sap.sailing.racecommittee.app.ui.adapters.MoreFlagsAdapter.MoreFlagItemClick;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.MillisecondsTimePoint;
@@ -104,7 +103,6 @@ public class MoreFlagsFragment extends BaseFragment implements MoreFlagItemClick
return fragment;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.race_finish_config, container, false);
@@ -141,12 +139,7 @@ public class MoreFlagsFragment extends BaseFragment implements MoreFlagItemClick
ImageView flag = ViewHolder.get(layout, R.id.header_flag);
if (flag != null) {
int resId = R.drawable.flag_blue_48dp;
Drawable drawable;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
drawable = getResources().getDrawable(resId, null);
} else {
drawable = getResources().getDrawable(resId);
}
Drawable drawable = BitmapHelper.getDrawable(getActivity(), resId);
flag.setImageDrawable(drawable);
}
@@ -1,16 +1,8 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import android.annotation.TargetApi;
import android.content.DialogInterface;
import android.content.Loader;
import android.graphics.drawable.NinePatchDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
@@ -20,7 +12,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.Toast;
import com.h6ah4i.android.widget.advrecyclerview.animator.SwipeDismissItemAnimator;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
@@ -42,9 +33,16 @@ import com.sap.sailing.racecommittee.app.domain.impl.CompetitorsWithIdImpl;
import com.sap.sailing.racecommittee.app.ui.adapters.CompetitorAdapter;
import com.sap.sailing.racecommittee.app.ui.adapters.FinishListAdapter;
import com.sap.sailing.racecommittee.app.ui.comparators.NaturalNamedComparator;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class PositioningFragment extends BaseFragment
implements CompetitorAdapter.CompetitorClick, FinishListAdapter.FinishEvents {
@@ -78,7 +76,6 @@ public class PositioningFragment extends BaseFragment
return layout;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -94,13 +91,8 @@ public class PositioningFragment extends BaseFragment
mGuardManager.setEnabled(true);
mDragDropManager = new RecyclerViewDragDropManager();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mDragDropManager.setDraggingItemShadowDrawable(
(NinePatchDrawable) getActivity().getDrawable(R.drawable.material_shadow_z3));
} else {
mDragDropManager.setDraggingItemShadowDrawable(
(NinePatchDrawable) getResources().getDrawable(R.drawable.material_shadow_z3));
}
NinePatchDrawable drawable = (NinePatchDrawable) BitmapHelper.getDrawable(getActivity(), R.drawable.material_shadow_z3);
mDragDropManager.setDraggingItemShadowDrawable(drawable);
mSwipeManager = new RecyclerViewSwipeManager();
@@ -1,16 +1,14 @@
package com.sap.sailing.racecommittee.app.ui.utils;
import java.util.ArrayList;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Build;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.AppPreferences;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import java.util.ArrayList;
public class FlagsResources {
@@ -139,17 +137,12 @@ public class FlagsResources {
return result;
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public static LayerDrawable getFlagDrawable(Context context, String flag, int size) {
ArrayList<Integer> drawables = FlagsResources.getResId(context, flag, size);
ArrayList<Drawable> layers = new ArrayList<>();
for (Integer resId : drawables) {
if (resId != 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
layers.add(context.getDrawable(resId));
} else {
layers.add(context.getResources().getDrawable(resId));
}
layers.add(BitmapHelper.getDrawable(context, resId));
}
}
return new LayerDrawable(layers.toArray(new Drawable[layers.size()]));
@@ -1,24 +1,22 @@
package com.sap.sailing.racecommittee.app.utils.autoupdate;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import android.annotation.TargetApi;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.v7.app.AlertDialog;
import android.widget.Toast;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.AppUtils;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
public class AutoUpdaterChecker {
@@ -179,16 +177,10 @@ public class AutoUpdaterChecker {
updater.updateFromFile(result);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void onError() {
dialog.dismiss();
Drawable drawable;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
drawable = context.getDrawable(android.R.drawable.ic_dialog_alert);
} else {
drawable = context.getResources().getDrawable(android.R.drawable.ic_dialog_alert);
}
Drawable drawable = BitmapHelper.getDrawable(context, android.R.drawable.ic_dialog_alert);
AlertDialog.Builder errorDialog = new AlertDialog.Builder(context, R.style.AppTheme_AlertDialog);
errorDialog
.setTitle(R.string.auto_update)