Remove iconics & materialish-progress library

app/build.gradle

@@ -26,25 +26,25 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
-    compile 'com.google.android.gms:play-services-analytics:9.4.0'
-    compile 'com.google.firebase:firebase-core:9.4.0'
-    compile 'com.google.firebase:firebase-ads:9.4.0'
-    compile 'com.google.firebase:firebase-crash:9.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.google.android.gms:play-services-analytics:9.6.1'
+    compile 'com.google.firebase:firebase-core:9.6.1'
+    compile 'com.google.firebase:firebase-ads:9.6.1'
+    compile 'com.google.firebase:firebase-crash:9.6.1'
     compile('com.mikepenz:aboutlibraries:5.7.1@aar') {
         transitive = true
     }
-    compile('com.mopub:mopub-sdk:4.8.0@aar') {
+    compile('com.mopub:mopub-sdk:4.9.0@aar') {
         transitive = true
     }
-    compile 'com.facebook.android:audience-network-sdk:4.14.1'
+    compile 'com.facebook.android:audience-network-sdk:4.15.0'
     compile files('src/main/libs/libAdapterSDKMoPub.jar')
     compile files('src/main/libs/FacebookAdapter.jar')
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.mikepenz:iconics-core:2.7.1@aar'
-    compile 'com.mikepenz:google-material-typeface:2.2.0.2.original@aar'
-    compile 'com.pnikosis:materialish-progress:1.5'
+   // compile 'com.mikepenz:iconics-core:2.7.1@aar'
+   // compile 'com.mikepenz:google-material-typeface:2.2.0.2.original@aar'
+   // compile 'com.pnikosis:materialish-progress:1.5'
     compile 'me.majiajie:swipe-back:1.0.0-alpha2'
 }
 

app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java

@@ -1,7 +1,6 @@
 package com.oddsoft.buddhavoice2.view;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.TabLayout;
@@ -22,8 +21,6 @@
 import com.google.android.gms.ads.AdView;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
-import com.mikepenz.google_material_typeface_library.GoogleMaterial;
-import com.mikepenz.iconics.IconicsDrawable;
 import com.oddsoft.buddhavoice2.BuddhaVoice;
 import com.oddsoft.buddhavoice2.R;
 import com.oddsoft.buddhavoice2.utils.Analytics;
@@ -33,7 +30,6 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 
-
 public class MainActivity extends BaseActivity {
     private static final String TAG = "BuddhaVoice";
 
@@ -114,18 +110,6 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
             }
         });
 
-        //change navigation drawer item icons
-        navigation.getMenu().findItem(R.id.navSetting).setIcon(new IconicsDrawable(this)
-                .icon(GoogleMaterial.Icon.gmd_settings)
-                .color(Color.GRAY)
-                .sizeDp(24));
-
-        navigation.getMenu().findItem(R.id.navAbout).setIcon(new IconicsDrawable(this)
-                .icon(GoogleMaterial.Icon.gmd_info)
-                .color(Color.GRAY)
-                .sizeDp(24));
-
-
         actionBarDrawerToggle = new ActionBarDrawerToggle(this,drawerLayout,toolbar
                 ,R.string.app_name, R.string.app_name){
 

app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java

@@ -8,8 +8,6 @@
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-import com.mikepenz.google_material_typeface_library.GoogleMaterial;
-import com.mikepenz.iconics.IconicsDrawable;
 import com.oddsoft.buddhavoice2.R;
 
 import butterknife.Bind;
@@ -30,11 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (getSupportActionBar() != null) {
 			getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		}
-		toolbar.setNavigationIcon(new IconicsDrawable(this)
-				.icon(GoogleMaterial.Icon.gmd_arrow_back)
-				.color(Color.WHITE)
-				.actionBar());
 
+		toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_white_24px);
 		toolbar.setTitleTextColor(Color.WHITE);
 
 		FragmentManager manager = getFragmentManager();

app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java

@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.ConnectivityManager;
@@ -17,19 +16,17 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 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.mikepenz.google_material_typeface_library.GoogleMaterial;
-import com.mikepenz.iconics.IconicsDrawable;
 import com.oddsoft.buddhavoice2.BuddhaVoice;
 import com.oddsoft.buddhavoice2.R;
 import com.oddsoft.buddhavoice2.utils.Analytics;
 import com.oddsoft.buddhavoice2.utils.Constant;
 import com.oddsoft.buddhavoice2.view.base.BaseActivity;
-import com.pnikosis.materialishprogress.ProgressWheel;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -60,7 +57,7 @@ public class VoiceListener extends BaseActivity {
     Toolbar toolbar;
 
     @Bind(R.id.progress_wheel)
-    ProgressWheel progressWheel;
+    ProgressBar progressWheel;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -142,13 +139,6 @@ public boolean onMenuItemClick(MenuItem menuItem) {
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_listener, menu);
-
-        MenuItem menuItem1 = menu.findItem(R.id.stop_button);
-        menuItem1.setIcon(new IconicsDrawable(this, GoogleMaterial.Icon.gmd_stop).actionBar().color(Color.WHITE));
-
-        MenuItem menuItem2 = menu.findItem(R.id.pause_button);
-        menuItem2.setIcon(new IconicsDrawable(this, GoogleMaterial.Icon.gmd_pause).actionBar().color(Color.WHITE));
-
         return true;
     }
 

app/src/main/res/drawable/ic_cog_wheel_silhouette.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="438.529"
+    android:viewportWidth="438.529" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M436.3,181.4c-1.5,-2 -3.5,-3.2 -6,-3.6l-52.2,-8c-2.9,-9.1 -6.8,-18.5 -11.7,-28c3.4,-4.8 8.6,-11.5 15.4,-20.1c6.9,-8.7 11.7,-15 14.6,-19c1.5,-2.1 2.3,-4.3 2.3,-6.6c0,-2.7 -0.7,-4.8 -2,-6.3c-6.8,-9.7 -22.6,-25.9 -47.1,-48.5c-2.3,-1.9 -4.7,-2.9 -7.1,-2.9c-2.9,0 -5.1,0.9 -6.9,2.6l-40.5,30.5c-7.8,-4 -16.4,-7.5 -25.7,-10.6l-8,-52.5c-0.2,-2.5 -1.3,-4.5 -3.3,-6.1C255.9,0.8 253.6,0 251,0h-63.4c-5.5,0 -8.9,2.7 -10.3,8c-2.5,9.5 -5.2,27.2 -8.3,53.1c-8.9,2.9 -17.6,6.5 -26,10.9l-39.4,-30.5c-2.5,-1.9 -4.9,-2.9 -7.4,-2.9c-4.2,0 -13.2,6.8 -27,20.4c-13.8,13.6 -23.2,23.8 -28.1,30.7c-1.7,2.5 -2.6,4.7 -2.6,6.6c0,2.3 0.9,4.6 2.9,6.9c12.8,15.4 22.9,28.5 30.5,39.4c-4.8,8.8 -8.5,17.5 -11.1,26.3l-53.1,8c-2.1,0.4 -3.9,1.6 -5.4,3.7C0.8,182.5 0,184.7 0,187v63.4c0,2.5 0.8,4.7 2.3,6.7c1.5,2 3.5,3.2 6,3.6l52.3,7.7c2.7,9.3 6.6,18.7 11.7,28.3c-3.4,4.8 -8.6,11.5 -15.4,20.1c-6.9,8.7 -11.7,15 -14.6,19c-1.5,2.1 -2.3,4.3 -2.3,6.6c0,2.5 0.7,4.7 2,6.6c7.4,10.3 23.1,26.3 47.1,48c2.1,2.1 4.5,3.1 7.1,3.1c2.9,0 5.2,-0.9 7.1,-2.6l40.3,-30.6c7.8,4 16.4,7.5 25.7,10.6l8,52.5c0.2,2.5 1.3,4.5 3.3,6.1c2,1.6 4.3,2.4 7,2.4h63.4c5.5,0 9,-2.7 10.3,-8c2.5,-9.5 5.2,-27.2 8.3,-53.1c8.9,-2.9 17.6,-6.5 26,-10.9l39.4,30.8c2.7,1.7 5.1,2.6 7.4,2.6c4.2,0 13.1,-6.8 26.8,-20.3c13.7,-13.5 23.1,-23.8 28.3,-30.8c1.7,-1.9 2.6,-4.1 2.6,-6.6c0,-2.5 -0.9,-4.9 -2.9,-7.1c-13.7,-16.8 -23.9,-29.9 -30.5,-39.4c3.8,-7 7.5,-15.7 11.1,-26l52.8,-8c2.3,-0.4 4.2,-1.6 5.7,-3.7c1.5,-2.1 2.3,-4.3 2.3,-6.6v-63.4C438.5,185.7 437.8,183.4 436.3,181.4zM270.9,270.9c-14.3,14.3 -31.5,21.4 -51.7,21.4c-20.2,0 -37.4,-7.1 -51.7,-21.4c-14.3,-14.3 -21.4,-31.5 -21.4,-51.7c0,-20.2 7.1,-37.4 21.4,-51.7c14.3,-14.3 31.5,-21.4 51.7,-21.4c20.2,0 37.4,7.1 51.7,21.4c14.3,14.3 21.4,31.5 21.4,51.7C292.4,239.4 285.2,256.7 270.9,270.9z"/>
+</vector>

app/src/main/res/drawable/ic_exclamation_sign.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="438.533"
+    android:viewportWidth="438.533" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M409.1,109.2c-19.6,-33.6 -46.2,-60.2 -79.8,-79.8C295.7,9.8 259.1,0 219.3,0c-39.8,0 -76.5,9.8 -110.1,29.4c-33.6,19.6 -60.2,46.2 -79.8,79.8C9.8,142.8 0,179.5 0,219.3s9.8,76.5 29.4,110.1c19.6,33.6 46.2,60.2 79.8,79.8c33.6,19.6 70.3,29.4 110.1,29.4s76.5,-9.8 110.1,-29.4c33.6,-19.6 60.2,-46.2 79.8,-79.8c19.6,-33.6 29.4,-70.3 29.4,-110.1C438.5,179.5 428.7,142.8 409.1,109.2zM255.8,356c0,2.7 -0.9,4.9 -2.6,6.7s-3.8,2.7 -6.3,2.7h-54.8c-2.5,0 -4.7,-1 -6.6,-2.9c-1.9,-1.9 -2.9,-4.1 -2.9,-6.6V301.8c0,-2.5 0.9,-4.7 2.9,-6.6c1.9,-1.9 4.1,-2.9 6.6,-2.9h54.8c2.5,0 4.6,0.9 6.3,2.7c1.7,1.8 2.6,4 2.6,6.7V356zM255.2,257.8c-0.2,1.9 -1.2,3.6 -3,5c-1.8,1.4 -4,2.1 -6.7,2.1h-52.8c-2.7,0 -4.9,-0.7 -6.9,-2.1c-1.9,-1.4 -2.9,-3.1 -2.9,-5L178.2,80.5c0,-2.3 0.9,-4 2.9,-5.1c1.9,-1.5 4.2,-2.3 6.9,-2.3h62.8c2.7,0 4.9,0.8 6.9,2.3c1.9,1.1 2.8,2.9 2.8,5.1L255.2,257.8z"/>
+</vector>

app/src/main/res/drawable/ic_keyboard_backspace_white_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M21,11H6.83l3.58,-3.59L9,6l-6,6 6,6 1.41,-1.41L6.83,13H21z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_pause_white_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_stop_white_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M6,6h12v12H6z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/layout/listener.xml

@@ -26,6 +26,7 @@
                 app:layout_scrollFlags="scroll|enterAlways"/>
         </android.support.design.widget.AppBarLayout>
 
+        <!--
         <com.pnikosis.materialishprogress.ProgressWheel
             android:id="@+id/progress_wheel"
             android:layout_width="80dp"
@@ -36,6 +37,18 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             wheel:matProg_barColor="@color/color_progress"
             wheel:matProg_progressIndeterminate="true" />
+-->
+        <ProgressBar
+            android:id="@+id/progress_wheel"
+            android:layout_gravity="center_horizontal|center_vertical"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_centerInParent="true"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:visibility="gone"/>
+
 
         <android.support.v4.widget.NestedScrollView
             android:id="@+id/main"

app/src/main/res/menu/menu_listener.xml

@@ -7,12 +7,14 @@
         android:id="@+id/stop_button"
         android:orderInCategory="100"
         android:title="@string/stop_title"
-        app:showAsAction="ifRoom"/>
+        android:icon="@drawable/ic_stop_white_24px"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/pause_button"
         android:orderInCategory="100"
         android:title="@string/pause_title"
+        android:icon="@drawable/ic_pause_white_24px"
         app:showAsAction="ifRoom"/>
 
 </menu>

app/src/main/res/menu/nav_drawer_items.xml

@@ -3,9 +3,11 @@
     <group android:checkableBehavior="all">
         <item
             android:id="@+id/navSetting"
-            android:title="@string/preference"/>
+            android:title="@string/preference"
+            android:icon="@drawable/ic_cog_wheel_silhouette"/>
         <item
             android:id="@+id/navAbout"
-            android:title="@string/about_title"/>
+            android:title="@string/about_title"
+            android:icon="@drawable/ic_exclamation_sign"/>
     </group>
 </menu>

app/src/main/res/values/colors.xml

@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- 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.
- -->
 <resources>
     <color name="colorPrimary">@color/md_blue_500</color>
     <color name="colorPrimaryDark">@color/md_blue_700</color>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Oct 03 19:36:16 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip