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

Admob version update + checkout library instead of old billing

Browse Source
This commit is contained in:
serso
2015-01-24 23:22:04 +01:00
parent 9ab677af81
commit d5e5c9b6ac
42 changed files with 846 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android-app/src/main/res/layout/ad.xml
View File

@@ -22,7 +22,9 @@
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/ad_parent_view"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<org.solovyev.android.calculator.AdView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/ad"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:layout_gravity="center"
a:visibility="gone" />

33
android-app/src/main/res/layout/admob.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ 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
-->
<com.google.android.gms.ads.AdView xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:ads="http://schemas.android.com/apk/res-auto"
a:id="@+id/admob"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:layout_gravity="center"
ads:adSize="BANNER"
a:visibility="gone"
ads:adUnitId="@string/admob" />

31
android-app/src/main/res/xml/preferences.xml
View File

@@ -22,18 +22,33 @@
~ Site: http://se.solovyev.org
-->
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
a:key="screen-main">
<Preference
a:key="@string/p_calc_ad_free_key"
a:title="@string/c_calc_ad_free_title"
a:summary="@string/c_calc_ad_free_summary"
a:defaultValue="false"/>
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
a:key="@string/p_calc_ad_free_key"
a:title="@string/c_calc_ad_free_title"
a:summary="@string/c_calc_ad_free_summary"
a:defaultValue="false" />
<Preference
a:key="restart_wizard"
a:title="@string/cpp_restart_wizard"/>
a:title="@string/cpp_restart_wizard" />
<Preference
a:title="@string/c_prefs_calculations_category"
a:key="screen-calculations" />
<Preference
a:title="@string/c_prefs_appearance_category"
a:key="screen-appearance" />
<Preference
a:title="@string/prefs_graph_screen_title"
a:key="screen-plot" />
<Preference
a:title="@string/c_prefs_other_category"
a:key="screen-other" />
<Preference
a:title="@string/prefs_onscreen_title"
a:key="screen-onscreen" />
</PreferenceScreen>

6
android-app/src/main/res/xml/preferences_appearance.xml
View File

@@ -25,10 +25,6 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:range="http://schemas.android.com/apk/res-auto">
<PreferenceScreen a:title="@string/c_prefs_appearance_category">
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
<android.preference.CheckBoxPreference
a:key="@string/p_calc_color_display_key"
a:summary="@string/c_calc_color_display_summary"
@@ -124,6 +120,4 @@
a:title="@string/prefs_prevent_screen_from_fading_title"
a:summary="@string/prefs_prevent_screen_from_fading_summary"/>
</PreferenceScreen>
</PreferenceScreen>

6
android-app/src/main/res/xml/preferences_calculations.xml
View File

@@ -25,10 +25,6 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:range="http://schemas.android.com/apk/res-auto">
<PreferenceScreen a:title="@string/c_prefs_calculations_category">
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
<android.preference.CheckBoxPreference
a:key="@string/p_calc_round_result_key"
a:summary="@string/c_calc_round_result_summary"
@@ -100,6 +96,4 @@
a:title="@string/p_show_calculation_messages_dialog_title"
a:summary="@string/p_show_calculation_messages_dialog_summary"/>
</PreferenceScreen>
</PreferenceScreen>

8
android-app/src/main/res/xml/preferences_onscreen.xml
View File

@@ -24,11 +24,7 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<PreferenceScreen a:title="@string/prefs_onscreen_title">
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
<android.preference.CheckBoxPreference
<android.preference.CheckBoxPreference
a:key="onscreen_start_on_boot"
a:title="@string/prefs_onscreen_start_on_boot_title"
a:summary="@string/prefs_onscreen_start_on_boot_summary"/>
@@ -38,6 +34,4 @@
a:title="@string/prefs_onscreen_show_app_icon_title"
a:summary="@string/prefs_onscreen_show_app_icon_summary"/>
</PreferenceScreen>
</PreferenceScreen>

6
android-app/src/main/res/xml/preferences_other.xml
View File

@@ -24,10 +24,6 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<PreferenceScreen a:title="@string/c_prefs_other_category">
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
<android.preference.CheckBoxPreference
a:key="@string/p_calc_show_release_notes_key"
a:summary="@string/c_calc_show_release_notes_summary"
@@ -45,6 +41,4 @@
a:summary="@string/c_clear_billing_info_summary"
a:title="@string/c_clear_billing_info_title"/>
</PreferenceScreen>
</PreferenceScreen>

6
android-app/src/main/res/xml/preferences_plot.xml
View File

@@ -24,15 +24,9 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<PreferenceScreen a:title="@string/prefs_graph_screen_title">
<org.solovyev.android.ads.AdViewPreference a:layout="@layout/acl_adview_pref"/>
<android.preference.CheckBoxPreference
a:key="graph_plot_imag"
a:title="@string/cpp_prefs_graph_plot_imag_title"
a:summary="@string/cpp_prefs_graph_plot_imag_summary"/>
</PreferenceScreen>
</PreferenceScreen>