From 20b408dc5c9c6f97449463682f092503ae4488cb Mon Sep 17 00:00:00 2001 From: serso Date: Fri, 30 Jan 2015 23:02:44 +0100 Subject: [PATCH] Final wizard step --- .../calculator/wizard/FinalWizardStep.java | 48 ------------------ .../main/res/drawable-hdpi/ic_action_done.png | Bin 0 -> 1269 bytes .../main/res/drawable-mdpi/ic_action_done.png | Bin 0 -> 766 bytes .../res/drawable-xhdpi/ic_action_done.png | Bin 0 -> 2073 bytes .../res/drawable-xxhdpi/ic_action_done.png | Bin 0 -> 3324 bytes .../main/res/layout/cpp_wizard_step_final.xml | 40 +++++---------- .../src/main/res/values-ru/text_wizard.xml | 1 + .../src/main/res/values/text_wizard.xml | 1 + 8 files changed, 14 insertions(+), 76 deletions(-) create mode 100644 android-app/src/main/res/drawable-hdpi/ic_action_done.png create mode 100644 android-app/src/main/res/drawable-mdpi/ic_action_done.png create mode 100644 android-app/src/main/res/drawable-xhdpi/ic_action_done.png create mode 100644 android-app/src/main/res/drawable-xxhdpi/ic_action_done.png diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/FinalWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/FinalWizardStep.java index 76aa5e9f..c9458a49 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/FinalWizardStep.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/FinalWizardStep.java @@ -1,59 +1,11 @@ package org.solovyev.android.calculator.wizard; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; import org.solovyev.android.calculator.R; -import org.solovyev.android.calculator.preferences.PurchaseDialogActivity; - -import static android.content.Intent.ACTION_VIEW; public class FinalWizardStep extends WizardFragment { - private static final String GITHUB_URL = "https://github.com/serso/android-calculatorpp"; - private static final String CROWDIN_URL = "http://crowdin.net/project/calculatorpp"; - - private Button donateButton; - private Button translateButton; - private Button contributeButton; - @Override protected int getViewResId() { return R.layout.cpp_wizard_step_final; } - - @Override - public void onViewCreated(View root, Bundle savedInstanceState) { - super.onViewCreated(root, savedInstanceState); - - donateButton = (Button) root.findViewById(R.id.cpp_wizard_final_donate_button); - donateButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivity(new Intent(getActivity(), PurchaseDialogActivity.class)); - } - }); - - translateButton = (Button) root.findViewById(R.id.cpp_wizard_final_translate_button); - translateButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showUrl(CROWDIN_URL); - } - }); - - contributeButton = (Button) root.findViewById(R.id.cpp_wizard_final_contribute_button); - contributeButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showUrl(GITHUB_URL); - } - }); - } - - private void showUrl(String url) { - startActivity(new Intent(ACTION_VIEW, Uri.parse(url))); - } } diff --git a/android-app/src/main/res/drawable-hdpi/ic_action_done.png b/android-app/src/main/res/drawable-hdpi/ic_action_done.png new file mode 100644 index 0000000000000000000000000000000000000000..27506bcb185fdc7b81b5636ac49338740dddb0fa GIT binary patch literal 1269 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$farfn|@Ui(^Pd+}k_8dBTn&M?OaA z>=gaZz}aZQ5_woMfth>VanT7c1^a}gkH36ZWgNTyx%|o9m2aP~k{52Tk$Lw+fl;xs z+2FJW=N(24mLMjENsp2x93&7n|pU9Bt;Kkq&RKvr}!Au9Ej`7I%A9wy~(O3EHb2{q; zXKr3=or+UW@1J^H?pSi)VArXo3{k4rO8IJ=o?m_`xv$TSWkKmKKKrj+^V*+Fba6O5 z3_UJi!F;~Jg`w-c^_L@DHqL^K8e87oI4t#n$C+ipjdO?nULP=K5o|c5)o<-_V6)D~ zm$S1Nj((LZ3R1H<&CM3z@z$_C?e&pKy*WLPoN`SyV~6%1FNEqwXP_5ovnaObb??@jCuU)5HvzauQi5W0EA?t=UZ zhLGorUae|+9=h{`d*zDNy+YC92Mu3w=tF+ z+FYZ$xyJI(YMXnz6`9We|8J+u5c{C=#w9Mnigowzv@>fRt$<u&*_|~Rs9>}IxI^P-KzCby!ExoDSg<8s-4Rt0vK z2QLpNGiRtMefaWtBa;b}V1b46U zfDSug%({R9NFOogRbUjXV6h2ieC5C*CwRW3K?>*)hVxSzw170n`7I533QYbA^Hws( z0>dJ~<}!0t(~Hud$)Vr1pKSlF99*ZL^L?!(D}%yfBcpXp3wqW{zU3K4>_6fM_a0l| UWGmDTEY27_UHx3vIVCg!03TitOaK4? literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/drawable-mdpi/ic_action_done.png b/android-app/src/main/res/drawable-mdpi/ic_action_done.png new file mode 100644 index 0000000000000000000000000000000000000000..21aff36107c2e001c17ab1483732dda2a42c95bf GIT binary patch literal 766 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^?pQ;uum9_jdL{-@^_9u7*PH zvlcK&J?NUSqQTglr77w`(~AZni^3;P{34AS2hMm&Yi^pf#(d^Y`+0vo>=g3<%>Dl7 zZSPzj_dm@-5({4P*e_!E;OM|8!l1^`m(Hxg;KLwuo-Kf327|>s-USQ>j0HB*4vYy* z4=T(Wm=3TU_?W}M+Q8ZH_$C7vgD}JK%{VnSI{mTed#PY6-S+T!lK;&H*%0GD>5@g- zr?-0ixHQdyF}h>j!TM9q|8!IW4zMvwKUnX!(tANeXM^kqU!cgW2FVZMi|wCQ6|5|@ zUC`jOk?G&|Jx{z?{sc9!G2Ue3s=M{~opeLX{k;q(f7Y>9G~8dyp#NdF$OF#0a;7~8 z-+MK<|G3NXfonfEX^Ws=iYwJbdxF0SB^m$LYM^n>+&FSUe}4r~`F(31W;;pw6R zMq3Xjksq&^F0rxpt!(l5;L8%>)xmb(r=hi_TLv++B{o%=mT5;KM?uZ#hmHKMEM93LQFFu9&c_Wx|KM92y=R-1nz8=n6R}-b zdg$^m{I}_&JC&8M3n!dsTxvdZ`HJIF_N=;36|e6WX<)fzHJd3)c>a?>BBPzS^zxtG Ys3^Q(Li_eTz;w;v>FVdQ&MBb@0Iixkvj6}9 literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/drawable-xhdpi/ic_action_done.png b/android-app/src/main/res/drawable-xhdpi/ic_action_done.png new file mode 100644 index 0000000000000000000000000000000000000000..7918ce7b0f1039244b2ba3df504d7fa16f0e7d18 GIT binary patch literal 2073 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 - + + - - - - - -