v2.3.3 released: improve UI, add AD unit on main page.

ccjeng · Feb 24, 2016 · 0b05c69 · 0b05c69
1 parent 64e5b7f
commit 0b05c69
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,7 @@ proguard/
 
 # Log Files
 *.log
+
+# Constant File
+Constant.java
+
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.oddsoft.buddhavoice2"
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 24
-        versionName '2.3.2.012316BV'
+        versionCode 25
+        versionName '2.3.3.022416BV'
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/BuddhaVoice.java b/app/src/main/java/com/oddsoft/buddhavoice2/BuddhaVoice.java
@@ -19,7 +19,6 @@ public class BuddhaVoice extends Application {
 
     // Debugging tag for the application
     public static final String APPTAG = "BuddhaVoice";
-    public static final String ADMob_TestDeviceID = "DF9E888CAA233DE54A7FD15B3B1A1522";
 
     public BuddhaVoice() {
     }

diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java
@@ -19,7 +19,11 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.LinearLayout;
 
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdSize;
+import com.google.android.gms.ads.AdView;
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
@@ -28,6 +32,7 @@
 import com.oddsoft.buddhavoice2.R;
 import com.oddsoft.buddhavoice2.utils.Analytics;
 import com.oddsoft.buddhavoice2.BuddhaVoice;
+import com.oddsoft.buddhavoice2.utils.Constant;
 
 import java.util.Locale;
 
@@ -50,6 +55,7 @@ public class MainActivity extends AppCompatActivity {
     @Bind(R.id.pager)
     ViewPager pager;
 
+    private AdView adView;
     private Analytics ga;
 
     @Bind(R.id.toolbar)
@@ -74,7 +80,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         pager.setAdapter(new ViewPagerAdapter(getSupportFragmentManager()));
         tabs.setupWithViewPager(pager);
-
+        ADView();
     }
 
     private void getPrefs() {
@@ -242,4 +248,30 @@ public Fragment getItem(int position) {
 
     }
 
+    private void ADView() {
+
+        LinearLayout adBannerLayout = (LinearLayout) findViewById(R.id.footerLayout);
+
+        adView = new AdView(this);
+        adView.setAdUnitId(Constant.ADMob_BuddhaVoiceMain);
+        adView.setAdSize(AdSize.SMART_BANNER);
+        adBannerLayout.addView(adView);
+
+        AdRequest adRequest;
+
+        if (BuddhaVoice.APPDEBUG) {
+            //Test Mode
+            adRequest = new AdRequest.Builder()
+                    .addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
+                    .addTestDevice(Constant.ADMob_TestDeviceID)
+                    .build();
+        } else {
+
+            adRequest = new AdRequest.Builder().build();
+
+        }
+        adView.loadAd(adRequest);
+
+    }
+
 }
diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java
@@ -23,16 +23,19 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.AdSize;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.oddsoft.buddhavoice2.R;
 import com.oddsoft.buddhavoice2.utils.Analytics;
 import com.oddsoft.buddhavoice2.BuddhaVoice;
+import com.oddsoft.buddhavoice2.utils.Constant;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import butterknife.Bind;
@@ -381,20 +384,29 @@ private void goIntent() {
     }
 
     private void ADView() {
-        adView = (AdView) findViewById(R.id.adView);
+
+        LinearLayout adBannerLayout = (LinearLayout) findViewById(R.id.footerLayout);
+
+        adView = new AdView(this);
+        adView.setAdUnitId(Constant.ADMob_BuddhaVoice);
+        adView.setAdSize(AdSize.SMART_BANNER);
+        adBannerLayout.addView(adView);
 
         AdRequest adRequest;
 
         if (BuddhaVoice.APPDEBUG) {
+            //Test Mode
             adRequest = new AdRequest.Builder()
-                    .addTestDevice(AdRequest.DEVICE_ID_EMULATOR)       // 仿真器
-                    .addTestDevice(BuddhaVoice.ADMob_TestDeviceID) // 我的 Galaxy Nexus 測試手機
+                    .addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
+                    .addTestDevice(Constant.ADMob_TestDeviceID)
                     .build();
         } else {
+
             adRequest = new AdRequest.Builder().build();
-        }
 
+        }
         adView.loadAd(adRequest);
+
     }
 
     private boolean isNetworkAvailable() {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,12 +7,13 @@
     android:layout_height="match_parent"
     tools:context=".view.MainActivity">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <android.support.design.widget.AppBarLayout
+            android:id="@+id/toolbarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:theme="@style/AppTheme.AppBarOverlay">
@@ -22,7 +23,6 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 />
-
             <android.support.design.widget.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
@@ -37,9 +37,20 @@
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_above="@+id/footerLayout"
+            android:layout_below="@+id/toolbarLayout"
             android:background="@android:color/white" />
 
-    </LinearLayout>
+        <!-- Footer aligned to bottom -->
+        <LinearLayout
+            android:id="@+id/footerLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:orientation="horizontal"
+            android:gravity="bottom"/>
+    </RelativeLayout>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation"

diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:gravity="start|center"
@@ -12,18 +13,14 @@
         android:focusable="true"
         android:clickable="true"
         android:foreground="?android:attr/selectableItemBackground"
-        android:id="@+id/cv">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+        card_view:cardCornerRadius="2dp"
+        card_view:cardElevation="2dp">
             <TextView
                 android:id="@+id/row"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:padding="5dp"
+                android:background="@android:color/white"
                 android:textAppearance="?android:attr/textAppearanceLarge"/>
-        </RelativeLayout>
     </android.support.v7.widget.CardView>
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/listener.xml b/app/src/main/res/layout/listener.xml
@@ -77,15 +77,7 @@
             android:layout_centerHorizontal="true"
             android:gravity="bottom"
             android:orientation="horizontal"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <com.google.android.gms.ads.AdView
-                android:id="@+id/adView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                ads:adSize="SMART_BANNER"
-                ads:adUnitId="ca-app-pub-6914084100751028/3615464018" />
-        </LinearLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
     </RelativeLayout>
 
 </android.support.design.widget.CoordinatorLayout>