Fixed some bugs in Ads. Version 1.1.1

xlogix · Apr 9, 2017 · 2babb0e · 2babb0e
1 parent 52a6385
commit 2babb0e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 39 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "com.instify.android"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 7
-        versionName "1.1.0"
+        versionCode 8
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -57,55 +57,52 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     // for App Invites and Dynamic Links
-    compile 'com.google.firebase:firebase-appindexing:10.2.0'
-    compile 'com.google.firebase:firebase-invites:10.2.0'
+    compile 'com.google.firebase:firebase-appindexing:10.2.1'
+    compile 'com.google.firebase:firebase-invites:10.2.1'
     // for cloud messaging i.e sending notifications
-    compile 'com.google.firebase:firebase-messaging:10.2.0'
+    compile 'com.google.firebase:firebase-messaging:10.2.1'
 
     // ADS
-    compile 'com.google.firebase:firebase-ads:10.2.0'
+    compile 'com.google.firebase:firebase-ads:10.2.1'
 
     // AUTH
-    compile 'com.google.firebase:firebase-auth:10.2.0'
-    compile 'com.google.android.gms:play-services-auth:10.2.0'
+    compile 'com.google.firebase:firebase-auth:10.2.1'
+    compile 'com.google.android.gms:play-services-auth:10.2.1'
 
     // DATABASE
-    compile 'com.google.firebase:firebase-database:10.2.0'
+    compile 'com.google.firebase:firebase-database:10.2.1'
     compile 'com.firebaseui:firebase-ui-database:1.2.0'
 
     // CRASH (ONLY FOR RELEASE)
-    releaseCompile 'com.google.firebase:firebase-crash:10.2.0'
+    releaseCompile 'com.google.firebase:firebase-crash:10.2.1'
 
     // IMAGE AND LOADING
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.android.volley:volley:1.0.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'pub.devrel:easypermissions:0.3.0'
+    compile 'pub.devrel:easypermissions:0.3.1'
 
     // WEB VIEW
     compile 'com.thefinestartist:finestwebview:1.2.7'
 
     // LOGGING
     compile 'com.jakewharton.timber:timber:4.5.1'
-    compile 'com.google.firebase:firebase-core:10.2.0'
-    compile 'com.google.firebase:firebase-config:10.2.0'
+    compile 'com.google.firebase:firebase-core:10.2.1'
+    compile 'com.google.firebase:firebase-config:10.2.1'
 
     // SERVICE
     compile 'net.gotev:uploadservice:3.2.3'
 
     // STORAGE FIREBASE
-    compile 'com.google.firebase:firebase-storage:10.2.0'
+    compile 'com.google.firebase:firebase-storage:10.2.1'
 
     // SUPPORTING LIBRARIES
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:palette-v7:25.3.0'
-    compile 'com.android.support:customtabs:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:support-v4:25.3.0'
-    compile 'com.android.support:support-v13:25.3.0'
-    compile 'com.android.support:recyclerview-v7:25.3.0'
-    compile 'com.android.support:cardview-v7:25.3.0'
-    compile 'com.android.support:support-vector-drawable:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:support-vector-drawable:25.3.1'
 
     // UI
     compile 'com.github.paolorotolo:appintro:4.1.0'
@@ -120,7 +117,7 @@ dependencies {
 
     // TESTING
     androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support:support-annotations:25.3.0'
+    androidTestCompile 'com.android.support:support-annotations:25.3.1'
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })

diff --git a/app/src/main/java/com/instify/android/ux/MainActivity.java b/app/src/main/java/com/instify/android/ux/MainActivity.java
@@ -108,12 +108,13 @@ public void onBackPressed() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
+
         } else if (doubleBackToExitPressedOnce) {
             super.onBackPressed();
+
         } else {
             this.doubleBackToExitPressedOnce = true;
             Toast.makeText(this, "Press again to exit", Toast.LENGTH_SHORT).show();
-
             new Handler().postDelayed(new Runnable() {
 
                 @Override
@@ -142,7 +143,6 @@ protected void onResume() {
         super.onResume();
         // Ensures that user didn't un-install Google Play Services required for Firebase related tasks.
         checkPlayServices();
-
         // Checks if the device is connected to the internet
         if (isDeviceOnline()) {
             Timber.d(TAG, "Device is online.");
@@ -158,7 +158,6 @@ protected void onResume() {
     public void onDestroy() {
         super.onDestroy();
     }
-    // [END add_lifecycle_methods]
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -340,7 +339,7 @@ public void onCancelled(DatabaseError databaseError) {
     // [START request_new_interstitial]
     private void requestNewInterstitial() {
         AdRequest adRequest = new AdRequest.Builder()
-                .addTestDevice("11408151BC4116DE6AD4B6BFC1B34457")
+                //.addTestDevice("11408151BC4116DE6AD4B6BFC1B34457")
                 .build();
 
         mInterstitialAd.loadAd(adRequest);

diff --git a/app/src/main/java/com/instify/android/ux/NotesUploadActivity.java b/app/src/main/java/com/instify/android/ux/NotesUploadActivity.java
@@ -19,7 +19,6 @@
 
 import com.instify.android.R;
 import com.instify.android.app.AppConfig;
-import com.instify.android.helpers.NotesFilePathHelper;
 import com.instify.android.helpers.SQLiteHandler;
 
 import net.gotev.uploadservice.MultipartUploadRequest;

diff --git a/app/src/main/java/com/instify/android/ux/adapters/NotesAdapter.java b/app/src/main/java/com/instify/android/ux/adapters/NotesAdapter.java
@@ -25,7 +25,7 @@ public class NotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     private Context context;
     private LayoutInflater inflater;
-    List<NotesModel> data = Collections.emptyList();
+    private List<NotesModel> data = Collections.emptyList();
 
     // create constructor to initialize context and data sent from MainActivity
     public NotesAdapter(Context context, List<NotesModel> data) {
@@ -71,10 +71,7 @@ public int getItemCount() {
     class MyHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
         TextView textFishName;
-        TextView textSize;
         TextView textType;
-        TextView textPrice;
-        NetworkImageView imageView;
 
         // create constructor to get widget reference
         public MyHolder(View itemView) {

diff --git a/app/src/main/res/layout/activity_post_notes.xml b/app/src/main/res/layout/activity_post_notes.xml
@@ -18,7 +18,8 @@
             android:id="@+id/textView5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="*please note that the file you are posting will be visible to your class people with your name. so please don't post inappropriate content in this section." />
+            android:text="Please note that the file you are posting will be visible to your class with your name. So, please don't post inappropriate content in this section."
+            android:textSize="16sp" />
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -21,17 +21,17 @@
                 <item
                     android:id="@+id/filter_by_class"
                     android:checked="false"
-                    android:title="Filter By Class"
+                    android:title="Filter by Class"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/filter_by_department"
                     android:checked="false"
-                    android:title="Filter By Department"
+                    android:title="Filter by Department"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/filter_by_university"
                     android:checked="false"
-                    android:title="All"
+                    android:title="Filter by University"
                     app:showAsAction="never" />
             </menu>
         </item>

diff --git a/app/src/main/res/menu/search_main.xml b/app/src/main/res/menu/search_main.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".SearchResultsActivity">
-
     <item
         android:id="@+id/action_search"
         android:icon="@android:drawable/ic_menu_search"
@@ -16,5 +15,4 @@
         android:icon="@android:drawable/ic_menu_add"
         android:title="Add"
         app:showAsAction="always" />
-
 </menu>