Skip to content

Y
YGOMobile
Commit 19fd9dbb authored by fallenstardust's avatar fallenstardust
Browse files
Options

remove unused implements 

update es strings.conf
parent 9bdc325a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 429 deletions
libcore/src/main/java/cn/garymb/ygomobile/YGOMobileActivity.java
View file @ 19fd9dbb
......@@ -6,6 +6,8 @@
*/
package cn.garymb.ygomobile;
import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
......@@ -34,10 +36,6 @@ import cn.garymb.ygomobile.utils.FullScreenUtils;
import cn.garymb.ygomobile.utils.SignUtils;
import cn.garymb.ygomobile.widget.ComboBoxCompat;
import cn.garymb.ygomobile.widget.EditWindowCompat;
import cn.garymb.ygomobile.widget.overlay.OverlayOvalView;
import cn.garymb.ygomobile.widget.overlay.OverlayView;
import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
/**
* @author mabin
......@@ -46,8 +44,7 @@ public class YGOMobileActivity extends GameActivity implements
IrrlichtBridge.IrrlichtHost,
View.OnClickListener,
PopupWindow.OnDismissListener,
TextView.OnEditorActionListener,
OverlayOvalView.OnDuelOptionsSelectListener {
TextView.OnEditorActionListener {
private static final String TAG = YGOMobileActivity.class.getSimpleName();
private static final boolean DEBUG = false;
private static final int CHAIN_CONTROL_PANEL_X_POSITION_LEFT_EDGE = 205;
......@@ -317,34 +314,6 @@ public class YGOMobileActivity extends GameActivity implements
mGlobalComboBox.dismiss();
}
@Override
public void onDuelOptionsSelected(int mode, boolean action) {
switch (mode) {
case OverlayView.MODE_CANCEL_CHAIN_OPTIONS:
if (DEBUG)
Log.d(TAG, "Constants.MODE_CANCEL_CHAIN_OPTIONS: " + action);
IrrlichtBridge.cancelChain();
break;
case OverlayView.MODE_REFRESH_OPTION:
if (DEBUG)
Log.d(TAG, "Constants.MODE_REFRESH_OPTION: " + action);
IrrlichtBridge.refreshTexture();
break;
case OverlayView.MODE_REACT_CHAIN_OPTION:
if (DEBUG)
Log.d(TAG, "Constants.MODE_REACT_CHAIN_OPTION: " + action);
IrrlichtBridge.reactChain(action);
break;
case OverlayView.MODE_IGNORE_CHAIN_OPTION:
if (DEBUG)
Log.d(TAG, "Constants.MODE_IGNORE_CHAIN_OPTION: " + action);
IrrlichtBridge.ignoreChain(action);
break;
default:
break;
}
}
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
final String text = v.getText().toString();
......
libcore/src/main/java/cn/garymb/ygomobile/widget/overlay/OverlayOvalView.java deleted 100644 → 0
View file @ 9bdc325a
/*
Copyright 2011 jawsware international
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package cn.garymb.ygomobile.widget.overlay;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import cn.garymb.ygomobile.lib.R;
public class OverlayOvalView extends OverlayView implements View.OnClickListener {
/**
* @author mabin
*
*/
public interface OnDuelOptionsSelectListener {
void onDuelOptionsSelected(int mode, boolean action);
}
private TextView mInfo;
private OnDuelOptionsSelectListener mListener;
public OverlayOvalView(Context context) {
super(context, R.layout.overlay_oval);
}
@Override
protected void onInflateView() {
mInfo = this.findViewById(R.id.textview_info);
mInfo.setOnClickListener(this);
}
public void setDuelOpsListener(OnDuelOptionsSelectListener listener) {
mListener = listener;
}
@Override
public void onClick(View v) {
mListener.onDuelOptionsSelected(MODE_CANCEL_CHAIN_OPTIONS, true);
}
}
libcore/src/main/java/cn/garymb/ygomobile/widget/overlay/OverlayRectView.java deleted 100644 → 0
View file @ 9bdc325a
package cn.garymb.ygomobile.widget.overlay;
import android.content.Context;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ToggleButton;
import cn.garymb.ygomobile.lib.R;
import cn.garymb.ygomobile.widget.overlay.OverlayOvalView.OnDuelOptionsSelectListener;
public class OverlayRectView extends OverlayView implements OnCheckedChangeListener {
private ToggleButton mReactButton;
private ToggleButton mIgnoreButton;
private OnDuelOptionsSelectListener mListener;
public OverlayRectView(Context context) {
super(context, R.layout.overlay_rect);
}
@Override
protected void onInflateView() {
super.onInflateView();
mIgnoreButton= findViewById(R.id.overlay_ignore);
mIgnoreButton.setOnCheckedChangeListener(this);
mReactButton = findViewById(R.id.overlay_react);
mReactButton.setOnCheckedChangeListener(this);
}
public void setDuelOpsListener(OnDuelOptionsSelectListener listener) {
mListener = listener;
}
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (buttonView.equals(mIgnoreButton)) {
if (isChecked && mReactButton.isChecked()) {
mReactButton.setChecked(false);
mListener.onDuelOptionsSelected(MODE_REACT_CHAIN_OPTION, false);
}
mListener.onDuelOptionsSelected(MODE_IGNORE_CHAIN_OPTION, isChecked);
} else {
if (isChecked && mIgnoreButton.isChecked()) {
mIgnoreButton.setChecked(false);
mListener.onDuelOptionsSelected(MODE_IGNORE_CHAIN_OPTION, false);
}
mListener.onDuelOptionsSelected(MODE_REACT_CHAIN_OPTION, isChecked);
}
}
}
libcore/src/main/java/cn/garymb/ygomobile/widget/overlay/OverlayView.java deleted 100644 → 0
View file @ 9bdc325a
/*
Copyright 2011 jawsware international
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package cn.garymb.ygomobile.widget.overlay;
import android.content.Context;
import android.graphics.PixelFormat;
import android.os.Build;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.RelativeLayout;
public abstract class OverlayView extends RelativeLayout {
public static final int MODE_CANCEL_CHAIN_OPTIONS = 0;
public static final int MODE_REFRESH_OPTION = 1;
public static final int MODE_IGNORE_CHAIN_OPTION = 2;
public static final int MODE_REACT_CHAIN_OPTION = 3;
protected WindowManager.LayoutParams layoutParams;
private final int layoutResId;
private boolean mIsAdded = false;
public OverlayView(Context context, int layoutResId) {
super(context);
this.layoutResId = layoutResId;
this.setLongClickable(true);
this.setOnLongClickListener(new OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
return onTouchEvent_LongPress();
}
});
inflateView();
}
/*
* (non-Javadoc)
*
* @see android.view.View#getLayoutParams()
*/
@Override
public android.view.ViewGroup.LayoutParams getLayoutParams() {
// TODO Auto-generated method stub
return layoutParams;
}
private void setupLayoutParams(int x, int y) {
layoutParams = new WindowManager.LayoutParams(
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.WRAP_CONTENT,
Build.VERSION.SDK_INT>=19?
WindowManager.LayoutParams.TYPE_TOAST:WindowManager.LayoutParams.TYPE_PHONE,
WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT);
layoutParams.gravity = Gravity.LEFT | Gravity.BOTTOM;
layoutParams.y = y;
layoutParams.x = x;
onSetupLayoutParams();
}
protected void onSetupLayoutParams() {
// Override this to modify the initial LayoutParams. Be sure to call
// super.setupLayoutParams() first.
}
private void inflateView() {
// Inflates the layout resource, sets up the LayoutParams and adds the
// View to the WindowManager service.
LayoutInflater inflater = (LayoutInflater) getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(layoutResId, this);
onInflateView();
}
protected void onInflateView() {
// Override this to make calls to findViewById() to setup references to
// the views that were inflated.
// This is called automatically when the object is created right after
// the resource is inflated.
}
public boolean isVisible() {
// Override this method to control when the Overlay is visible without
// destroying it.
return true;
}
public void refreshLayout() {
// Call this to force the updating of the view's layout.
if (isVisible()) {
removeAllViews();
inflateView();
onSetupLayoutParams();
((WindowManager) getContext().getSystemService(
Context.WINDOW_SERVICE)).updateViewLayout(this,
layoutParams);
refresh();
}
}
protected void addView(int x, int y) {
setupLayoutParams(x, y);
((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE))
.addView(this, layoutParams);
super.setVisibility(View.GONE);
}
public void showAtScreen(int x, int y) {
if (!mIsAdded) {
addView(x, y);
refresh();
mIsAdded = true;
}
}
public void removeFromScreen() {
if (mIsAdded) {
((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE))
.removeView(this);
mIsAdded = false;
}
}
public void refresh() {
// Call this to update the contents of the Overlay.
if (!isVisible()) {
setVisibility(View.GONE);
} else {
setVisibility(View.VISIBLE);
refreshViews();
}
}
protected void refreshViews() {
// Override this method to refresh the views inside of the Overlay. Only
// called when Overlay is visible.
}
protected boolean showNotificationHidden() {
// Override this to configure the notification to remain even when the
// overlay is invisible.
return true;
}
protected boolean onVisibilityToChange(int visibility) {
// Catch changes to the Overlay's visibility in order to animate
return true;
}
protected View animationView() {
return this;
}
public void hide() {
// Set visibility, but bypass onVisibilityToChange()
super.setVisibility(View.GONE);
}
public void show() {
// Set visibility, but bypass onVisibilityToChange()
super.setVisibility(View.VISIBLE);
}
@Override
public void setVisibility(int visibility) {
if (getVisibility() != visibility) {
if (onVisibilityToChange(visibility)) {
super.setVisibility(visibility);
}
}
}
protected int getLeftOnScreen() {
int[] location = new int[2];
getLocationOnScreen(location);
return location[0];
}
protected int getTopOnScreen() {
int[] location = new int[2];
getLocationOnScreen(location);
return location[1];
}
protected boolean isInside(View view, int x, int y) {
// Use this to test if the X, Y coordinates of the MotionEvent are
// inside of the View specified.
int[] location = new int[2];
view.getLocationOnScreen(location);
if (x >= location[0]) {
if (x <= location[0] + view.getWidth()) {
if (y >= location[1]) {
return y <= location[1] + view.getHeight();
}
}
}
return false;
}
protected void onTouchEvent_Up(MotionEvent event) {
}
protected void onTouchEvent_Move(MotionEvent event) {
}
protected void onTouchEvent_Press(MotionEvent event) {
}
protected void onTouchEvent_Cancel(MotionEvent event) {
}
public boolean onTouchEvent_LongPress() {
return false;
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
onTouchEvent_Press(event);
} else if (event.getActionMasked() == MotionEvent.ACTION_UP) {
onTouchEvent_Up(event);
} else if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
onTouchEvent_Move(event);
} else if (event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
onTouchEvent_Cancel(event);
}
return super.onTouchEvent(event);
}
}
mobile/assets/es/data/conf/strings.conf
View file @ 19fd9dbb
......@@ -1209,4 +1209,4 @@
!setname 0x1aa Dragón Tenpai
!setname 0x1ab Raika
!setname 0x1ac Salamandra
!setname 0x1ad Ashened
\ No newline at end of file
!setname 0x1ad Calcinado
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment