TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translations

Browse Source
This commit is contained in:
serso
2015-01-29 16:56:59 +01:00
parent 8f01f748de
commit ae97deaad0
44 changed files with 504 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android-app/src/main/java/org/solovyev/android/calculator/preferences/BasePreferencesActivity.java
View File

@@ -1,6 +1,7 @@
package org.solovyev.android.calculator.preferences;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.support.v7.widget.Toolbar;
@@ -65,6 +66,9 @@ public abstract class BasePreferencesActivity extends PreferenceActivity {
}
protected void onShowAd(boolean show) {
if(!supportsAds()) {
return;
}
if (show) {
if (adView != null) {
return;
@@ -82,6 +86,11 @@ public abstract class BasePreferencesActivity extends PreferenceActivity {
}
}
private boolean supportsAds() {
// on Android 2.3 the headers in the list view are not supported
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (checkout.onActivityResult(requestCode, resultCode, data)) {

9
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
View File

@@ -24,6 +24,9 @@ public class WizardActivity extends BaseActivity implements WizardsAware {
@Nonnull
private PagerAdapter pagerAdapter;
@Nonnull
private Wizards wizards = CalculatorApplication.getInstance().getWizards();
public WizardActivity() {
super(R.layout.cpp_activity_wizard);
}
@@ -77,7 +80,11 @@ public class WizardActivity extends BaseActivity implements WizardsAware {
@Nonnull
@Override
public Wizards getWizards() {
return CalculatorApplication.getInstance().getWizards();
return wizards;
}
public void setWizards(@Nonnull Wizards wizards) {
this.wizards = wizards;
}
public void finishWizardAbruptly() {

68
android-app/src/main/java/org/solovyev/android/wizard/FinishWizardConfirmationDialog.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* 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.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.wizard;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import org.solovyev.android.calculator.R;
import org.solovyev.android.sherlock.AndroidSherlockUtils;
import javax.annotation.Nonnull;
public class FinishWizardConfirmationDialog extends DialogFragment {
@Nonnull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
b.setMessage(R.string.acl_wizard_finish_confirmation);
b.setPositiveButton(R.string.acl_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
((Listener) getActivity()).finishWizardAbruptly();
}
});
b.setNegativeButton(R.string.acl_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dismiss();
}
});
return b.create();
}
public static <A extends FragmentActivity & Listener> void show(@Nonnull A activity) {
if (!(activity instanceof Listener)) {
throw new IllegalArgumentException("Activity should implement " + Listener.class);
}
AndroidSherlockUtils.showDialog(new FinishWizardConfirmationDialog(), FinishWizardConfirmationDialog.class.getSimpleName(), activity.getSupportFragmentManager());
}
public static interface Listener {
void finishWizardAbruptly();
}
}